@mocanetwork/airkit 1.6.0-beta.0 → 1.6.0-beta.2

package/dist/airkit.cjs.js

@@ -97,7 +97,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "1.6.0-beta.0";
+var version = "1.6.0-beta.2";
 var airkitPackage = {
 	version: version};
 
@@ -116,7 +116,6 @@ const AirAuthMessageTypes = {
   REFRESH_TOKEN_RESPONSE: "air_auth_refresh_token_response",
   WALLET_TOKEN_REQUEST: "air_auth_wallet_token_request",
   WALLET_TOKEN_RESPONSE: "air_auth_wallet_token_response",
-  INIT_WALLET_COMMUNICATION: "air_auth_init_wallet_communication",
   IFRAME_VISIBILITY_REQUEST: "air_auth_iframe_visibility_request",
   SETUP_WALLET_REQUEST: "air_auth_setup_wallet_request",
   SETUP_WALLET_RESPONSE: "air_auth_setup_wallet_response",
@@ -130,15 +129,10 @@ const AirAuthMessageTypes = {
   PARTNER_ACCESS_TOKEN_RESPONSE: "air_auth_partner_access_token_response",
   LOGOUT_REQUEST: "air_auth_logout_request",
   LOGOUT_RESPONSE: "air_auth_logout_response",
-  RESET_WALLET_COMMUNICATION: "air_auth_reset_wallet_communication",
-  INIT_RECOVERY_COMMUNICATION: "air_auth_init_recovery_communication",
-  RESET_RECOVERY_COMMUNICATION: "air_auth_reset_recovery_communication",
   START_RECOVERY_REQUEST: "air_start_recovery_request",
   START_RECOVERY_RESPONSE: "air_start_recovery_response",
   RECOVERY_REQUEST: "air_auth_recovery_request",
   RECOVERY_RESPONSE: "air_auth_recovery_response",
-  INIT_CREDENTIAL_COMMUNICATION: "air_auth_init_credential_communication",
-  RESET_CREDENTIAL_COMMUNICATION: "air_auth_reset_credential_communication",
   EXPIRED_LOGOUT_REQUEST: "air_auth_expired_logout_request"
 };
 
@@ -146,10 +140,6 @@ const AirCredentialMessageTypes = {
   SERVICE_STARTED: "air_credential_service_started",
   INITIALIZATION_REQUEST: "air_credential_initialization_request",
   INITIALIZATION_RESPONSE: "air_credential_initialization_response",
-  INIT_AUTH_COMMUNICATION: "air_credential_init_auth_communication",
-  CREDENTIAL_AUTH_INITIALIZED: "air_credential_auth_initialized",
-  INIT_WALLET_COMMUNICATION: "air_credential_init_wallet_communication",
-  CREDENTIAL_WALLET_INITIALIZED: "air_credential_wallet_initialized",
   CREDENTIAL_IFRAME_VISIBILITY_REQUEST: "air_credential_iframe_visibility_request",
   LOGOUT_REQUEST: "air_credential_logout_request",
   LOGOUT_RESPONSE: "air_credential_logout_response",
@@ -165,7 +155,6 @@ const AirRecoveryMessageTypes = {
   SERVICE_STARTED: "air_recovery_service_started",
   INITIALIZATION_REQUEST: "air_recovery_initialization_request",
   INITIALIZATION_RESPONSE: "air_recovery_initialization_response",
-  INIT_AUTH_COMMUNICATION: "air_recovery_init_auth_communication",
   RECOVERY_INITIALIZED: "air_recovery_initialized",
   RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request",
   LOGOUT_REQUEST: "air_recovery_logout_request",
@@ -178,7 +167,6 @@ const AirWalletMessageTypes = {
   INITIALIZATION_RESPONSE: "air_initialization_response",
   CLOSE_MODAL_REQUEST: "air_close_modal_request",
   CLOSE_MODAL_RESPONSE: "air_close_modal_response",
-  INIT_AUTH_COMMUNICATION: "air_init_auth_communication",
   WALLET_INITIALIZED: "air_wallet_initialized",
   WALLET_LOGIN_REQUEST: "air_wallet_login_request",
   WALLET_LOGIN_RESPONSE: "air_wallet_login_response",
@@ -197,8 +185,6 @@ const AirWalletMessageTypes = {
   IS_SMART_ACCOUNT_DEPLOYED_RESPONSE: "air_is_smart_account_deployed_response",
   LOGOUT_REQUEST: "air_logout_request",
   LOGOUT_RESPONSE: "air_logout_response",
-  INIT_CREDENTIAL_COMMUNICATION: "air_init_credential_communication",
-  RESET_CREDENTIAL_COMMUNICATION: "air_reset_credential_communication",
   INTERNAL_PROVIDER_REQUEST: "air_internal_provider_request",
   INTERNAL_PROVIDER_RESPONSE: "air_internal_provider_response"
 };
@@ -1685,6 +1671,7 @@ class AirError extends BaseError {}
 new Set(AirClientUserErrors);
 new Set(Object.values(Codes));
 
+class OutgoingMessageEvent extends MessageEvent {}
 class MessageServiceBase {
   get events$() {
     return this._events$;
@@ -1700,13 +1687,16 @@ class MessageServiceBase {
     this.allowedMessageTypes = allowedMessageTypes;
     this.closeListener = null;
   }
+  static _getName(name, targetName) {
+    return `${name} Service: ${targetName} Channel`;
+  }
   async _open(target) {
     await this.close();
     this.eventSubject = new Subject();
     this._events$ = this.eventSubject.asObservable();
     this._messages$ = this.eventSubject.pipe(map(ev => ev.data));
     this._events$.subscribe(event => {
-      const sentOrReceived = event.origin === window.origin ? "sent" : "received";
+      const sentOrReceived = event instanceof OutgoingMessageEvent ? "sent" : "received";
       log.debug(`[${this.name}] Message ${sentOrReceived}:`, JSON.stringify(event.data, bigIntReplacer));
     });
     const handleMessage = async ev => {
@@ -1778,7 +1768,7 @@ class MessageServiceBase {
       log.debug(`[${this.name}] Not opened yet`);
       return;
     }
-    this.eventSubject.next(new MessageEvent("message", {
+    this.eventSubject.next(new OutgoingMessageEvent("message", {
       data: clonedMessage,
       origin: window.origin
     }));
@@ -1943,8 +1933,6 @@ const ALLOWED_AUTH_MESSAGES = [
     AirAuthMessageTypes.LOGIN_RESPONSE,
     AirAuthMessageTypes.SETUP_WALLET_REQUEST,
     AirAuthMessageTypes.SETUP_RECOVERY_REQUEST,
-    AirAuthMessageTypes.INIT_RECOVERY_COMMUNICATION,
-    AirAuthMessageTypes.RESET_RECOVERY_COMMUNICATION,
     AirAuthMessageTypes.LOGOUT_RESPONSE,
     AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE,
     AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE,
@@ -1965,11 +1953,6 @@ class AuthMessageService extends MessageServiceBase {
         const window = authIframe.contentWindow;
         await super._open({ window, origin });
     }
-    async initWalletCommunication() {
-        await this.sendMessage({
-            type: AirAuthMessageTypes.INIT_WALLET_COMMUNICATION,
-        });
-    }
     async sendPartnerUserInfoRequest() {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE)));
         await this.sendMessage({
@@ -1983,14 +1966,14 @@ class AuthMessageService extends MessageServiceBase {
         await this.sendMessage({ type: AirAuthMessageTypes.LOGIN_REQUEST, payload });
         return response;
     }
+    onLoggedIn() {
+        return firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.LOGIN_RESPONSE && msg.payload?.success === true)));
+    }
     async logout() {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.LOGOUT_RESPONSE)));
         await this.sendMessage({ type: AirAuthMessageTypes.LOGOUT_REQUEST });
         return response;
     }
-    async resetWalletCommunication() {
-        await this.sendMessage({ type: AirAuthMessageTypes.RESET_WALLET_COMMUNICATION });
-    }
     async sendInitializationRequest(payload) {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.INITIALIZATION_RESPONSE)));
         await this.sendMessage({ type: AirAuthMessageTypes.INITIALIZATION_REQUEST, payload });
@@ -2007,16 +1990,6 @@ class AuthMessageService extends MessageServiceBase {
     async sendSetupWalletErrorResponse(error) {
         await this.sendMessage(this.createErrorResponseMessage(AirAuthMessageTypes.SETUP_WALLET_RESPONSE, error));
     }
-    async initRecoveryCommunication() {
-        await this.sendMessage({
-            type: AirAuthMessageTypes.INIT_RECOVERY_COMMUNICATION,
-        });
-    }
-    async resetRecoveryCommunication() {
-        await this.sendMessage({
-            type: AirAuthMessageTypes.RESET_RECOVERY_COMMUNICATION,
-        });
-    }
     async sendSetupRecoverySuccessResponse() {
         await this.sendMessage({
             type: AirAuthMessageTypes.SETUP_RECOVERY_RESPONSE,
@@ -2053,19 +2026,6 @@ class AuthMessageService extends MessageServiceBase {
         await this.sendMessage({ type: AirAuthMessageTypes.START_RECOVERY_REQUEST, payload });
         return response;
     }
-    /*
-     * Initialize credential communication
-     */
-    async initCredentialCommunication() {
-        await this.sendMessage({
-            type: AirAuthMessageTypes.INIT_CREDENTIAL_COMMUNICATION,
-        });
-    }
-    async resetCredentialCommunication() {
-        await this.sendMessage({
-            type: AirAuthMessageTypes.RESET_CREDENTIAL_COMMUNICATION,
-        });
-    }
 }
 _a$3 = AuthMessageService;
 _AuthMessageService_instance = { value: void 0 };
@@ -2074,8 +2034,6 @@ var _a$2, _CredentialMessageService_instance;
 const ALLOWED_CREDENTIAL_MESSAGES = [
     AirCredentialMessageTypes.INITIALIZATION_RESPONSE,
     AirCredentialMessageTypes.CREDENTIAL_IFRAME_VISIBILITY_REQUEST,
-    AirCredentialMessageTypes.CREDENTIAL_AUTH_INITIALIZED,
-    AirCredentialMessageTypes.CREDENTIAL_WALLET_INITIALIZED,
     AirCredentialMessageTypes.LOGOUT_RESPONSE,
     AirCredentialMessageTypes.ISSUE_CREDENTIAL_RESPONSE,
     AirCredentialMessageTypes.VERIFY_CREDENTIAL_RESPONSE,
@@ -2101,20 +2059,6 @@ class CredentialMessageService extends MessageServiceBase {
         });
         return response;
     }
-    async initAuthCommunication() {
-        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirCredentialMessageTypes.CREDENTIAL_AUTH_INITIALIZED)));
-        await this.sendMessage({
-            type: AirCredentialMessageTypes.INIT_AUTH_COMMUNICATION,
-        });
-        return response;
-    }
-    async initWalletCommunication() {
-        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirCredentialMessageTypes.CREDENTIAL_WALLET_INITIALIZED)));
-        await this.sendMessage({
-            type: AirCredentialMessageTypes.INIT_WALLET_COMMUNICATION,
-        });
-        return response;
-    }
     async logout() {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirCredentialMessageTypes.LOGOUT_RESPONSE)));
         await this.sendMessage({
@@ -2235,11 +2179,6 @@ class RecoveryMessageService extends MessageServiceBase {
         });
         return response;
     }
