fixes in handling loginToken and signature

ElvenTools · Apr 26, 2022 · 8ccd705 · 8ccd705
1 parent 915168e
commit 8ccd705
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### [1.0.3](https://github.com/ElvenTools/elven-tools-dapp/releases/tag/v1.0.3) (2022-04-26)
+- improvements for loginToken and signatures, thanks to @borispoehland !
+
 ### [1.0.2](https://github.com/ElvenTools/elven-tools-dapp/releases/tag/v1.0.2) (2022-04-24)
 - fix missing dependency
 

diff --git a/components/TransactionPendingModal.tsx b/components/TransactionPendingModal.tsx
@@ -41,7 +41,7 @@ export const TransactionPendingModal: FC<TransactionPendingModalProps> = ({
 
   const txTitle = () => {
     if (txError) {
-      return `Transaction error: ${txError}.`;
+      return `Transaction status: ${txError}.`;
     }
     if (successTxHash) {
       return 'Transaction success. Check explorer for details.';

diff --git a/hooks/auth/useElrondNetworkSync.tsx b/hooks/auth/useElrondNetworkSync.tsx
@@ -24,7 +24,7 @@ import {
   DAPP_INIT_ROUTE,
 } from '../../config/network';
 import { getBridgeAddressFromNetwork } from '../../utils/bridgeAddress';
-import { getAddressFromUrl } from '../../utils/getAddressFromUrl';
+import { getParamFromUrl } from '../../utils/getParamFromUrl';
 import { LoginMethodsEnum } from '../../types/enums';
 import { WcOnLogin } from '../../utils/walletConnectCbs';
 import { useLogout } from './useLogout';
@@ -129,6 +129,7 @@ export const useElrondNetworkSync = () => {
       if (loginExpires && isLoginExpired(loginExpires)) {
         clearAuthStates();
         clearDappProvider();
+        localStorage.clear();
         return;
       }
 
@@ -187,7 +188,11 @@ export const useElrondNetworkSync = () => {
             break;
           // Web wallet auth
           case LoginMethodsEnum.wallet:
-            const address = getAddressFromUrl() || accountSnap?.address;
+            const address = getParamFromUrl('address') || accountSnap?.address;
+            const signature = getParamFromUrl('signature');
+            if (signature) {
+              setLoginInfoState('signature', signature);
+            }
             if (address) {
               dappProvider = new WalletProvider(
                 `${networkConfig[chainType].walletAddress}${DAPP_INIT_ROUTE}`

diff --git a/hooks/auth/useMobileAppLogin.tsx b/hooks/auth/useMobileAppLogin.tsx
@@ -62,13 +62,15 @@ export const useMobileAppLogin = (params?: Login) => {
         if (signature) {
           setLoginInfoState('signature', signature);
         }
+        if (params?.token) {
+          setLoginInfoState('loginToken', params?.token);
+        }
 
         setNetworkState('dappProvider', dappProviderRef.current);
 
         WcOnLogin(
           dappProviderRef.current,
           proxyProvider,
-          params?.token,
           params?.callbackRoute
         );
       },

diff --git a/hooks/auth/useWebWalletLogin.tsx b/hooks/auth/useWebWalletLogin.tsx
@@ -37,7 +37,9 @@ export const useWebWalletLogin = (params?: Login) => {
       setLoginInfoState('loginMethod', LoginMethodsEnum.wallet);
       await providerInstance.login(providerLoginData);
       setLoginInfoState('expires', getNewLoginExpiresTimestamp());
-      setLoggingInState('loggedIn', true);
+      if (params?.token) {
+        setLoginInfoState('loginToken', params.token);
+      }
     } catch (e: any) {
       setLoggingInState('error', `Error logging in ${e?.message}`);
       setLoginInfoState('loginMethod', '');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elven-tools-dapp",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "Julian Ćwirko <julian.io>",
   "license": "MIT",
   "homepage": "https://www.elven.tools",

diff --git a/utils/getAddressFromUrl.ts → utils/getParamFromUrl.ts b/utils/getAddressFromUrl.ts → utils/getParamFromUrl.ts
@@ -1,7 +1,7 @@
-export const getAddressFromUrl = () => {
+export const getParamFromUrl = (paramName: string) => {
   if (typeof window !== 'undefined') {
     const url = new URL(window.location.href);
     const params = new URLSearchParams(url.search);
-    return params.get('address');
+    return params.get(paramName);
   }
 };
diff --git a/utils/walletConnectCbs.ts b/utils/walletConnectCbs.ts
@@ -11,10 +11,8 @@ import { optionalRedirect } from '../utils/optionalRedirect';
 export const WcOnLogin = async (
   dappProvider: WalletConnectProvider,
   proxyProvider: ProxyProvider,
-  token?: string,
   callbackRoute?: string
 ) => {
-  const signature = await dappProvider?.getSignature();
   const address = await dappProvider?.getAddress();
 
   const userAddressInstance = new Address(address);
@@ -31,11 +29,6 @@ export const WcOnLogin = async (
     }
   }
 
-  if (signature) {
-    setLoginInfoState('loginToken', String(token));
-    setLoginInfoState('signature', signature);
-  }
-
   setLoginInfoState('loginMethod', LoginMethodsEnum.walletconnect);
 
   optionalRedirect(callbackRoute);