decane-connect-kit 2.20.0 → 2.22.0

package/dist/index.cjs

@@ -2038,10 +2038,13 @@ function readRedirectOutcome(search) {
   const name = params.get("decane_name");
   const email = params.get("decane_email");
   const picture = params.get("decane_picture");
+  const username = params.get("decane_username");
+  const providerSubject = params.get("decane_provider_subject");
   const profile = {
     ...name ? { name } : {},
     ...email ? { email } : {},
-    ...picture ? { picture } : {}
+    ...picture ? { picture } : {},
+    ...username ? { username } : {}
   };
   return {
     kind: "result",
@@ -2054,7 +2057,8 @@ function readRedirectOutcome(search) {
       // test `result.profile` rather than an object that is always present but
       // sometimes empty. X never sends an email, so this is the normal case
       // there rather than an edge one.
-      ...Object.keys(profile).length ? { profile } : {}
+      ...Object.keys(profile).length ? { profile } : {},
+      ...providerSubject ? { providerSubject } : {}
     }
   };
 }
@@ -3685,6 +3689,29 @@ function clearPersisted(key) {
   } catch {
   }
 }
+function makeLastUserKey(apiKey) {
+  return `${makePersistKey(apiKey)}:last-user`;
+}
+function loadLastUser(key) {
+  try {
+    const raw = typeof localStorage !== "undefined" ? localStorage.getItem(key) : null;
+    return raw ? JSON.parse(raw).userId ?? null : null;
+  } catch {
+    return null;
+  }
+}
+function saveLastUser(key, userId) {
+  try {
+    localStorage.setItem(key, JSON.stringify({ userId }));
+  } catch {
+  }
+}
+function clearLastUser(key) {
+  try {
+    localStorage.removeItem(key);
+  } catch {
+  }
+}
 function sessionPersistKey(apiKey) {
   return `decane:sess:${apiKey.slice(0, 20)}`;
 }
@@ -3723,6 +3750,7 @@ async function createDecaneConnect(config) {
   const rpId = config.rpId ?? (typeof window !== "undefined" ? window.location.hostname : "localhost");
   const rpName = config.rpName ?? "Decane Connect";
   const PERSIST_KEY = makePersistKey(config.apiKey);
+  const LAST_USER_KEY = makeLastUserKey(config.apiKey);
   const teeUrl = config.teeUrl ?? DEFAULT_TEE_URL;
   const events = new EventEmitter();
   const api = new ApiClient(baseUrl, config.apiKey, config.appId);
@@ -3735,6 +3763,7 @@ async function createDecaneConnect(config) {
   );
   let auth = null;
   let persisted = loadPersisted(PERSIST_KEY);
+  let lastUserId = loadLastUser(LAST_USER_KEY);
   let ethProvider = null;
   const persistSession = config.persistSession !== false;
   const serverAssistedRecovery = true;
@@ -3880,6 +3909,10 @@ async function createDecaneConnect(config) {
       const stored = await storage.getShare(persisted.userId);
       return hasPasswordUnlock(stored) ? stored : null;
     }
+    if (lastUserId) {
+      const stored = await storage.getShare(lastUserId);
+      return hasPasswordUnlock(stored) ? stored : null;
+    }
     const candidates = (await storage.listShares()).filter(hasPasswordUnlock);
     return candidates.length === 1 ? candidates[0] : null;
   }