-    async initAuthCommunication() {
-        await this.sendMessage({
-            type: AirRecoveryMessageTypes.INIT_AUTH_COMMUNICATION,
-        });
-    }
     async onInitialized() {
         return firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.RECOVERY_INITIALIZED)));
     }
@@ -2286,14 +2225,6 @@ class WalletMessageService extends MessageServiceBase {
         const window = walletIframe.contentWindow;
         await super._open({ window, origin });
     }
-    async initAuthCommunication(skipWalletLogin) {
-        await this.sendMessage({
-            type: AirWalletMessageTypes.INIT_AUTH_COMMUNICATION,
-            payload: {
-                skipWalletLogin,
-            },
-        });
-    }
     async sendDeploySmartAccountRequest() {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirWalletMessageTypes.DEPLOY_SMART_ACCOUNT_RESPONSE)));
         await this.sendMessage({
@@ -2387,16 +2318,6 @@ class WalletMessageService extends MessageServiceBase {
         });
         return response;
     }
-    async initCredentialCommunication() {
-        await this.sendMessage({
-            type: AirWalletMessageTypes.INIT_CREDENTIAL_COMMUNICATION,
-        });
-    }
-    async resetCredentialCommunication() {
-        await this.sendMessage({
-            type: AirWalletMessageTypes.RESET_CREDENTIAL_COMMUNICATION,
-        });
-    }
 }
 _a = WalletMessageService;
 _WalletMessageService_instance = { value: void 0 };
