resolved comments

Author: arch1995

src/core/AuthProvider.ts

@@ -50,6 +50,8 @@ export class AuthProvider {
 
   private loginCallbackFailed: ((reason?: string) => void) | null = null;
 
+  private messageHandler: ((event: MessageEvent) => void) | null = null;
+
   private readonly embedNonce = randomId();
 
   constructor({ sdkUrl, whiteLabel }: { sdkUrl: string; whiteLabel: WhiteLabelData }) {
@@ -70,11 +72,16 @@ export class AuthProvider {
   }
 
   public cleanup() {
+    if (this.messageHandler) {
+      window.removeEventListener("message", this.messageHandler);
+      this.messageHandler = null;
+    }
     const iframe = authServiceIframeMap.get(this.embedNonce);
     if (iframe && iframe.parentNode) {
       iframe.parentNode.removeChild(iframe);
       authServiceIframeMap.delete(this.embedNonce);
     }
+    this.initialized = false;
   }
 
   async init({ network, clientId }: { network: WEB3AUTH_NETWORK_TYPE; clientId: string }): Promise<void> {
@@ -110,7 +117,7 @@ export class AuthProvider {
       try {
         window.document.body.appendChild(authServiceIframe);
 
-        const handleMessage = (event: MessageEvent) => {
+        this.messageHandler = (event: MessageEvent) => {
           if (event.origin !== this.targetOrigin) return;
           const { data } = event as {
             data: { type: string; nonce: string; data: AuthFlowResult };
@@ -154,7 +161,7 @@ export class AuthProvider {
           }
         };
 
-        window.addEventListener("message", handleMessage);
+        window.addEventListener("message", this.messageHandler);
       } catch (error) {
         reject(error);
       }

src/core/auth.ts

@@ -123,7 +123,7 @@ export class Auth {
   }
 
   get appState(): string {
-    return this.state.userInfo.appState || this.dappState || "";
+    return this.state?.userInfo?.appState || this.dappState || "";
   }
 
   get baseUrl(): string {
@@ -321,7 +321,7 @@ export class Auth {
     };
 
     const result = await this.authHandler(`${this.baseUrl}/start`, dataObject, POPUP_TIMEOUT);
-    if (!result) return null;
+    if (!result) return false;
     if (isAuthFlowError(result)) {
       this.dappState = result.state;
       throw LoginError.loginFailed(result.error);
@@ -399,7 +399,7 @@ export class Auth {
     };
 
     const result = await this.authHandler(`${this.baseUrl}/start`, dataObject);
-    if (!result) return undefined;
+    if (!result) return false;
     if (isAuthFlowError(result)) return false;
     return true;
   }
@@ -418,7 +418,7 @@ export class Auth {
     };
 
     const result = await this.authHandler(`${this.baseUrl}/start`, dataObject);
-    if (!result) return undefined;
+    if (!result) return false;
     if (isAuthFlowError(result)) return false;
     return true;
   }
@@ -437,7 +437,7 @@ export class Auth {
     };
 
     const result = await this.authHandler(`${this.baseUrl}/start`, dataObject);
-    if (!result) return undefined;
+    if (!result) return false;
     if (isAuthFlowError(result)) return false;
     return true;
   }
@@ -479,7 +479,7 @@ export class Auth {
     }
   }
 
-  private async _authorizeSession(): Promise<AuthSessionData> {
+  private async _authorizeSession(): Promise<AuthSessionData | null> {
     try {
       const result = await this.sessionManager.authorize();
       return result;
@@ -499,7 +499,7 @@ export class Auth {
     this.updateState(result);
   }
 
-  private async authHandler(url: string, dataObject: AuthRequestPayload, popupTimeout = 1000 * 10): Promise<AuthFlowResult | undefined> {
+  private async authHandler(url: string, dataObject: AuthRequestPayload, popupTimeout = 1000 * 10): Promise<AuthFlowResult | null> {
     const loginId = StorageManager.generateRandomSessionKey();
     await this.storeAuthPayload(loginId, dataObject);
     const configParams: BaseLoginParams = {
@@ -514,7 +514,7 @@ export class Auth {
         hash: { b64Params: jsonToBase64(configParams) },
       });
       window.location.href = loginUrl;
-      return undefined;
+      return null;
     }
 
     const loginUrl = constructURL({

src/utils/interfaces.ts

@@ -523,8 +523,8 @@ export type AuthOptions = {
   useCoreKitKey?: boolean;
 
   /**
-   * This parameter will be used to select core kit key.
-   * @defaultValue false
+   * This parameter will be used to select sdk mode.
+   * @defaultValue default
    */
   sdkMode?: SDK_MODE_TYPE;
 

src/utils/utils.ts

@@ -1,4 +1,5 @@
 import { decodeBase64Url, encodeBase64Url } from "@toruslabs/metadata-helpers";
+import { klona } from "klona/json";
 
 export function safebtoa(str: string): string {
   return encodeBase64Url(str);
@@ -26,7 +27,7 @@ export const htmlToElement = <T extends Element>(html: string): T => {
 
 export function cloneDeep<T>(object: T): T {
   try {
-    return structuredClone(object);
+    return klona(object);
   } catch {
     return JSON.parse(JSON.stringify(object));
   }