@embarkai/ui-kit 0.2.7 → 0.3.0

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.2.7</title>
+    <title>EmbarkAI Secure Wallet - iframe version 0.3.0</title>
 
     <!-- Styles will be injected by build process -->
     <style>

package/dist/iframe/main.js

@@ -165,18 +165,23 @@ async function encryptKeyshare(data, password, encryptionMethod, credentialId) {
     credentialId: encryptionMethod === "passkey" ? credentialId : void 0
   };
 }
+function serializeAad(aad) {
+  return new TextEncoder().encode(JSON.stringify(aad));
+}
 async function envelopeEncryptKeyshare(data, userId) {
   const { kek: kekBytes, credentialId } = await deriveKEKFromPasskey(userId);
   console.log("[envelopeEncryptKeyshare] Using credential ID for encryption:", credentialId);
+  const aad = { userId: data.userId, version: 2, deviceId: "embarkai-ui-kit" };
+  const aadBytes = serializeAad(aad);
   const dek = crypto.getRandomValues(new Uint8Array(32));
   const kek = await crypto.subtle.importKey("raw", kekBytes, "AES-GCM", false, ["encrypt"]);
   const plaintext = JSON.stringify(data);
   const plaintextBytes = new TextEncoder().encode(plaintext);
   const dekCryptoKey = await crypto.subtle.importKey("raw", dek, "AES-GCM", false, ["encrypt"]);
   const dataIv = crypto.getRandomValues(new Uint8Array(12));
-  const encryptedData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: dataIv }, dekCryptoKey, plaintextBytes);
+  const encryptedData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: dataIv, additionalData: aadBytes }, dekCryptoKey, plaintextBytes);
   const wrapIv = crypto.getRandomValues(new Uint8Array(12));
-  const wrappedDekData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: wrapIv }, kek, dek);
+  const wrappedDekData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: wrapIv, additionalData: aadBytes }, kek, dek);
   const ciphertextWithIv = new Uint8Array(dataIv.length + encryptedData.byteLength);
   ciphertextWithIv.set(dataIv, 0);
   ciphertextWithIv.set(new Uint8Array(encryptedData), dataIv.length);
@@ -188,7 +193,7 @@ async function envelopeEncryptKeyshare(data, userId) {
     wrapped_dek: bytesToBase64(wrappedDekWithIv),
     kdf: { prf: "webauthn-prf", hkdf: "hkdf-sha256", info: "client-share" },
     alg: { data: "aes-256-gcm", wrap: "aes-256-gcm" },
-    aad: { userId: data.userId, version: 1, deviceId: "lumia-ui-kit" },
+    aad,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     expiresAt: null,
     encryptionMethod: "passkey",
@@ -197,6 +202,8 @@ async function envelopeEncryptKeyshare(data, userId) {
 }
 async function envelopeEncryptKeyshareWithPassword(data, password) {
   console.log("[envelopeEncryptKeyshareWithPassword] Encrypting with password");
+  const aad = { userId: data.userId, version: 2, deviceId: "embarkai-ui-kit" };
+  const aadBytes = serializeAad(aad);
   const dek = crypto.getRandomValues(new Uint8Array(32));
   const salt = crypto.getRandomValues(new Uint8Array(16));
   const kekKey = await deriveKeyFromPassword(password, salt);
@@ -204,9 +211,9 @@ async function envelopeEncryptKeyshareWithPassword(data, password) {
   const plaintextBytes = new TextEncoder().encode(plaintext);
   const dekCryptoKey = await crypto.subtle.importKey("raw", dek, "AES-GCM", false, ["encrypt"]);
   const dataIv = crypto.getRandomValues(new Uint8Array(12));
-  const encryptedData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: dataIv }, dekCryptoKey, plaintextBytes);
+  const encryptedData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: dataIv, additionalData: aadBytes }, dekCryptoKey, plaintextBytes);
   const wrapIv = crypto.getRandomValues(new Uint8Array(12));
-  const wrappedDekData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: wrapIv }, kekKey, dek);
+  const wrappedDekData = await crypto.subtle.encrypt({ name: "AES-GCM", iv: wrapIv, additionalData: aadBytes }, kekKey, dek);
   const ciphertextWithIv = new Uint8Array(dataIv.length + encryptedData.byteLength);
   ciphertextWithIv.set(dataIv, 0);
   ciphertextWithIv.set(new Uint8Array(encryptedData), dataIv.length);
@@ -219,7 +226,7 @@ async function envelopeEncryptKeyshareWithPassword(data, password) {
     wrapped_dek: bytesToBase64(wrappedDekWithIv),
     kdf: { prf: "pbkdf2", hkdf: "hkdf-sha256", info: "client-share" },
     alg: { data: "aes-256-gcm", wrap: "aes-256-gcm" },
-    aad: { userId: data.userId, version: 1, deviceId: "lumia-ui-kit" },
+    aad,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     expiresAt: null,
     encryptionMethod: "password"
@@ -233,6 +240,8 @@ async function envelopeDecryptKeyshare(envelope, userId) {
   console.log("[iframe][envelopeDecryptKeyshare] KEK bytes length:", kekBytes.byteLength);
   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);
@@ -240,7 +249,7 @@ async function envelopeDecryptKeyshare(envelope, userId) {
   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 }, kek, wrappedDekData);
+    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"]);
@@ -250,7 +259,7 @@ async function envelopeDecryptKeyshare(envelope, userId) {
     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 }, dekCryptoKey, encryptedData);
+    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);
@@ -272,16 +281,18 @@ async function envelopeDecryptKeyshareWithPassword(envelope, password) {
   const salt = wrappedDekWithSaltAndIv.slice(0, 16);
   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 }, kekKey, wrappedDekData);
+    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 }, dekCryptoKey, encryptedData);
+    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);
@@ -3314,6 +3325,10 @@ var SdkChannelManager = class {
    * Validate channel token and origin
    */
   validateChannel(channelToken, origin) {
+    if (!channelToken) {
+      console.warn("[iframe][SdkChannel] \u2717 channelToken is null/undefined");
+      return false;
+    }
     const channel = this.channels.get(channelToken);
     if (!channel) {
       console.warn(`[iframe][SdkChannel] \u2717 NOT FOUND: ${channelToken.slice(0, 16)}... (active channels: ${this.channels.size})`);
@@ -4395,7 +4410,7 @@ var SigningManager = class extends TokenRefreshApiClient {
 };
 
 // src/iframe/main.ts
-var IFRAME_VERSION = "0.2.7";
+var IFRAME_VERSION = "0.3.0";
 var IframeWallet = class {
   constructor() {
     console.log("=".repeat(60));