@@ -2595,7 +2516,7 @@ class WindowService {
 }
 var WindowService$1 = WindowService.instance;
 
-var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_authMessagingService, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airAuthListener, _AirService_walletMessagingService, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_walletLoggedInResult, _AirService_airWalletProvider, _AirService_recoveryInitialization, _AirService_recoveryMessagingService, _AirService_recoveryIframeController, _AirService_credentialsInitialization, _AirService_credentialMessagingService, _AirService_credentialIframeController, _AirService_ensureCredentials, _AirService_initializeCredentials, _AirService_subscribeToCredentialEvents, _AirService_cleanUpCredential, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_subscribeToWalletEvents, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_createWalletInitializedResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet, _AirService_ensureRecovery, _AirService_initializeRecovery, _AirService_subscribeToRecoveryEvents, _AirService_cleanUpRecovery;
+var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_authMessagingService, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airAuthListener, _AirService_walletMessagingService, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_walletLoggedInResult, _AirService_airWalletProvider, _AirService_recoveryInitialization, _AirService_recoveryMessagingService, _AirService_recoveryIframeController, _AirService_credentialsInitialization, _AirService_credentialMessagingService, _AirService_credentialIframeController, _AirService_ensureCredential, _AirService_initializeCredentials, _AirService_subscribeToCredentialEvents, _AirService_cleanUpCredential, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_subscribeToWalletEvents, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_createWalletInitializedResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet, _AirService_ensureRecovery, _AirService_initializeRecovery, _AirService_subscribeToRecoveryEvents, _AirService_cleanUpRecovery;
 const airKitVersion = airkitPackage.version;
 class AirService {
     constructor({ partnerId }) {
@@ -2736,7 +2657,7 @@ class AirService {
             __classPrivateFieldSet(this, _AirService_isAuthInitialized, true, "f");
             __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerAirAuthInitialized).call(this, { rehydrated: result.rehydrated });
             if (result.preloadWallet)
-                this.preloadWallet();
+                void this.preloadWallet();
             // rehydrated auth session
             if (result.rehydrated) {
                 __classPrivateFieldSet(this, _AirService_loginResult, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_createLoginResult).call(this, result), "f");
@@ -2939,8 +2860,6 @@ class AirService {
      * - "logged_in": User successfully logged in
      * - "logged_out": User logged out
      * - "wallet_initialized": Wallet initialization completed
-     * - "credential_issuance_finished": Credential issuance finished (success or failure)
-     * - "credential_verification_finished": Credential verification finished (success or failure)
      *
      * @param listener The event listener function
      */
@@ -2955,23 +2874,26 @@ class AirService {
     clearEventListeners() {
         __classPrivateFieldSet(this, _AirService_airAuthListener, [], "f");
     }
+    async preloadCredential() {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredential).call(this);
+    }
     async issueCredential({ authToken, issuerDid, credentialId, credentialSubject, }) {
-        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredentials).call(this);
-        try {
-            const { payload } = await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").sendIssueCredentialRequest({
-                partnerToken: authToken,
-                issuerDid,
-                credentialId,
-                credentialSubject,
-            });
-            return payload;
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredential).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").sendIssueCredentialRequest({
+            partnerToken: authToken,
+            issuerDid,
+            credentialId,
+            credentialSubject,
+        });
+        if (payload.closeDApp) {
+            window.close();
         }
