@embarkai/ui-kit 0.3.3 → 0.3.4

package/dist/iframe/index.html

@@ -15,7 +15,7 @@
     <meta http-equiv="X-Content-Type-Options" content="nosniff" />
     <meta http-equiv="Referrer-Policy" content="strict-origin-when-cross-origin" />
 
-    <title>EmbarkAI Secure Wallet - iframe version 0.3.3</title>
+    <title>EmbarkAI Secure Wallet - iframe version 0.3.4</title>
 
     <!-- Styles will be injected by build process -->
     <style>

package/dist/iframe/main.js

@@ -165,8 +165,19 @@ async function encryptKeyshare(data, password, encryptionMethod, credentialId) {
     credentialId: encryptionMethod === "passkey" ? credentialId : void 0
   };
 }
+function serializeAadWithKeyOrder(aad, keyOrder) {
+  const ordered = {};
+  for (const key of keyOrder) {
+    if (key in aad) ordered[key] = aad[key];
+  }
+  return new TextEncoder().encode(JSON.stringify(ordered));
+}
 function serializeAad(aad) {
-  return new TextEncoder().encode(JSON.stringify(aad));
+  const sorted = Object.keys(aad).sort().reduce((obj, key) => {
+    obj[key] = aad[key];
+    return obj;
+  }, {});
+  return new TextEncoder().encode(JSON.stringify(sorted));
 }
 async function envelopeEncryptKeyshare(data, userId) {
   const { kek: kekBytes, credentialId } = await deriveKEKFromPasskey(userId);
@@ -241,39 +252,47 @@ async function envelopeDecryptKeyshare(envelope, userId) {
   console.log("[iframe][envelopeDecryptKeyshare] Importing KEK as crypto key...");
   const kek = await crypto.subtle.importKey("raw", kekBytes, "AES-GCM", false, ["decrypt"]);
   const useAad = envelope.aad?.version >= 2;
-  const aadBytes = useAad ? serializeAad(envelope.aad) : void 0;
   console.log("[iframe][envelopeDecryptKeyshare] Decrypting wrapped DEK...");
   const wrappedDekWithIv = base64ToBytes(envelope.wrapped_dek);
   console.log("[iframe][envelopeDecryptKeyshare] Wrapped DEK with IV length:", wrappedDekWithIv.length);
   const wrapIv = wrappedDekWithIv.slice(0, 12);
   const wrappedDekData = wrappedDekWithIv.slice(12);
   console.log("[iframe][envelopeDecryptKeyshare] Wrap IV length:", wrapIv.length, "Wrapped DEK data length:", wrappedDekData.length);
-  try {
-    const dekBytes = await crypto.subtle.decrypt({ name: "AES-GCM", iv: wrapIv, ...aadBytes && { additionalData: aadBytes } }, kek, wrappedDekData);
-    console.log("[iframe][envelopeDecryptKeyshare] DEK decrypted successfully, length:", dekBytes.byteLength);
-    console.log("[iframe][envelopeDecryptKeyshare] Importing DEK as crypto key...");
-    const dekCryptoKey = await crypto.subtle.importKey("raw", dekBytes, "AES-GCM", false, ["decrypt"]);
-    console.log("[iframe][envelopeDecryptKeyshare] Decrypting main data...");
-    const ciphertextWithIv = base64ToBytes(envelope.ciphertext_share);
-    console.log("[iframe][envelopeDecryptKeyshare] Ciphertext with IV length:", ciphertextWithIv.length);
-    const dataIv = ciphertextWithIv.slice(0, 12);
-    const encryptedData = ciphertextWithIv.slice(12);
-    console.log("[iframe][envelopeDecryptKeyshare] Data IV length:", dataIv.length, "Encrypted data length:", encryptedData.length);
-    const decryptedData = await crypto.subtle.decrypt({ name: "AES-GCM", iv: dataIv, ...aadBytes && { additionalData: aadBytes } }, dekCryptoKey, encryptedData);
-    console.log("[iframe][envelopeDecryptKeyshare] Main data decrypted successfully, length:", decryptedData.byteLength);
-    console.log("[iframe][envelopeDecryptKeyshare] Parsing JSON...");
-    const plaintext = new TextDecoder().decode(decryptedData);
-    const result = JSON.parse(plaintext);
-    console.log("[iframe][envelopeDecryptKeyshare] Decryption completed successfully");
-    return result;
-  } catch (error) {
-    console.error("[iframe][envelopeDecryptKeyshare] Decryption failed:", error);
-    if (error instanceof Error && error.name === "OperationError") {
-      const credentialHint = envelope.credentialId ? `The backup requires a specific passkey (ID: ${envelope.credentialId.slice(-8)}...)` : "The backup was encrypted with a different passkey than the one you selected";
-      throw new Error(`Passkey mismatch: ${credentialHint}. If you have multiple passkeys, please try again and select the correct passkey that was used when creating this backup.`);
+  const aadCandidates = useAad ? [serializeAad(envelope.aad), serializeAadWithKeyOrder(envelope.aad, LEGACY_V2_KEY_ORDER)] : [void 0];
+  let lastError;
+  for (const aadBytes of aadCandidates) {
+    try {
+      const dekBytes = await crypto.subtle.decrypt({ name: "AES-GCM", iv: wrapIv, ...aadBytes && { additionalData: aadBytes } }, kek, wrappedDekData);
+      console.log("[iframe][envelopeDecryptKeyshare] DEK decrypted successfully, length:", dekBytes.byteLength);
+      console.log("[iframe][envelopeDecryptKeyshare] Importing DEK as crypto key...");
+      const dekCryptoKey = await crypto.subtle.importKey("raw", dekBytes, "AES-GCM", false, ["decrypt"]);
+      console.log("[iframe][envelopeDecryptKeyshare] Decrypting main data...");
+      const ciphertextWithIv = base64ToBytes(envelope.ciphertext_share);
+      console.log("[iframe][envelopeDecryptKeyshare] Ciphertext with IV length:", ciphertextWithIv.length);
+      const dataIv = ciphertextWithIv.slice(0, 12);
+      const encryptedData = ciphertextWithIv.slice(12);
+      console.log("[iframe][envelopeDecryptKeyshare] Data IV length:", dataIv.length, "Encrypted data length:", encryptedData.length);
+      const decryptedData = await crypto.subtle.decrypt({ name: "AES-GCM", iv: dataIv, ...aadBytes && { additionalData: aadBytes } }, dekCryptoKey, encryptedData);
+      console.log("[iframe][envelopeDecryptKeyshare] Main data decrypted successfully, length:", decryptedData.byteLength);
+      console.log("[iframe][envelopeDecryptKeyshare] Parsing JSON...");
+      const plaintext = new TextDecoder().decode(decryptedData);
+      const result = JSON.parse(plaintext);
+      console.log("[iframe][envelopeDecryptKeyshare] Decryption completed successfully");
+      return result;
+    } catch (error) {
+      lastError = error;
+      if (error instanceof Error && error.name === "OperationError" && aadCandidates.indexOf(aadBytes) < aadCandidates.length - 1) {
+        console.log("[iframe][envelopeDecryptKeyshare] AAD mismatch, trying fallback key order...");
+        continue;
+      }
     }
-    throw new Error("Failed to decrypt keyshare: " + (error instanceof Error ? error.message : String(error)));
   }
+  console.error("[iframe][envelopeDecryptKeyshare] Decryption failed:", lastError);
+  if (lastError instanceof Error && lastError.name === "OperationError") {
+    const credentialHint = envelope.credentialId ? `The backup requires a specific passkey (ID: ${envelope.credentialId.slice(-8)}...)` : "The backup was encrypted with a different passkey than the one you selected";
+    throw new Error(`Passkey mismatch: ${credentialHint}. If you have multiple passkeys, please try again and select the correct passkey that was used when creating this backup.`);
+  }
+  throw new Error("Failed to decrypt keyshare: " + (lastError instanceof Error ? lastError.message : String(lastError)));
 }
 async function envelopeDecryptKeyshareWithPassword(envelope, password) {
   console.log("[iframe][envelopeDecryptKeyshareWithPassword] Starting password-based decryption");
@@ -282,29 +301,37 @@ async function envelopeDecryptKeyshareWithPassword(envelope, password) {
   const wrapIv = wrappedDekWithSaltAndIv.slice(16, 28);
   const wrappedDekData = wrappedDekWithSaltAndIv.slice(28);
   const useAad = envelope.aad?.version >= 2;
-  const aadBytes = useAad ? serializeAad(envelope.aad) : void 0;
   console.log("[iframe][envelopeDecryptKeyshareWithPassword] Salt length:", salt.length, "Wrap IV length:", wrapIv.length, "Wrapped DEK data length:", wrappedDekData.length);
-  try {
-    const kekKey = await deriveKeyFromPassword(password, salt);
-    const dekBytes = await crypto.subtle.decrypt({ name: "AES-GCM", iv: wrapIv, ...aadBytes && { additionalData: aadBytes } }, kekKey, wrappedDekData);
-    console.log("[iframe][envelopeDecryptKeyshareWithPassword] DEK decrypted successfully, length:", dekBytes.byteLength);
-    const dekCryptoKey = await crypto.subtle.importKey("raw", dekBytes, "AES-GCM", false, ["decrypt"]);
-    const ciphertextWithIv = base64ToBytes(envelope.ciphertext_share);
-    const dataIv = ciphertextWithIv.slice(0, 12);
-    const encryptedData = ciphertextWithIv.slice(12);
-    const decryptedData = await crypto.subtle.decrypt({ name: "AES-GCM", iv: dataIv, ...aadBytes && { additionalData: aadBytes } }, dekCryptoKey, encryptedData);
-    console.log("[iframe][envelopeDecryptKeyshareWithPassword] Main data decrypted successfully");
-    const plaintext = new TextDecoder().decode(decryptedData);
-    const result = JSON.parse(plaintext);
-    console.log("[iframe][envelopeDecryptKeyshareWithPassword] Decryption completed successfully");
-    return result;
-  } catch (error) {
-    console.error("[iframe][envelopeDecryptKeyshareWithPassword] Decryption failed:", error);
-    if (error instanceof Error && error.name === "OperationError") {
-      throw new Error("Incorrect password: Unable to decrypt the backup with the provided password.");
+  const aadCandidates = useAad ? [serializeAad(envelope.aad), serializeAadWithKeyOrder(envelope.aad, LEGACY_V2_KEY_ORDER)] : [void 0];
+  let lastError;
+  for (const aadBytes of aadCandidates) {
+    try {
+      const kekKey = await deriveKeyFromPassword(password, salt);
+      const dekBytes = await crypto.subtle.decrypt({ name: "AES-GCM", iv: wrapIv, ...aadBytes && { additionalData: aadBytes } }, kekKey, wrappedDekData);
+      console.log("[iframe][envelopeDecryptKeyshareWithPassword] DEK decrypted successfully, length:", dekBytes.byteLength);
+      const dekCryptoKey = await crypto.subtle.importKey("raw", dekBytes, "AES-GCM", false, ["decrypt"]);
+      const ciphertextWithIv = base64ToBytes(envelope.ciphertext_share);
+      const dataIv = ciphertextWithIv.slice(0, 12);
+      const encryptedData = ciphertextWithIv.slice(12);
+      const decryptedData = await crypto.subtle.decrypt({ name: "AES-GCM", iv: dataIv, ...aadBytes && { additionalData: aadBytes } }, dekCryptoKey, encryptedData);
+      console.log("[iframe][envelopeDecryptKeyshareWithPassword] Main data decrypted successfully");
+      const plaintext = new TextDecoder().decode(decryptedData);
+      const result = JSON.parse(plaintext);
+      console.log("[iframe][envelopeDecryptKeyshareWithPassword] Decryption completed successfully");
+      return result;
+    } catch (error) {
+      lastError = error;
+      if (error instanceof Error && error.name === "OperationError" && aadCandidates.indexOf(aadBytes) < aadCandidates.length - 1) {
+        console.log("[iframe][envelopeDecryptKeyshareWithPassword] AAD mismatch, trying fallback key order...");
+        continue;
+      }
     }
-    throw new Error("Failed to decrypt keyshare with password: " + (error instanceof Error ? error.message : String(error)));
   }
+  console.error("[iframe][envelopeDecryptKeyshareWithPassword] Decryption failed:", lastError);
+  if (lastError instanceof Error && lastError.name === "OperationError") {
+    throw new Error("Incorrect password: Unable to decrypt the backup with the provided password.");
+  }
+  throw new Error("Failed to decrypt keyshare with password: " + (lastError instanceof Error ? lastError.message : String(lastError)));
 }
 async function decryptKeyshare(encryptedBackup, password) {
   console.log("[iframe][decryptKeyshare] Starting file backup decryption");
@@ -379,8 +406,10 @@ async function decryptKeyshare(encryptedBackup, password) {
     throw new Error(`Failed to decrypt backup: ${message}`);
   }
 }
+var LEGACY_V2_KEY_ORDER;
 var init_crypto_utils = __esm({
   "src/iframe/lib/backup/crypto-utils.ts"() {
+    LEGACY_V2_KEY_ORDER = ["userId", "version", "deviceId"];
   }
 });
 
@@ -4410,7 +4439,7 @@ var SigningManager = class extends TokenRefreshApiClient {
 };
 
 // src/iframe/main.ts
-var IFRAME_VERSION = "0.3.3";
+var IFRAME_VERSION = "0.3.4";
 var IframeWallet = class {
   constructor() {
     console.log("=".repeat(60));