fix native auth with browser extension

elven-js · May 29, 2023 · cbffb8b · cbffb8b
1 parent bb15eb4
commit cbffb8b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### [0.10.2](https://github.com/juliancwirko/elven.js/releases/tag/v0.10.2) (2023-05-29)
+- fix native auth when signing using browser extension
+
 ### [0.10.1](https://github.com/juliancwirko/elven.js/releases/tag/v0.10.1) (2023-05-23)
 - fix native auth when used with web wallet provider
 

diff --git a/build/elven.js b/build/elven.js
diff --git a/build/types/auth/login-with-extension.d.ts b/build/types/auth/login-with-extension.d.ts
@@ -1,2 +1,2 @@
 import { NativeAuthClient } from '@multiversx/sdk-native-auth-client/lib/src/native.auth.client';
-export declare const loginWithExtension: (elven: any, loginToken: string, nativeAuthClient: NativeAuthClient) => Promise<import("@multiversx/sdk-extension-provider/out/extensionProvider").ExtensionProvider | undefined>;
+export declare const loginWithExtension: (elven: any, loginToken: string, nativeAuthClient: NativeAuthClient, callbackRoute?: string) => Promise<import("@multiversx/sdk-extension-provider/out/extensionProvider").ExtensionProvider | undefined>;
diff --git a/example/elven.js b/example/elven.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elven.js",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Authenticate, sign and send transactions on the MultiversX blockchain in the browser.",
   "type": "module",
   "module": "build/elven.js",

diff --git a/src/auth/login-with-extension.ts b/src/auth/login-with-extension.ts
@@ -10,12 +10,21 @@ import { NativeAuthClient } from '@multiversx/sdk-native-auth-client/lib/src/nat
 export const loginWithExtension = async (
   elven: any,
   loginToken: string,
-  nativeAuthClient: NativeAuthClient
+  nativeAuthClient: NativeAuthClient,
+  callbackRoute = '/'
 ) => {
   const dappProvider = await initExtensionProvider();
 
+  const callbackUrl: string = encodeURIComponent(
+    `${window.location.origin}${callbackRoute}`
+  );
+  const providerLoginData = {
+    callbackUrl,
+    token: loginToken,
+  };
+
   try {
-    if (dappProvider) await dappProvider.login();
+    if (dappProvider) await dappProvider.login(providerLoginData);
     EventsStore.run(EventStoreEvents.onLoginPending);
   } catch (e) {
     const err = errorParse(e);

diff --git a/src/main.ts b/src/main.ts
@@ -168,7 +168,8 @@ export class ElvenJS {
         const dappProvider = await loginWithExtension(
           this,
           loginToken,
-          nativeAuthClient
+          nativeAuthClient,
+          options?.callbackRoute
         );
         this.dappProvider = dappProvider;
       }