Merge pull request #36 from ElrondNetwork/development

Merge development into main
multiversx · Jul 21, 2021 · e3639e3 · e3639e3
2 parents 37b6908 + 435ebb5
commit e3639e3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+
+## [6.4.0]
+-   [Added web wallet token option for login hook #33](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/33)
+
 ## [6.3.1]
 -   [Bugfix - Exported UserVerifier #31](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/31)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@elrondnetwork/erdjs",
-    "version": "6.3.1",
+    "version": "6.4.0",
     "description": "Smart Contracts interaction framework",
     "main": "out/index.js",
     "types": "out/index.d.js",

diff --git a/src/dapp/interface.ts b/src/dapp/interface.ts
@@ -3,7 +3,7 @@ import {SignableMessage} from "../signableMessage";
 
 export interface IDappProvider {
     init(): Promise<boolean>;
-    login(options?: {callbackUrl?: string}): Promise<string>;
+    login(options?: {callbackUrl?: string; token?: string}): Promise<string>;
     logout(): Promise<boolean>;
     getAddress(): Promise<string>;
     isInitialized(): boolean;

diff --git a/src/dapp/walletProvider.ts b/src/dapp/walletProvider.ts
@@ -96,7 +96,7 @@ export class WalletProvider implements IDappProvider {
     /**
      * Fetches the login hook url and redirects the client to the wallet login.
      */
-    async login(options?:{callbackUrl?:string}): Promise<string> {
+    async login(options?:{callbackUrl?:string; token?:string}): Promise<string> {
         if (!this.mainFrame) {
             return '';
         }
@@ -134,7 +134,15 @@ export class WalletProvider implements IDappProvider {
 
             window.addEventListener('message', connectUrl);
         }).then((connectionUrl: string) => {
-            window.location.href = `${this.baseWalletUrl()}${connectionUrl}?callbackUrl=${options !== undefined && options.callbackUrl !== undefined ? options.callbackUrl : window.location.href}`;
+            let callbackUrl = `callbackUrl=${window.location.href}`;
+            if (options && options.callbackUrl) {
+              callbackUrl = `callbackUrl=${options.callbackUrl}`;
+            }
+            let token = '';
+            if (options && options.token) {
+              token = `&token=${options.token}`;
+            }
+            window.location.href = `${this.baseWalletUrl()}${connectionUrl}?${callbackUrl}${token}`;
             return window.location.href;
         }).catch(_ => {
             return '';