Merge branch 'master' of github.com:torusresearch/OpenLoginSdk into f…

…eat/auth-mpc
Web3Auth · Sep 26, 2023 · b583bf6 · b583bf6
2 parents d678f0e + bbdf03d
commit b583bf6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/examples/vue-example/src/App.vue b/examples/vue-example/src/App.vue
@@ -14,6 +14,9 @@
         <label for="mpc">Enable MPC</label>
         <input type="checkbox" id="mpc" name="mpc" v-model="useMpc" />
       </div>
+      <select v-model="selectedBuildEnv" class="select">
+        <option :key="login" v-for="login in Object.values(BUILD_ENV)" :value="login">{{ login }}</option>
+      </select>
       <select v-model="selectedOpenloginNetwork" class="select">
         <option :key="login" v-for="login in Object.values(OPENLOGIN_NETWORK)" :value="login">{{ login }}</option>
       </select>
@@ -116,6 +119,7 @@ import {
   UX_MODE_TYPE,
   OPENLOGIN_NETWORK,
   OPENLOGIN_NETWORK_TYPE,
+  BUILD_ENV,
 } from "@toruslabs/openlogin-utils";
 import loginConfig from "./lib/loginConfig";
 import { keccak256 } from "ethereum-cryptography/keccak";
@@ -145,8 +149,10 @@ export default defineComponent({
       UX_MODE: UX_MODE,
       selectedUxMode: UX_MODE.REDIRECT as UX_MODE_TYPE,
       OPENLOGIN_NETWORK: OPENLOGIN_NETWORK,
+      BUILD_ENV: BUILD_ENV,
       selectedOpenloginNetwork: OPENLOGIN_NETWORK.SAPPHIRE_DEVNET as OPENLOGIN_NETWORK_TYPE,
       useMpc: true,
+      selectedBuildEnv: BUILD_ENV.PRODUCTION,
     };
   },
   async created() {
@@ -187,8 +193,8 @@ export default defineComponent({
         uxMode: this.selectedUxMode,
         whiteLabel: this.isWhiteLabelEnabled ? whitelabel : {},
         loginConfig: loginConfig,
-        buildEnv: "development",
         useMpc: this.useMpc,
+        buildEnv: this.selectedBuildEnv,
         // sdkUrl: "https://staging.openlogin.com",
       });
       op.init();

diff --git a/packages/openlogin/src/OpenLogin.ts b/packages/openlogin/src/OpenLogin.ts
@@ -34,6 +34,8 @@ class OpenLogin {
 
   private _storageBaseKey = "openlogin_store";
 
+  private dappState: string;
+
   constructor(options: OpenLoginOptions) {
     if (!options.clientId) throw InitializationError.invalidParams("clientId is required");
     if (!options.network) options.network = OPENLOGIN_NETWORK.SAPPHIRE_MAINNET;
@@ -106,6 +108,10 @@ class OpenLogin {
     return this.options.sessionNamespace || "";
   }
 
+  get appState(): string {
+    return this.state.userInfo.appState || this.dappState || "";
+  }
+
   private get baseUrl(): string {
     // testing and develop don't have versioning
     if (this.options.buildEnv === BUILD_ENV.DEVELOPMENT || this.options.buildEnv === BUILD_ENV.TESTING) return `${this.options.sdkUrl}`;
@@ -142,6 +148,7 @@ class OpenLogin {
     }
 
     if (params.error) {
+      this.dappState = params.state;
       throw LoginError.loginFailed(params.error);
     }
 
@@ -185,6 +192,10 @@ class OpenLogin {
 
     const result = await this.openloginHandler(`${this.baseUrl}/start`, dataObject, getTimeout(params.loginProvider));
     if (this.options.uxMode === UX_MODE.REDIRECT) return undefined;
+    if (result.error) {
+      this.dappState = result.state;
+      throw LoginError.loginFailed(result.error);
+    }
     this.sessionManager.sessionId = result.sessionId;
     this.options.sessionNamespace = result.sessionNamespace;
     this.currentStorage.set("sessionId", result.sessionId);

diff --git a/packages/openlogin/src/PopupHandler.ts b/packages/openlogin/src/PopupHandler.ts
@@ -6,6 +6,8 @@ import { getPopupFeatures } from "./utils";
 export interface PopupResponse {
   sessionId?: string;
   sessionNamespace?: string;
+  state?: string;
+  error?: string;
 }
 class PopupHandler extends EventEmitter {
   url: string;
@@ -71,16 +73,16 @@ class PopupHandler extends EventEmitter {
   }
 
   async listenOnChannel(loginId: string): Promise<PopupResponse> {
-    return new Promise<PopupResponse>((resolve, reject) => {
-      const bc = new BroadcastChannel<{ error?: string; data?: PopupResponse }>(loginId, {
+    return new Promise<PopupResponse>((resolve, _reject) => {
+      const bc = new BroadcastChannel<{ error?: string; data?: PopupResponse; state?: string }>(loginId, {
         webWorkerSupport: false,
         type: "server",
       });
       bc.addEventListener("message", (ev) => {
         this.close();
         bc.close();
         if (ev.error) {
-          reject(new Error(ev.error));
+          resolve({ error: ev.error, state: ev.state });
         } else {
           resolve(ev.data);
         }

diff --git a/packages/openlogin/src/utils.ts b/packages/openlogin/src/utils.ts
@@ -19,6 +19,7 @@ export type HashQueryParamResult = {
   sessionId?: string;
   sessionNamespace?: string;
   error?: string;
+  state?: string;
 };
 
 export function getHashQueryParams(replaceUrl = false): HashQueryParamResult {