-        catch (error) {
-            throw AirServiceError.from(error);
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
         }
     }
     async verifyCredential({ authToken, programId, redirectUrl, }) {
-        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredentials).call(this);
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureCredential).call(this);
         const { payload } = await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").sendVerifyCredentialRequest({
             partnerToken: authToken,
             programId,
@@ -2983,11 +2905,9 @@ class AirService {
         return payload.verificationResult;
     }
 }
-_AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_authMessagingService = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airAuthListener = new WeakMap(), _AirService_walletMessagingService = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_walletLoggedInResult = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_recoveryInitialization = new WeakMap(), _AirService_recoveryMessagingService = new WeakMap(), _AirService_recoveryIframeController = new WeakMap(), _AirService_credentialsInitialization = new WeakMap(), _AirService_credentialMessagingService = new WeakMap(), _AirService_credentialIframeController = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_ensureCredentials = async function _AirService_ensureCredentials() {
+_AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_authMessagingService = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airAuthListener = new WeakMap(), _AirService_walletMessagingService = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_walletLoggedInResult = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_recoveryInitialization = new WeakMap(), _AirService_recoveryMessagingService = new WeakMap(), _AirService_recoveryIframeController = new WeakMap(), _AirService_credentialsInitialization = new WeakMap(), _AirService_credentialMessagingService = new WeakMap(), _AirService_credentialIframeController = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_ensureCredential = async function _AirService_ensureCredential() {
     if (!this.isInitialized)
         throw new Error("Service not initialized");
-    if (!this.isLoggedIn)
-        throw new Error("User not logged in");
     void __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
     try {
         if (!__classPrivateFieldGet(this, _AirService_credentialsInitialization, "f"))
@@ -3004,11 +2924,12 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         throw new Error("Already initializing credentials");
     }
     const { credentialUrl } = AIR_URLS[__classPrivateFieldGet(this, _AirService_buildEnv, "f")];
-    const credentailIframeOrigin = new URL(credentialUrl).origin;
+    const credentialIframeOrigin = new URL(credentialUrl).origin;
+    let closeDApp = false;
     try {
         const credentialInitRequestPromise = new Promise((resolve, reject) => {
             const handleCredentialMessage = async (ev) => {
-                if (ev.origin !== credentailIframeOrigin)
+                if (ev.origin !== credentialIframeOrigin)
                     return;
                 if (ev.data === AirCredentialMessageTypes.SERVICE_STARTED) {
                     window.removeEventListener("message", handleCredentialMessage);
@@ -3016,12 +2937,14 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
                         partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                         enableLogging: __classPrivateFieldGet(this, _AirService_enableLogging, "f"),
                         sdkVersion: airKitVersion,
+                        partnerDAppUrl: window.location.href,
                         enableAutomation: this.shouldEnableAutomation(),
                     });
                     if (payload.success === true) {
                         resolve();
                     }
                     else {
+                        closeDApp = !!payload.closeDApp;
                         reject(new AirServiceError(payload.errorName, payload.errorMessage));
                     }
                 }
@@ -3034,18 +2957,15 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").open(__classPrivateFieldGet(this, _AirService_credentialIframeController, "f").iframeElement);
         __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_subscribeToCredentialEvents).call(this);
         await credentialInitRequestPromise;
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").initCredentialCommunication();
-        await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").initAuthCommunication();
-        log.info("[Embed] Credential auth channel initialized");
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
-        await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").initCredentialCommunication();
-        await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").initWalletCommunication();
-        log.info("[Embed] Credential wallet channel initialized");
         log.info("Credential service initialized successfully");
     }
     catch (error) {
         log.error("Error initializing credentials", error);
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpCredential).call(this);
+        if (closeDApp) {
+            window.close();
+        }
         throw error;
     }
 }, _AirService_subscribeToCredentialEvents = function _AirService_subscribeToCredentialEvents() {
@@ -3068,21 +2988,11 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         __classPrivateFieldGet(this, _AirService_credentialIframeController, "f").destroy();
         __classPrivateFieldSet(this, _AirService_credentialIframeController, undefined, "f");
     }
