decane-connect-kit 2.16.0 → 2.17.0

package/dist/index.js

@@ -3776,13 +3776,20 @@ async function createDecaneConnect(config) {
   async function registerPasskeyForDevice(userId, jwt, deviceShare) {
     if (!isPasskeySupported()) throw new WebAuthnNotSupportedError();
     const prfSalt = generateRandomBytes(32);
-    const { credentialId, prfOutput } = await registerWebAuthnCredential({
-      api,
-      jwt,
-      rpId,
-      rpName,
-      prfSalt
-    });
+    let credentialId;
+    let prfOutput;
+    try {
+      ({ credentialId, prfOutput } = await registerWebAuthnCredential({
+        api,
+        jwt,
+        rpId,
+        rpName,
+        prfSalt
+      }));
+    } catch (e) {
+      if (e?.name !== "InvalidStateError") throw e;
+      return adoptExistingPasskey(userId, jwt, deviceShare);
+    }
     let key = prfOutput;
     if (!key) {
       try {
@@ -3795,7 +3802,10 @@ async function createDecaneConnect(config) {
       }
     }
     if (!key) throw new WebAuthnNotSupportedError();
-    const wrappingKey = await importAesKey(key);
+    await storeShareUnderPasskey(userId, jwt, deviceShare, credentialId, key, prfSalt);
+  }
+  async function storeShareUnderPasskey(userId, jwt, deviceShare, credentialId, prfOutput, prfSalt) {
+    const wrappingKey = await importAesKey(prfOutput);
     const iv = generateRandomBytes(12);
     const wrappedDeviceShare = await aesGcmEncrypt(wrappingKey, deviceShare, iv);
     const existing = await storage.getShare(userId);
@@ -3827,6 +3837,24 @@ async function createDecaneConnect(config) {
       console.warn("decane-connect-kit: wrapped share backup upload failed; user can retry from settings.", e);
     }
   }
+  async function adoptExistingPasskey(userId, jwt, deviceShare) {
+    const options = await api.getWebAuthnLoginOptions(userId, rpId);
+    if (!options) throw new WebAuthnNotSupportedError();
+    const prfSalt = generateRandomBytes(32);
+    const { response, prfOutput } = await authenticateWithPasskey({
+      optionsJSON: options,
+      prfSalt
+    });
+    if (!prfOutput) throw new WebAuthnNotSupportedError();
+    await storeShareUnderPasskey(
+      userId,
+      jwt,
+      deviceShare,
+      b64uToBuffer(response.id),
+      prfOutput,
+      prfSalt
+    );
+  }
   async function registerPasskeyAndBackup(userId, jwt, deviceShare) {
     if (!isPasskeySupported()) return;
     try {