@arcblock/did-connect-service 4.1.22 → 4.1.24

package/dist/pages/admin/tab-profile-accounts.js

@@ -3,6 +3,8 @@
  * Grouped chip layout: bound accounts as chips, unbound as dashed add-chips.
  */
 import { ICON_DID_WALLET, ICON_EMAIL, ICON_PASSKEY, OAUTH_ICONS, } from "@arcblock/did-connect-core/ui";
+import { renderMergeConfirmBodyHtml, toMergeConfirmViewModel } from "./merge-confirm-view.js";
+import { renderMergeMethodPickerHtml } from "./merge-method-picker.js";
 /** Providers hidden from the Connected Accounts UI. */
 const HIDDEN_PROVIDERS = new Set(["facebook", "auth0-legacy"]);
 /** Build a JS-safe icon map to embed in inline <script>. */
@@ -26,6 +28,7 @@ export function connectedAccountsCardHtml(t) {
     <div class="settings-card-header">
       <span class="settings-card-title">${t("profile.connectedAccounts")}</span>
     </div>
+    <div id="merge-candidate-prompt" class="ca-merge-prompt" style="display:none;" hidden></div>
     <div id="connected-accounts-list"></div>
   </div>
 `;
@@ -35,12 +38,18 @@ export function connectedAccountsCardHtml(t) {
 export const CONNECTED_ACCOUNTS_SCRIPT = /* @__PURE__ */ (() => /* js */ `
 var __connectedAccounts = [];
 var __oauthProviders = [];
+var __accountMergeOAuthCleanup = null;
+var __mergePromptDid = "";
 var __providerIcons = ${buildIconMapJSON()};
 var __hiddenProviders = ${JSON.stringify([...HIDDEN_PROVIDERS])};
+${toMergeConfirmViewModel.toString()}
+${renderMergeConfirmBodyHtml.toString()}
+${renderMergeMethodPickerHtml.toString()}
 
 async function loadConnectedAccounts() {
   var card = document.getElementById("connected-accounts-card");
   var list = document.getElementById("connected-accounts-list");
+  hideMergePrompt();
 
   // Show card with skeleton chips while loading
   card.style.display = "";
@@ -69,6 +78,7 @@ async function loadConnectedAccounts() {
 
   card.style.display = "";
   renderConnectedAccounts();
+  maybeShowMergePrompt(userObj.did);
 }
 
 function renderConnectedAccounts() {
@@ -166,6 +176,12 @@ function renderConnectedAccounts() {
     html += '</div></div>';
   }
 
+  html += '<div class="ca-section">';
+  html += '<div class="ca-section-label">' + __t("profile.mergeAccount") + '</div>';
+  html += '<p class="ca-merge-hint" style="margin:0 0 8px;color:var(--text-secondary);font-size:13px;">' + __t("profile.mergeAccountHint") + '</p>';
+  html += '<button class="btn btn-secondary" onclick="startAccountMerge()">' + __t("profile.mergeChooseMethod") + '</button>';
+  html += '</div>';
+
   list.innerHTML = html;
 }
 
@@ -200,10 +216,15 @@ function renderBoundCard(a) {
   }
   html += '</div>';
 
-  // Action buttons at top-right
-  if (!a.isMain && a.provider !== "wallet" && a.provider !== "did-connect") {
+  // Action buttons at top-right. Wallet / did-connect get a dedicated unbind
+  // button (Decision 2: wallet is a credential). Last-credential is enforced
+  // server-side; the button is shown even on the main wallet row.
+  var isWallet = a.provider === "wallet" || a.provider === "did-connect";
+  if (isWallet || !a.isMain) {
     html += '<div class="ca-bound-actions">';
-    if (isPasskey) {
+    if (isWallet) {
+      html += '<button class="btn-text" style="color:var(--red-text)" onclick="unbindWallet(\\'' + escapeHtml(a.provider) + '\\')">' + __t("profile.remove") + '</button>';
+    } else if (isPasskey) {
       html += '<button class="btn-text" onclick="openRenamePasskeyDialog(\\'' + escapeHtml(a.did) + '\\', \\'' + escapeHtml(getPasskeyName(a)) + '\\')">' + __t("profile.renamePasskey") + '</button>';
       html += '<button class="btn-text" style="color:var(--red-text)" onclick="removePasskey(\\'' + escapeHtml(a.did) + '\\')">' + __t("profile.remove") + '</button>';
     } else {
@@ -328,6 +349,20 @@ async function unbindOAuth(provider) {
   }
 }
 
+async function unbindWallet(provider) {
+  var ok = await confirmDialog({
+    title: __t("profile.removeConfirmTitle"),
+    message: __t("profile.removeConfirmMsg"),
+    confirmLabel: __t("profile.remove"),
+  });
+  if (!ok) return;
+  var data = await api("POST", "/../wallet/unbind", { provider: provider });
+  if (data.ok) {
+    showToast(__t("profile.accountRemoved"), "success");
+    loadConnectedAccounts();
+  }
+}
+
 async function addPasskey() {
   try {
     // 1. Get registration options. The server flattens the WebAuthn options to
@@ -457,6 +492,460 @@ function __openInWallet(url, appInfo, memberAppInfo) {
   }
 }
 
+function listMergeMethods() {
+  var auth = (typeof window !== "undefined" && window.__mergeAuth) || { wallet: true, passkey: true, email: false };
+  var methods = [];
+  if (auth.wallet !== false) methods.push({ method: "wallet" });
+  if (auth.passkey !== false) methods.push({ method: "passkey" });
+  for (var i = 0; i < __oauthProviders.length; i++) {
+    methods.push({ method: "oauth", provider: __oauthProviders[i] });
+  }
+  if (auth.email) methods.push({ method: "email" });
+  return methods;
+}
+
+function cleanupAccountMergeOAuth() {
+  if (__accountMergeOAuthCleanup) __accountMergeOAuthCleanup();
+}
+
+async function proveAccountMergeWithWallet(mergeChallenge) {
+  var tokenData;
+  try {
+    tokenData = await api("GET", "/../did/merge-proof/token");
+  } catch (e) {
+    showToast(__t("profile.mergeFailed"), "error");
+    return null;
+  }
+  if (!tokenData || !tokenData.token) {
+    showToast(__t("profile.mergeFailed"), "error");
+    return null;
+  }
+
+  var token = tokenData.token;
+  var connectUrl = tokenData.url || "";
+  var appInfo = tokenData.appInfo || {};
+  var memberAppInfo = tokenData.memberAppInfo || {};
+
+  return new Promise(function(resolve) {
+    var d = document.getElementById("wallet-merge-dialog");
+    if (!d) {
+      d = document.createElement("dialog");
+      d.id = "wallet-merge-dialog";
+      document.body.appendChild(d);
+    }
+    d.innerHTML = '<div class="dialog-content" style="text-align:center;">'
+      + '<h3 style="margin-bottom:4px;">' + __t("profile.mergeProveWallet") + '</h3>'
+      + '<div id="wallet-merge-qr" class="wallet-qr-view">'
+      + '<div class="wallet-qr-placeholder"><span class="wallet-qr-spinner"></span></div>'
+      + '</div>'
+      + '<button id="wallet-merge-open" class="btn btn-secondary wallet-deep-link-btn" disabled>'
+      + getProviderIconSvg("did-connect") + ' ' + __t("profile.openInWallet")
+      + '</button>'
+      + '<p id="wallet-merge-status" class="wallet-bind-status">' + __t("profile.scanWithWallet") + '</p>'
+      + '</div>'
+      + '<div class="dialog-actions">'
+      + '<button class="btn btn-secondary" id="wallet-merge-cancel">' + __t("common.cancel") + '</button>'
+      + '</div>';
+
+    var statusEl = document.getElementById("wallet-merge-status");
+    var qrEl = document.getElementById("wallet-merge-qr");
+    var openBtn = document.getElementById("wallet-merge-open");
+    if (connectUrl && typeof __QRBundle !== "undefined" && __QRBundle.renderQR) {
+      __QRBundle.renderQR(qrEl, connectUrl, 212);
+    }
+    openBtn.disabled = false;
+    openBtn.onclick = function() { __openInWallet(connectUrl, appInfo, memberAppInfo); };
+
+    var pollTimer = null;
+    var pollCount = 0;
+    var settled = false;
+    var polling = false;
+    function finish(value) {
+      if (settled) return;
+      settled = true;
+      if (pollTimer) clearInterval(pollTimer);
+      pollTimer = null;
+      if (d.open) d.close();
+      resolve(value);
+    }
+    document.getElementById("wallet-merge-cancel").onclick = function() { finish(null); };
+    d.onclose = function() { finish(null); };
+    d.showModal();
+
+    pollTimer = setInterval(async function() {
+      if (polling || settled) return;
+      polling = true;
+      pollCount++;
+      if (pollCount > 120) {
+        clearInterval(pollTimer);
+        pollTimer = null;
+        statusEl.textContent = __t("profile.connectTimeout");
+        polling = false;
+        return;
+      }
+      try {
+        var status = await api("GET", "/../did/merge-proof/status?_t_=" + encodeURIComponent(token));
+        if (status.status === "scanned") {
+          statusEl.textContent = __t("profile.confirmInWallet");
+        } else if (status.status === "succeed") {
+          clearInterval(pollTimer);
+          pollTimer = null;
+          statusEl.textContent = __t("profile.binding");
+          var proved = await api("POST", "/../did/connect/complete", {
+            token: token,
+            mergeChallenge: mergeChallenge,
+          });
+          if (!proved || !proved.mergeIntent) {
+            statusEl.textContent = (proved && proved.error) || __t("profile.mergeFailed");
+            polling = false;
+            return;
+          }
+          finish(proved);
+        } else if (status.status === "error") {
+          clearInterval(pollTimer);
+          pollTimer = null;
+          statusEl.textContent = status.error || __t("profile.mergeFailed");
+        }
+      } catch (e) { /* ignore poll errors */ }
+      polling = false;
+    }, 1500);
+  });
+}
+
+async function proveAccountMergeWithPasskey(mergeChallenge) {
+  if (typeof PublicKeyCredential === "undefined" || !navigator.credentials || !navigator.credentials.get) {
+    showToast(__t("profile.mergePasskeyUnavailable"), "error");
+    return null;
+  }
+  var opts = await api("GET", "/../passkey/auth");
+  var publicKey = opts.authentication || opts;
+  if (!opts.challengeId || !publicKey || !publicKey.challenge) {
+    showToast((opts && opts.error) || __t("profile.mergeFailed"), "error");
+    return null;
+  }
+  publicKey.challenge = base64urlToBuffer(publicKey.challenge);
+  if (publicKey.allowCredentials) {
+    for (var i = 0; i < publicKey.allowCredentials.length; i++) {
+      publicKey.allowCredentials[i].id = base64urlToBuffer(publicKey.allowCredentials[i].id);
+    }
+  }
+  var credential;
+  try {
+    credential = await navigator.credentials.get({ publicKey: publicKey });
+  } catch (e) {
+    if (!e || e.name !== "NotAllowedError") {
+      showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+    }
+    return null;
+  }
+  if (!credential) return null;
+  var response = credential.response;
+  return api("POST", "/../passkey/auth", {
+    challengeId: opts.challengeId,
+    credential: {
+      id: credential.id,
+      rawId: bufferToBase64url(credential.rawId),
+      type: credential.type,
+      response: {
+        authenticatorData: bufferToBase64url(response.authenticatorData),
+        clientDataJSON: bufferToBase64url(response.clientDataJSON),
+        signature: bufferToBase64url(response.signature),
+        userHandle: response.userHandle ? bufferToBase64url(response.userHandle) : undefined,
+      },
+    },
+    mergeChallenge: mergeChallenge,
+  });
+}
+
+function proveAccountMergeWithOAuth(provider, mergeChallenge) {
+  return new Promise(function(resolve) {
+    if (__oauthProviders.indexOf(provider) === -1) {
+      resolve(null);
+      return;
+    }
+    cleanupAccountMergeOAuth();
+    var returnUrl = encodeURIComponent(window.location.href);
+    var url = window.__BASE_PATH + "/../oauth/" + encodeURIComponent(provider) + "/login?returnUrl=" + returnUrl;
+    var redirectUri = location.origin + "/.well-known/service/oauth/callback/" + encodeURIComponent(provider);
+    var w = 500, h = 600;
+    var left = (screen.width - w) / 2, top = (screen.height - h) / 2;
+    var popup = window.open(url, "oauth_merge", "width=" + w + ",height=" + h + ",left=" + left + ",top=" + top);
+    if (!popup) {
+      showToast(__t("common.popupBlocked"), "error");
+      resolve(null);
+      return;
+    }
+    var settled = false;
+    var abandonTimer = setTimeout(function() {
+      if (settled) return;
+      showToast(__t("profile.mergePopupClosed"), "error");
+      finish(null);
+    }, 5 * 60 * 1000);
+    function cleanup() {
+      window.removeEventListener("message", onMessage);
+      clearTimeout(abandonTimer);
+      if (__accountMergeOAuthCleanup === cancel) __accountMergeOAuthCleanup = null;
+    }
+    function finish(value) {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve(value);
+    }
+    async function onMessage(event) {
+      if (event.origin !== location.origin) return;
+      if (!event.data || event.data.type !== "authorization_response") return;
+      if (settled) return;
+      clearTimeout(abandonTimer);
+      try { popup.close(); } catch (e) {}
+      var resp = event.data.response;
+      if (event.data.error || !resp || !resp.code) {
+        finish(null);
+        return;
+      }
+      try {
+        var proved = await api("POST", "/../oauth/login", {
+          provider: provider,
+          code: resp.code,
+          redirectUri: redirectUri,
+          mergeChallenge: mergeChallenge,
+        });
+        finish(proved);
+      } catch (e) {
+        showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+        finish(null);
+      }
+    }
+    window.addEventListener("message", onMessage);
+    function cancel() {
+      try { popup.close(); } catch (e) {}
+      finish(null);
+    }
+    __accountMergeOAuthCleanup = cancel;
+  });
+}
+
+async function proveAccountMergeWithEmail(mergeChallenge) {
+  return new Promise(function(resolve) {
+    var d = document.getElementById("email-merge-dialog");
+    if (!d) {
+      d = document.createElement("dialog");
+      d.id = "email-merge-dialog";
+      document.body.appendChild(d);
+    }
+    d.innerHTML = '<div class="dialog-content">'
+      + '<h3>' + __t("profile.mergeProveEmail") + '</h3>'
+      + '<div class="merge-email-fields">'
+      + '<input class="input" id="email-merge-address" type="email" autocomplete="email" placeholder="' + escapeHtml(__t("profile.mergeEmailPlaceholder")) + '" />'
+      + '<input class="input" id="email-merge-code" inputmode="numeric" autocomplete="one-time-code" placeholder="' + escapeHtml(__t("profile.mergeEmailCodePlaceholder")) + '" disabled />'
+      + '<p id="email-merge-status" class="dialog-desc"></p>'
+      + '</div></div>'
+      + '<div class="dialog-actions">'
+      + '<button type="button" class="btn btn-secondary" id="email-merge-cancel">' + __t("common.cancel") + '</button>'
+      + '<button type="button" class="btn btn-secondary" id="email-merge-send">' + __t("profile.mergeEmailSendCode") + '</button>'
+      + '<button type="button" class="btn" id="email-merge-ok" disabled>' + __t("common.confirm") + '</button>'
+      + '</div>';
+
+    var emailEl = document.getElementById("email-merge-address");
+    var codeEl = document.getElementById("email-merge-code");
+    var statusEl = document.getElementById("email-merge-status");
+    var sendBtn = document.getElementById("email-merge-send");
+    var okBtn = document.getElementById("email-merge-ok");
+    var verifyId = null;
+    var settled = false;
+    function finish(value) {
+      if (settled) return;
+      settled = true;
+      if (d.open) d.close();
+      resolve(value);
+    }
+    document.getElementById("email-merge-cancel").onclick = function() { finish(null); };
+    d.onclose = function() { finish(null); };
+    sendBtn.onclick = async function() {
+      var email = (emailEl.value || "").trim();
+      if (!email || email.indexOf("@") === -1) return;
+      sendBtn.disabled = true;
+      statusEl.textContent = __t("profile.emailSending");
+      var sent = await api("POST", "/../email/sendCode", { email: email });
+      if (!sent || sent.id == null) {
+        statusEl.textContent = (sent && sent.error) || __t("profile.emailSendFailed");
+        sendBtn.disabled = false;
+        return;
+      }
+      verifyId = sent.id;
+      codeEl.disabled = false;
+      okBtn.disabled = false;
+      codeEl.focus();
+      statusEl.textContent = __t("profile.emailCodeSent");
+      sendBtn.disabled = false;
+    };
+    okBtn.onclick = async function() {
+      var code = (codeEl.value || "").trim();
+      if (!code || verifyId == null) return;
+      okBtn.disabled = true;
+      var proved = await api("POST", "/../email/login", {
+        code: code,
+        id: verifyId,
+        mergeChallenge: mergeChallenge,
+      });
+      if (!proved || !proved.mergeIntent) {
+        statusEl.textContent = (proved && proved.error) || __t("profile.mergeFailed");
+        okBtn.disabled = false;
+        return;
+      }
+      finish(proved);
+    };
+    d.showModal();
+    emailEl.focus();
+  });
+}
+
+async function finalizeAccountMerge(proved) {
+  if (!proved || !proved.mergeIntent) {
+    showToast((proved && proved.error) || __t("profile.mergeFailed"), "error");
+    return false;
+  }
+  var plan = await api("POST", "/../account/merge/dry-run", { mergeIntent: proved.mergeIntent });
+  var ok = await confirmMergePlan(plan);
+  if (!ok) {
+    showToast(__t("profile.mergeCancelled"), "error");
+    return false;
+  }
+  var committed = await api("POST", "/../account/merge/commit", { mergeIntent: proved.mergeIntent });
+  if (committed && committed.ok) {
+    showToast(__t("profile.mergeSuccess"), "success");
+    loadConnectedAccounts();
+    return true;
+  }
+  showToast((committed && committed.error) || __t("profile.mergeFailed"), "error");
+  return false;
+}
+
+function hideMergePrompt() {
+  var el = document.getElementById("merge-candidate-prompt");
+  if (!el) return;
+  el.style.display = "none";
+  el.hidden = true;
+  el.innerHTML = "";
+}
+
+function dismissMergePrompt() {
+  var did = __mergePromptDid || "";
+  if (did) {
+    try { localStorage["connect.mergePrompt.dismissed." + did] = "1"; } catch (e) {}
+  }
+  hideMergePrompt();
+}
+
+async function maybeShowMergePrompt(did) {
+  hideMergePrompt();
+  __mergePromptDid = did || "";
+  if (!did) return;
+  try {
+    if (localStorage["connect.mergePrompt.dismissed." + did] === "1") return;
+  } catch (e) {}
+  var data = await api("GET", "/../account/merge/candidate", undefined, { silent: true });
+  if (!data || data.mergeCandidate !== true) return;
+  try {
+    if (localStorage["connect.mergePrompt.dismissed." + did] === "1") return;
+  } catch (e) {}
+  var el = document.getElementById("merge-candidate-prompt");
+  if (!el) return;
+  el.innerHTML = '<div class="ca-merge-prompt-title">' + escapeHtml(__t("profile.mergePromptTitle")) + '</div>'
+    + '<p class="ca-merge-prompt-body">' + escapeHtml(__t("profile.mergePromptBody")) + '</p>'
+    + '<div class="ca-merge-prompt-actions">'
+    + '<button type="button" class="btn" id="merge-candidate-prompt-action" onclick="startAccountMerge()">' + escapeHtml(__t("profile.mergePromptAction")) + '</button>'
+    + '<button type="button" class="btn btn-secondary" id="merge-candidate-prompt-dismiss" onclick="dismissMergePrompt()">' + escapeHtml(__t("profile.mergePromptDismiss")) + '</button>'
+    + '</div>';
+  el.hidden = false;
+  el.style.display = "";
+}
+
+async function startAccountMerge() {
+  cleanupAccountMergeOAuth();
+  var start;
+  try {
+    start = await api("POST", "/../account/merge/start", {});
+  } catch (e) {
+    showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+    return;
+  }
+  if (!start || !start.challenge) {
+    showToast(__t("profile.mergeFailed"), "error");
+    return;
+  }
+
+  var d = document.getElementById("account-merge-method-dialog");
+  if (!d) {
+    d = document.createElement("dialog");
+    d.id = "account-merge-method-dialog";
+    document.body.appendChild(d);
+  }
+  d.innerHTML = renderMergeMethodPickerHtml(listMergeMethods(), __t, escapeHtml, getProviderIconSvg, getProviderLabel);
+  document.getElementById("account-merge-method-cancel").onclick = function() { d.close(); };
+  var buttons = d.querySelectorAll("[data-merge-method]");
+  for (var b = 0; b < buttons.length; b++) {
+    buttons[b].onclick = async function(event) {
+      var button = event.currentTarget;
+      var method = button.getAttribute("data-merge-method");
+      var selectedProvider = button.getAttribute("data-merge-provider");
+      d.close();
+      try {
+        var proved = null;
+        if (method === "wallet") proved = await proveAccountMergeWithWallet(start.challenge);
+        else if (method === "passkey") proved = await proveAccountMergeWithPasskey(start.challenge);
+        else if (method === "oauth") proved = await proveAccountMergeWithOAuth(selectedProvider, start.challenge);
+        else if (method === "email") proved = await proveAccountMergeWithEmail(start.challenge);
+        if (proved) await finalizeAccountMerge(proved);
+      } catch (e) {
+        if (!e || e.name !== "NotAllowedError") {
+          showToast((e && e.message) || __t("profile.mergeFailed"), "error");
+        }
+      }
+    };
+  }
+  d.showModal();
+}
+
+function confirmMergePlan(plan) {
+  return new Promise(function(resolve) {
+    var d = document.getElementById("merge-confirm-dialog");
+    if (!d) {
+      d = document.createElement("dialog");
+      d.id = "merge-confirm-dialog";
+      d.className = "merge-confirm-dialog";
+      document.body.appendChild(d);
+    }
+    d.innerHTML = '<div class="dialog-content">'
+      + '<h3>' + escapeHtml(__t("profile.mergeConfirmTitle")) + '</h3>'
+      + renderMergeConfirmBodyHtml(plan, __t, escapeHtml, getProviderLabel)
+      + '</div>'
+      + '<div class="dialog-actions">'
+      + '<button class="btn btn-secondary" id="merge-confirm-cancel">' + escapeHtml(__t("common.cancel")) + '</button>'
+      + '<button class="btn btn-danger" id="merge-confirm-ok">' + escapeHtml(__t("common.confirm")) + '</button>'
+      + '</div>';
+
+    var okBtn = document.getElementById("merge-confirm-ok");
+    var cancelBtn = document.getElementById("merge-confirm-cancel");
+    if (plan && plan.tooLarge) okBtn.disabled = true;
+
+    var settled = false;
+    function finish(result) {
+      if (settled) return;
+      settled = true;
+      okBtn.onclick = null;
+      cancelBtn.onclick = null;
+      d.onclose = null;
+      d.close();
+      resolve(result);
+    }
+    okBtn.onclick = function() { if (okBtn.disabled) return; finish(true); };
+    cancelBtn.onclick = function() { finish(false); };
+    d.onclose = function() { finish(false); };
+    d.showModal();
+  });
+}
+
 // ─── DID Wallet Connect (bind) ──────────────────────────────────────
 async function connectWallet() {
   // 1. Create bind session

package/dist/pages/admin/tab-profile-accounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-profile-accounts.js","sourceRoot":"","sources":["../../../src/pages/admin/tab-profile-accounts.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,GACZ,MAAM,+BAA+B,CAAC;AAIvC,uDAAuD;AACvD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;AAE/D,4DAA4D;AAC5D,SAAS,gBAAgB;IACvB,MAAM,GAAG,GAA2B;QAClC,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,eAAe;QACvB,aAAa,EAAE,eAAe;QAC9B,KAAK,EAAE,UAAU;KAClB,CAAC;IACF,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,CAAM;IAC9C,OAAO,UAAU,CAAC;;;0CAGsB,CAAC,CAAC,2BAA2B,CAAC;;;;CAIvE,CAAC;AACF,CAAC;AAED,mFAAmF;AACnF,+EAA+E;AAC/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;;;wBAGjD,gBAAgB,EAAE;0BAChB,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0iB9D,CAAC,EAAE,CAAC"}
+{"version":3,"file":"tab-profile-accounts.js","sourceRoot":"","sources":["../../../src/pages/admin/tab-profile-accounts.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,GACZ,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAIvE,uDAAuD;AACvD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;AAE/D,4DAA4D;AAC5D,SAAS,gBAAgB;IACvB,MAAM,GAAG,GAA2B;QAClC,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,eAAe;QACvB,aAAa,EAAE,eAAe;QAC9B,KAAK,EAAE,UAAU;KAClB,CAAC;IACF,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,CAAM;IAC9C,OAAO,UAAU,CAAC;;;0CAGsB,CAAC,CAAC,2BAA2B,CAAC;;;;;CAKvE,CAAC;AACF,CAAC;AAED,mFAAmF;AACnF,+EAA+E;AAC/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;;;;;wBAKjD,gBAAgB,EAAE;0BAChB,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC;EAC7D,uBAAuB,CAAC,QAAQ,EAAE;EAClC,0BAA0B,CAAC,QAAQ,EAAE;EACrC,2BAA2B,CAAC,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2gCvC,CAAC,EAAE,CAAC"}

package/dist/pages/invite-page.d.ts

@@ -12,5 +12,6 @@
  */
 export declare function buildInvitePageHTML(apiBase: string, locale?: string, options?: {
     masterOAuthOrigin?: string;
+    appName?: string;
 }): string;
 //# sourceMappingURL=invite-page.d.ts.map

package/dist/pages/invite-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invite-page.d.ts","sourceRoot":"","sources":["../../src/pages/invite-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA2DH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,SAAO,EACb,OAAO,CAAC,EAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAE,GACvC,MAAM,CAkPR"}
+{"version":3,"file":"invite-page.d.ts","sourceRoot":"","sources":["../../src/pages/invite-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA2DH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,SAAO,EACb,OAAO,CAAC,EAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GACzD,MAAM,CA4PR"}

package/dist/pages/invite-page.js

@@ -69,6 +69,12 @@ export function buildInvitePageHTML(apiBase, locale = "en", options) {
     const masterOAuthOriginJson = JSON.stringify(options?.masterOAuthOrigin ?? null);
     const lang = locale === "zh" ? "zh" : "en";
     const t = INVITE_I18N[lang];
+    const appName = (options?.appName ?? "App")
+        .replaceAll("&", "&")
+        .replaceAll("<", "&lt;")
+        .replaceAll(">", "&gt;")
+        .replaceAll('"', "&quot;")
+        .replaceAll("'", "&#39;");
     const clientI18n = JSON.stringify({
         noIdTitle: t.noIdTitle,
         noIdMsg: t.noIdMsg,
@@ -87,7 +93,7 @@ export function buildInvitePageHTML(apiBase, locale = "en", options) {
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>${t.title}</title>
+  <title>${t.title} — ${appName}</title>
   <link rel="stylesheet" href="${assetUrl("login.css")}" />
   <style>
     .invite-role {
@@ -126,6 +132,7 @@ export function buildInvitePageHTML(apiBase, locale = "en", options) {
 
     <div id="valid-state" class="hidden">
       <h1>${t.title}</h1>
+      <p class="subtitle">${appName}</p>
       <div class="invite-info">
         <p class="subtitle">${t.invitedPrefix}<span class="invite-role" id="invite-role"></span>${t.invitedSuffix}</p>
         <p class="invite-remark hidden" id="invite-remark"></p>
@@ -217,8 +224,11 @@ async function init() {
     return;
   }
 
-  // Persist invitationId in cookie so login methods can pick it up
-  document.cookie = "pending_invitation=" + encodeURIComponent(invitationId) + ";path=/;max-age=3600;SameSite=Lax;Secure";
+  // Persist invitationId in cookie so login methods can pick it up.
+  // Secure is gated on https — the browser drops a Secure cookie over plain http
+  // (e.g. a LAN dev server), which would silently lose the invitation.
+  var securePart = location.protocol === "https:" ? ";Secure" : "";
+  document.cookie = "pending_invitation=" + encodeURIComponent(invitationId) + ";path=/;max-age=3600;SameSite=Lax" + securePart;
 
   // 1. Check invitation validity
   var invInfo;

package/dist/pages/invite-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"invite-page.js","sourceRoot":"","sources":["../../src/pages/invite-page.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"invite-page.js","sourceRoot":"","sources":["../../src/pages/invite-page.ts"],"names":[],"mappings":"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"}