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

Web3Auth · Jan 25, 2024 · d4e8a4a · d4e8a4a
2 parents a1cbcb8 + f08d3d3
commit d4e8a4a
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 39 deletions.
diff --git a/examples/vue-example/src/App.css b/examples/vue-example/src/App.css
@@ -376,15 +376,7 @@ body,
   margin-bottom: -16px;
 }
 
-.mpc {
-  display: flex;
-  align-items: center;
-  column-gap: 16px;
-  margin-top: 24px;
-  margin-bottom: -16px;
-}
-
-.mfa {
+.mpc, .wallet-key, .mfa {
   display: flex;
   align-items: center;
   column-gap: 16px;

diff --git a/examples/vue-example/src/App.vue b/examples/vue-example/src/App.vue
@@ -18,6 +18,10 @@
         <label for="mfa">Enable All MFA Factors</label>
         <input type="checkbox" id="mfa" name="mfa" v-model="enableAllFactors" />
       </div>
+      <div class="wallet-key">
+        <label for="mpc">Enable Wallet Key</label>
+        <input type="checkbox" id="walletKey" name="walletKey" v-model="useWalletKey" />
+      </div>
       <select v-model="selectedBuildEnv" class="select">
         <option :key="login" v-for="login in Object.values(BUILD_ENV)" :value="login">{{ login }}</option>
       </select>
@@ -176,6 +180,7 @@ const vueapp = defineComponent({
       BUILD_ENV: BUILD_ENV,
       selectedOpenloginNetwork: OPENLOGIN_NETWORK.SAPPHIRE_DEVNET as OPENLOGIN_NETWORK_TYPE,
       useMpc: false,
+      useWalletKey: false,
       selectedBuildEnv: BUILD_ENV.PRODUCTION,
       emailFlowType: EMAIL_FLOW.code,
       EMAIL_FLOW: EMAIL_FLOW,
@@ -205,8 +210,8 @@ const vueapp = defineComponent({
       this.openloginInstance.options.useMpc = true;
       await this.openloginInstance.init();
     }
-    if (this.openloginInstance.privKey || this.openloginInstance.state.factorKey) {
-      this.privKey = this.openloginInstance.privKey || (this.openloginInstance.state.factorKey as string);
+    if (this.openloginInstance.privKey || this.openloginInstance.state.factorKey || this.openloginInstance.state.walletKey) {
+      this.privKey = this.openloginInstance.privKey || (this.openloginInstance.state.factorKey as string) || (this.openloginInstance.state.walletKey as string);
       await this.setProvider(this.privKey);
     }
     this.loading = false;
@@ -291,7 +296,7 @@ const vueapp = defineComponent({
         const openLoginObj: LoginParams = {
           loginProvider: this.selectedLoginProvider,
           mfaLevel: "optional",
-
+          getWalletKey: this.useWalletKey,
           // pass empty string '' as loginProvider to open default torus modal
           // with all default supported login providers or you can pass specific
           // login provider from available list to set as default.
@@ -321,9 +326,9 @@ const vueapp = defineComponent({
         }
 
         console.log(openLoginObj, "OPENLOGIN");
-        const data = await this.openloginInstance.login(openLoginObj);
-        if (data && data.privKey) {
-          this.privKey = data.privKey;
+        await this.openloginInstance.login(openLoginObj);
+        if (this.openloginInstance.privKey || this.openloginInstance.state.walletKey) {
+          this.privKey = this.openloginInstance.privKey || (this.openloginInstance.state.walletKey || "");
           await this.setProvider(this.privKey);
         }
       } catch (error) {

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.2.2",
+  "version": "6.2.5",
   "npmClient": "npm"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/openlogin-jrpc/package.json b/packages/openlogin-jrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/openlogin-jrpc",
-  "version": "6.2.2",
+  "version": "6.2.5",
   "homepage": "https://github.com/torusresearch/OpenLoginSdk#readme",
   "license": "ISC",
   "main": "dist/openloginJrpc.cjs.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/openlogin-utils": "^6.2.2",
+    "@toruslabs/openlogin-utils": "^6.2.5",
     "end-of-stream": "^1.4.4",
     "events": "^3.3.0",
     "fast-safe-stringify": "^2.1.1",

diff --git a/packages/openlogin-jrpc/src/jrpcEngine.ts b/packages/openlogin-jrpc/src/jrpcEngine.ts
@@ -62,7 +62,7 @@ export class JRPCEngine extends SafeEventEmitter {
   /**
    * Runs an individual middleware.
    *
-   * @returns An array of any error encountered during middleware exection,
+   * @returns An array of any error encountered during middleware execution,
    * and a boolean indicating whether the request should end.
    */
   private static _runMiddleware(
@@ -399,6 +399,8 @@ export function providerFromEngine(engine: JRPCEngine): SafeEventEmitterProvider
         fallbackError: {
           message: res.error?.message || res.error.toString(),
           code: res.error?.code || -32603,
+          stack: res.error?.stack,
+          data: res.error?.data,
         },
         shouldIncludeStack: true,
       });

diff --git a/packages/openlogin-utils/package.json b/packages/openlogin-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/openlogin-utils",
-  "version": "6.2.2",
+  "version": "6.2.5",
   "homepage": "https://github.com/torusresearch/OpenLoginSdk#readme",
   "license": "ISC",
   "main": "dist/openloginUtils.cjs.js",

diff --git a/packages/openlogin-utils/src/interfaces.ts b/packages/openlogin-utils/src/interfaces.ts
@@ -246,7 +246,7 @@ export const LANGUAGES = {
   fr: "fr",
   pt: "pt",
   nl: "nl",
-  tk: "tk",
+  tr: "tr",
 } as const;
 
 export type LANGUAGE_TYPE = (typeof LANGUAGES)[keyof typeof LANGUAGES];
@@ -255,7 +255,7 @@ export const THEME_MODES = {
   light: "light",
   dark: "dark",
   auto: "auto",
-};
+} as const;
 
 export type THEME_MODE_TYPE = (typeof THEME_MODES)[keyof typeof THEME_MODES];
 
@@ -287,7 +287,7 @@ export type WhiteLabelData = {
    * fr: french
    * pt: portuguese
    * nl: dutch
-   * tk: turkish
+   * tr: turkish
    *
    * @defaultValue en
    */
@@ -652,7 +652,7 @@ export type OpenLoginOptions = {
   storageServerUrl?: string;
 
   /**
-   * setting to "local" will persist social login session accross browser tabs.
+   * setting to "local" will persist social login session across browser tabs.
    *
    * @defaultValue "local"
    */

diff --git a/packages/openlogin/package.json b/packages/openlogin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/openlogin",
-  "version": "6.2.2",
+  "version": "6.2.5",
   "homepage": "https://github.com/torusresearch/OpenLoginSdk#readme",
   "license": "ISC",
   "main": "dist/openlogin.cjs.js",
@@ -23,7 +23,7 @@
     "@toruslabs/eccrypto": "^4.0.0",
     "@toruslabs/metadata-helpers": "^5.0.0",
     "@toruslabs/openlogin-session-manager": "^3.0.0",
-    "@toruslabs/openlogin-utils": "^6.2.2",
+    "@toruslabs/openlogin-utils": "^6.2.5",
     "@toruslabs/secure-pub-sub": "^0.0.1",
     "bowser": "^2.11.0",
     "events": "^3.3.0",

diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openlogin",
-  "version": "6.2.2",
+  "version": "6.2.5",
   "homepage": "https://github.com/torusresearch/OpenLoginSdk#readme",
   "license": "ISC",
   "main": "dist/openlogin.cjs.js",
@@ -20,9 +20,9 @@
     "pre-commit": "lint-staged --cwd ."
   },
   "dependencies": {
-    "@toruslabs/openlogin": "^6.2.2",
-    "@toruslabs/openlogin-jrpc": "^6.2.2",
-    "@toruslabs/openlogin-utils": "^6.2.2"
+    "@toruslabs/openlogin": "^6.2.5",
+    "@toruslabs/openlogin-jrpc": "^6.2.5",
+    "@toruslabs/openlogin-utils": "^6.2.5"
   },
   "peerDependencies": {
     "@babel/runtime": "7.x"