-    const walletIframeElement = __classPrivateFieldGet(this, _AirService_walletIframeController, "f")?.iframeElement;
-    if (isElement(walletIframeElement) && window.document.body.contains(walletIframeElement)) {
-        await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").resetCredentialCommunication();
-    }
-    const authIframeElement = __classPrivateFieldGet(this, _AirService_authIframeController, "f")?.iframeElement;
-    if (isElement(authIframeElement) && window.document.body.contains(authIframeElement)) {
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").resetCredentialCommunication();
-    }
     await __classPrivateFieldGet(this, _AirService_credentialMessagingService, "f").close();
     __classPrivateFieldSet(this, _AirService_credentialsInitialization, undefined, "f");
 }, _AirService_ensureWallet = async function _AirService_ensureWallet(option) {
     if (!this.isInitialized)
         throw new Error("Service not initialized");
-    if (!this.isLoggedIn && !option?.skipWalletLogin)
-        throw new Error("User not logged in");
     if (!__classPrivateFieldGet(this, _AirService_walletInitialization, "f"))
         __classPrivateFieldSet(this, _AirService_walletInitialization, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_initializeWallet).call(this, option), "f");
     if (__classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f"))
@@ -3141,8 +3051,9 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         await __classPrivateFieldGet(this, _AirService_airWalletProvider, "f").startEventMessageListening(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement);
         const walletInitPromise = __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").onInitialized();
         await walletInitRequestPromise;
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").initWalletCommunication();
-        await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").initAuthCommunication(option?.skipWalletLogin ?? false);
+        if (!this.isLoggedIn && !option?.skipWalletLogin) {
+            await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").onLoggedIn();
+        }
         const walletInitResult = await walletInitPromise;
         if (walletInitResult.payload.success !== true) {
             throw new AirServiceError(walletInitResult.payload.errorName, walletInitResult.payload.errorMessage);
@@ -3261,10 +3172,6 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         __classPrivateFieldGet(this, _AirService_walletIframeController, "f").destroy();
         __classPrivateFieldSet(this, _AirService_walletIframeController, undefined, "f");
     }
-    const authIframeElement = __classPrivateFieldGet(this, _AirService_authIframeController, "f")?.iframeElement;
-    if (isElement(authIframeElement) && window.document.body.contains(authIframeElement)) {
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").resetWalletCommunication();
-    }
     // Close the message service
     await __classPrivateFieldGet(this, _AirService_walletMessagingService, "f").close();
     __classPrivateFieldSet(this, _AirService_walletLoggedInResult, undefined, "f");
@@ -3318,12 +3225,7 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_subscribeToRecoveryEvents).call(this);
         const recoveryInitPromise = __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").onInitialized();
         await recoveryInitRequestPromise;
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").initRecoveryCommunication();
-        await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").initAuthCommunication();
-        const recoveryInitResult = await recoveryInitPromise;
-        if (recoveryInitResult.payload.success !== true) {
-            throw new AirServiceError(recoveryInitResult.payload.errorName, recoveryInitResult.payload.errorMessage);
-        }
+        await recoveryInitPromise;
     }
     catch (error) {
         log.error("Error initializing recovery", error);
@@ -3351,10 +3253,6 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         __classPrivateFieldGet(this, _AirService_recoveryIframeController, "f").destroy();
         __classPrivateFieldSet(this, _AirService_recoveryIframeController, undefined, "f");
     }
-    const authIframeElement = __classPrivateFieldGet(this, _AirService_authIframeController, "f")?.iframeElement;
-    if (isElement(authIframeElement) && window.document.body.contains(authIframeElement)) {
-        await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").resetRecoveryCommunication();
-    }
     // Close the message service
     await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").close();
     __classPrivateFieldSet(this, _AirService_recoveryInitialization, undefined, "f");