@@ -4333,14 +4366,16 @@ async function createDecaneConnect(config) {
   async function passkeyDeviceCandidate() {
     if (!isPasskeySupported()) return null;
     if (persisted?.userId) return passkeyLoginCandidate();
+    if (lastUserId) return usablePasskeyShare(await storage.getShare(lastUserId));
     const candidates = (await storage.listShares()).map(usablePasskeyShare).filter(Boolean);
     return candidates.length === 1 ? candidates[0] : null;
   }
   async function canOfferPasskey() {
     if (!isPasskeySupported()) return false;
     if (await passkeyDeviceCandidate()) return true;
-    if (!persisted?.userId) return false;
-    return await storage.getShare(persisted.userId) == null;
+    const known = persisted?.userId ?? lastUserId;
+    if (!known) return false;
+    return await storage.getShare(known) == null;
   }
   async function rememberProfile(userId, profile) {
     const incoming = Object.fromEntries(Object.entries(profile).filter(([, v]) => v));
@@ -4450,7 +4485,8 @@ async function createDecaneConnect(config) {
     return {
       addresses,
       isNewUser: result.isNewUser,
-      ...result.profile ? { profile: result.profile } : {}
+      ...result.profile ? { profile: result.profile } : {},
+      ...result.providerSubject ? { providerSubject: result.providerSubject } : {}
     };
   }
   const client = {
@@ -4552,8 +4588,9 @@ async function createDecaneConnect(config) {
     async signInWithPasskey() {
       const candidate = await passkeyDeviceCandidate();
       if (candidate) return passkeyLogin(candidate);
-      if (isPasskeySupported() && persisted?.userId && await storage.getShare(persisted.userId) == null) {
-        return passkeyLoginWithoutShare(persisted.userId);
+      const known = persisted?.userId ?? lastUserId;
+      if (isPasskeySupported() && known && await storage.getShare(known) == null) {
+        return passkeyLoginWithoutShare(known);
       }
       throw new NewDeviceError();
     },
@@ -4893,12 +4930,21 @@ async function createDecaneConnect(config) {
         await api.revoke(auth.jwt).catch(() => {
         });
       }
+      const leaving = auth?.userId ?? persisted?.userId ?? null;
+      if (leaving) {
+        lastUserId = leaving;
+        saveLastUser(LAST_USER_KEY, leaving);
+      }
       auth = null;
       persisted = null;
       clearPersisted(PERSIST_KEY);
       dropLiveSession();
       events.emit("disconnected");
     },
+    forgetLastUser() {
+      lastUserId = null;
+      clearLastUser(LAST_USER_KEY);
+    },
     getAddresses() {
       return auth?.addresses ?? persisted?.addresses ?? null;
     },
@@ -7263,6 +7309,7 @@ var DEFAULT_SOCIAL = {
   addresses: null,
   isNewUser: false,
   profile: null,
+  providerSubject: null,
   isUnlocked: false,
   sessionExpiresAt: null,
   needsReconnect: false,
@@ -7398,6 +7445,7 @@ function DecaneKit({ config, children }) {
       addresses: result.addresses,
       isNewUser: result.isNewUser,
       profile: result.profile ?? null,
+      providerSubject: result.providerSubject ?? null,
       isUnlocked: sdk?.isUnlocked() ?? false,
       sessionExpiresAt: sdk?.sessionExpiresAt() ?? null,
       needsReconnect: false,
@@ -7604,6 +7652,14 @@ function DecaneKit({ config, children }) {
     if (!sdk) return false;
     return sdk.canUnlockWithPassword();
   }, []);
+  const socialForgetLastUser = (0, import_react5.useCallback)(() => {
+    socialRef.current?.forgetLastUser();
+    const sdk = socialRef.current;
+    if (sdk) {
+      sdk.canSignInWithPasskey().then((can) => setSocialAuth((p) => ({ ...p, canUsePasskey: can }))).catch(() => {
+      });
+    }
+  }, []);
   const socialUnlockWithPassword = (0, import_react5.useCallback)(async (password) => {
     const sdk = socialRef.current;
     if (!sdk) throw new Error("Social wallet not connected");
@@ -7680,6 +7736,7 @@ function DecaneKit({ config, children }) {
         socialAddPasskey,
         socialSetUnlockPassword,
         socialCanUnlockWithPassword,
+        socialForgetLastUser,
         socialUnlockWithPassword,
         socialRemoveUnlockPassword,
         socialShouldPromptRecovery,
@@ -7930,6 +7987,9 @@ function useSocialAuth() {
     // user first signed in, so it carries the same name and email a Google
     // sign-in does rather than coming back anonymous.
     profile: socialAuth.profile,
+    // The provider's stable id, where it gives one. Null otherwise. Safe to
+    // match an account on, unlike the handle in `profile.username`.
+    providerSubject: socialAuth.providerSubject,
     // Long-running work in progress, for driving your own status UI.
     phase: socialAuth.phase,
     isCreatingWallet: socialAuth.phase === "creating",
@@ -7986,6 +8046,7 @@ function useSocialWallet() {
     socialAddPasskey,
     socialSetUnlockPassword,
     socialCanUnlockWithPassword,
+    socialForgetLastUser,
     socialUnlockWithPassword,
     socialRemoveUnlockPassword,
     socialShouldPromptRecovery,
@@ -8094,6 +8155,7 @@ function useSocialWallet() {
       throw e;
     }
   }, [socialSetUnlockPassword]);
+  const forgetLastUser = (0, import_react6.useCallback)(() => socialForgetLastUser(), [socialForgetLastUser]);
   const canUnlockWithPassword = (0, import_react6.useCallback)(
     () => socialCanUnlockWithPassword(),
     [socialCanUnlockWithPassword]
@@ -8179,6 +8241,8 @@ function useSocialWallet() {
     canUnlockWithPassword,
     unlockWithPassword,
     removeUnlockPassword,
+    // "Use a different account": stop offering the account that signed out.
+    forgetLastUser,
     // Recovery (2-of-3 Shamir share set)
     rotateShares,
     exportPortableBackup,