decane-connect-kit 2.23.0 → 2.24.1

package/dist/index.cjs

@@ -37,6 +37,7 @@ __export(errors_exports, {
   CallSequenceError: () => CallSequenceError,
   DecaneConnectError: () => DecaneConnectError,
   ExportNotAuthorizedError: () => ExportNotAuthorizedError,
+  InvalidAccessTokenError: () => InvalidAccessTokenError,
   InvalidApiKeyError: () => InvalidApiKeyError,
   InvalidPinError: () => InvalidPinError,
   InvalidRecoveryFileError: () => InvalidRecoveryFileError,
@@ -59,7 +60,7 @@ __export(errors_exports, {
   WrongPasswordError: () => WrongPasswordError,
   WrongUnlockPasswordError: () => WrongUnlockPasswordError
 });
-var DecaneConnectError, InvalidApiKeyError, OriginNotAllowedError, SessionExpiredError, UnlockRequiredError, ReconnectRequiredError, UserCancelledError, WebAuthnNotSupportedError, InvalidPinError, CallSequenceError, NetworkError, ShareCorruptedError, ProvisioningTimeoutError, NewDeviceError, StaleDeviceShareError, PromptPinNotConfiguredError, PromptPasswordNotConfiguredError, WrongUnlockPasswordError, UnlockTokenRejectedError, AttestationError, RecoveryFailedError, InvalidRecoveryFileError, WrongPasswordError, RecoveryWalletMismatchError, ExportNotAuthorizedError;
+var DecaneConnectError, InvalidApiKeyError, OriginNotAllowedError, SessionExpiredError, UnlockRequiredError, ReconnectRequiredError, UserCancelledError, WebAuthnNotSupportedError, InvalidPinError, CallSequenceError, NetworkError, ShareCorruptedError, ProvisioningTimeoutError, NewDeviceError, StaleDeviceShareError, PromptPinNotConfiguredError, PromptPasswordNotConfiguredError, WrongUnlockPasswordError, InvalidAccessTokenError, UnlockTokenRejectedError, AttestationError, RecoveryFailedError, InvalidRecoveryFileError, WrongPasswordError, RecoveryWalletMismatchError, ExportNotAuthorizedError;
 var init_errors = __esm({
   "src/social/errors.ts"() {
     "use strict";
@@ -164,6 +165,11 @@ var init_errors = __esm({
         super("WRONG_UNLOCK_PASSWORD", "That password did not unlock this device");
       }
     };
+    InvalidAccessTokenError = class extends DecaneConnectError {
+      constructor(reason) {
+        super("INVALID_ACCESS_TOKEN", `That access token cannot open a session: ${reason}`);
+      }
+    };
     UnlockTokenRejectedError = class extends DecaneConnectError {
       constructor() {
         super("UNLOCK_TOKEN_REJECTED", "This device's unlock token is no longer valid \u2014 sign in normally to re-enable password unlock");
@@ -221,6 +227,7 @@ __export(index_exports, {
   DecaneMark: () => DecaneMark,
   DecaneWordmark: () => DecaneWordmark,
   ExportNotAuthorizedError: () => ExportNotAuthorizedError,
+  InvalidAccessTokenError: () => InvalidAccessTokenError,
   InvalidApiKeyError: () => InvalidApiKeyError,
   InvalidPinError: () => InvalidPinError,
   InvalidRecoveryFileError: () => InvalidRecoveryFileError,
@@ -2355,6 +2362,20 @@ function b64ToBytes(b644) {
   return Uint8Array.from(atob(b644), (c) => c.charCodeAt(0));
 }
 
+// src/social/accessToken.ts
+function decodeAccessToken(token) {
+  try {
+    const payload = token.split(".")[1];
+    if (!payload) return null;
+    const json = JSON.parse(atob(payload.replace(/-/g, "+").replace(/_/g, "/")));
+    if (typeof json.uid !== "string" || json.uid === "") return null;
+    if (typeof json.exp !== "number" || !Number.isFinite(json.exp)) return null;
+    return { userId: json.uid, expiresAt: json.exp * 1e3 };
+  } catch {
+    return null;
+  }
+}
+
 // src/social/storage.ts
 var import_idb = require("idb");
 var DB_NAME = "decane-connect-kit";
@@ -3211,6 +3232,8 @@ function loginWithKingsChatPopup(opts) {
 
 // src/social/signers/evm.ts
 var import_ethers2 = require("ethers");
+init_errors();
+var DECODE = (bytes) => new TextDecoder().decode(bytes);
 async function signEvmTransaction(tee, chain, tx, jwt) {
   const resolved = await (0, import_ethers2.resolveProperties)(tx);
   const unsigned = import_ethers2.Transaction.from(resolved).unsignedSerialized;
@@ -3219,7 +3242,44 @@ async function signEvmTransaction(tee, chain, tx, jwt) {
   return tee.sign({ chain, kind: "transaction", payload, txHash }, jwt);
 }
 async function signEvmMessage(tee, chain, message, jwt) {
-  return tee.sign({ chain, kind: "message", payload: message }, jwt);
+  return tee.sign({ chain, kind: "message", payload: messageAsString(message) }, jwt);
+}
+function messageAsString(message) {
+  if (typeof message === "string") return message;
+  if (!isValidUtf8(message)) {
+    throw new CallSequenceError(
+      "signMessage: the message bytes are not valid UTF-8. The signer hashes text; pass a string, or UTF-8 bytes."
+    );
+  }
+  return DECODE(message);
+}
+function isValidUtf8(b) {
+  let i = 0;
+  while (i < b.length) {
+    const c = b[i];
+    let n = 0;
+    if (c < 128) n = 0;
+    else if (c >= 194 && c <= 223) n = 1;
+    else if (c >= 224 && c <= 239) n = 2;
+    else if (c >= 240 && c <= 244) n = 3;
+    else return false;
+    for (let k = 1; k <= n; k++) {
+      const t = b[i + k];
+      if (t === void 0 || (t & 192) !== 128) return false;
+    }
+    if (n === 2) {
+      const c1 = b[i + 1];
+      if (c === 224 && c1 < 160) return false;
+      if (c === 237 && c1 >= 160) return false;
+    }
+    if (n === 3) {
+      const c1 = b[i + 1];
+      if (c === 240 && c1 < 144) return false;
+      if (c === 244 && c1 >= 144) return false;
+    }
+    i += n + 1;
+  }
+  return true;
 }
 async function signEvmAuthorization(tee, chainId, address, nonce, jwt) {
   const serialized = await tee.sign(
@@ -3749,8 +3809,10 @@ async function createDecaneConnect(config) {
   const durationMs = (config.sessionDurationMinutes ?? DEFAULT_SESSION_MINUTES) * 6e4;
   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 PERSIST_KEY = makePersistKey(config.appId);
+  const LAST_USER_KEY = makeLastUserKey(config.appId);
+  const LEGACY_PERSIST_KEY = makePersistKey(config.apiKey);
+  const LEGACY_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);
@@ -3763,7 +3825,14 @@ async function createDecaneConnect(config) {
   );
   let auth = null;
   let persisted = loadPersisted(PERSIST_KEY);
-  let lastUserId = loadLastUser(LAST_USER_KEY);
+  if (!persisted && LEGACY_PERSIST_KEY !== PERSIST_KEY) {
+    persisted = loadPersisted(LEGACY_PERSIST_KEY);
+    if (persisted) {
+      savePersisted(PERSIST_KEY, persisted);
+      clearPersisted(LEGACY_PERSIST_KEY);
+    }
+  }
+  let lastUserId = loadLastUser(LAST_USER_KEY) ?? (LEGACY_LAST_USER_KEY !== LAST_USER_KEY ? loadLastUser(LEGACY_LAST_USER_KEY) : null);
   let ethProvider = null;
   const persistSession = config.persistSession !== false;
   const deferDeviceProtection = config.deferDeviceProtection === true;
@@ -3826,12 +3895,13 @@ async function createDecaneConnect(config) {
       })
     ]).finally(() => clearTimeout(timer));
   }
-  const SESSION_KEY = sessionPersistKey(config.apiKey);
+  const SESSION_KEY = sessionPersistKey(config.appId);
+  const LEGACY_SESSION_KEY = sessionPersistKey(config.apiKey);
   function persistLiveSession() {
-    if (!persistSession) return;
+    if (!persistSession || !auth) return;
     const handle = session.getHandle();
-    const expiresAt = session.expiresAtTimestamp();
-    if (!handle || !auth || !expiresAt) return;
+    const expiresAt = handle ? session.expiresAtTimestamp() : decodeAccessToken(auth.jwt)?.expiresAt ?? null;
+    if (!expiresAt) return;
     saveSession(SESSION_KEY, {
       handle,
       jwt: auth.jwt,
@@ -3843,11 +3913,23 @@ async function createDecaneConnect(config) {
   function dropLiveSession() {
     clearSessionPersist(SESSION_KEY);
   }
+  let accessTokenExpiry = null;
+  function scheduleAccessTokenExpiry(jwt, expiresAt) {
+    if (accessTokenExpiry) clearTimeout(accessTokenExpiry);
+    accessTokenExpiry = setTimeout(() => {
+      accessTokenExpiry = null;
+      if (auth?.jwt !== jwt || session.isActive()) return;
+      auth = null;
+      dropLiveSession();
+      events.emit("session-expired");
+    }, Math.max(0, expiresAt - Date.now()));
+  }
   if (persistSession) {
-    const saved = loadSession(SESSION_KEY);
-    if (saved?.handle && saved.expiresAt > Date.now() + 5e3) {
+    const saved = loadSession(SESSION_KEY) ?? (LEGACY_SESSION_KEY !== SESSION_KEY ? loadSession(LEGACY_SESSION_KEY) : null);
+    if (saved && saved.expiresAt > Date.now() + 5e3) {
       try {
-        session.resume(saved.handle, saved.addresses, saved.expiresAt);
+        if (saved.handle) session.resume(saved.handle, saved.addresses, saved.expiresAt);
+        else scheduleAccessTokenExpiry(saved.jwt, saved.expiresAt);
         auth = { jwt: saved.jwt, userId: saved.userId, addresses: saved.addresses };
         persisted = { userId: saved.userId, addresses: saved.addresses };
       } catch {
@@ -3856,6 +3938,7 @@ async function createDecaneConnect(config) {
     } else if (saved) {
       dropLiveSession();
     }
+    if (LEGACY_SESSION_KEY !== SESSION_KEY) clearSessionPersist(LEGACY_SESSION_KEY);
   }
   events.on("session-expired", () => dropLiveSession());
   async function passwordSetup() {
@@ -4573,6 +4656,27 @@ async function createDecaneConnect(config) {
       const result = await api.authExternal(token, opts?.providerId);
       return handleAuthResult(result);
     },
+    async connectWithAccessToken(token) {
+      const claims = decodeAccessToken(token);
+      if (!claims) throw new InvalidAccessTokenError("not a Decane access token");
+      if (claims.expiresAt <= Date.now() + 5e3) throw new InvalidAccessTokenError("it has expired");
+      const raw = await api.getAddresses(token);
+      if (!raw.evm || !raw.solana) throw new InvalidAccessTokenError("this account holds no wallet yet");
+      const addresses = { evm: raw.evm, solana: raw.solana, tron: raw.tron ?? evmToTronAddress2(raw.evm) };
+      if (session.isActive()) session.end();
+      auth = { jwt: token, userId: claims.userId, addresses };
+      persisted = { userId: claims.userId, addresses };
+      savePersisted(PERSIST_KEY, persisted);
+      events.emit("connected");
+      persistLiveSession();
+      scheduleAccessTokenExpiry(token, claims.expiresAt);
+      const stored = await storage.getShare(claims.userId);
+      return {
+        addresses,
+        isNewUser: false,
+        ...stored?.profile ? { profile: stored.profile } : {}
+      };
+    },
     async connectWithEmail(email) {
       await startEmailAuth(api, email);
       return { codeRequired: true };
@@ -4819,8 +4923,7 @@ async function createDecaneConnect(config) {
         return bufferToB64u(sig);
       }
       if (req.chain.startsWith("tron:")) {
-        const msg = typeof req.message === "string" ? req.message : new TextDecoder().decode(req.message);
-        return tee.sign({ chain: req.chain, kind: "message", payload: msg }, auth?.jwt);
+        return tee.sign({ chain: req.chain, kind: "message", payload: messageAsString(req.message) }, auth?.jwt);
       }
       throw new CallSequenceError(`Unsupported chain: ${req.chain}`);
     },
@@ -7558,6 +7661,18 @@ function DecaneKit({ config, children }) {
       throw e;
     }
   }, [clearPhase]);
+  const connectWithAccessToken = (0, import_react5.useCallback)(async (token) => {
+    const sdk = socialRef.current;
+    if (!sdk) throw new Error("Social sign-in not configured");
+    try {
+      const result = await sdk.connectWithAccessToken(token);
+      applyResult(result);
+      setSelectorOpen(false);
+    } catch (e) {
+      clearPhase();
+      throw e;
+    }
+  }, [clearPhase]);
   const customAuthConfig = config?.social?.customAuth;
   const connectWithCustomAuth = (0, import_react5.useCallback)(async () => {
     if (!customAuthConfig) throw new Error("Custom auth not configured");
@@ -7750,6 +7865,7 @@ function DecaneKit({ config, children }) {
         connectWithPhone,
         verifyPhoneCode: verifyPhoneCode2,
         connectWithToken,
+        connectWithAccessToken,
         customAuthLabel: customAuthConfig?.label,
         connectWithCustomAuth: customAuthConfig ? connectWithCustomAuth : void 0,
         socialUnlock,
@@ -7865,6 +7981,7 @@ function useSocialAuth() {
     connectWithPhone,
     verifyPhoneCode: verifyPhoneCode2,
     connectWithToken,
+    connectWithAccessToken,
     customAuthLabel,
     connectWithCustomAuth,
     signInWithPasskey: ctxSignInWithPasskey,
@@ -7973,6 +8090,18 @@ function useSocialAuth() {
       setTokenLoading(false);
     }
   }, [connectWithToken]);
+  const signInWithAccessToken = (0, import_react6.useCallback)(async (token) => {
+    setTokenLoading(true);
+    setError(null);
+    try {
+      await connectWithAccessToken(token);
+    } catch (e) {
+      setError(e.message);
+      throw e;
+    } finally {
+      setTokenLoading(false);
+    }
+  }, [connectWithAccessToken]);
   const signInWithCustomAuth = (0, import_react6.useCallback)(async () => {
     if (!connectWithCustomAuth) throw new Error("Custom auth not configured");
     setCustomLoading(true);
@@ -8055,6 +8184,7 @@ function useSocialAuth() {
     sendPhoneCode,
     confirmPhoneCode,
     signInWithToken,
+    signInWithAccessToken,
     signInWithCustomAuth: connectWithCustomAuth ? signInWithCustomAuth : void 0,
     signInWithPasskey,
     unlock,
@@ -8604,6 +8734,7 @@ function useSignTypedData() {
   DecaneMark,
   DecaneWordmark,
   ExportNotAuthorizedError,
+  InvalidAccessTokenError,
   InvalidApiKeyError,
   InvalidPinError,
   InvalidRecoveryFileError,