unify login and logout path redirect callbacks

useElven · Mar 30, 2024 · 1839545 · 1839545
1 parent c60ba9c
commit 1839545
Show file tree

Hide file tree

Showing 11 changed files with 631 additions and 548 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### [0.18.0](https://github.com/useElven/core/releases/tag/v0.18.0) (2024-03-30)
+- unify path calbacks for useLogin
+- update dependencies
+
 ### [0.17.1](https://github.com/useElven/core/releases/tag/v0.17.1) (2024-02-28)
 - fix the useTokenTransfer payload for Fungible ESDT
 - fix typings where TypedValue was used

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@useelven/core",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Core React hooks for MultiversX DApps",
   "license": "MIT",
   "author": "Julian Ćwirko <julian.io>",
@@ -65,32 +65,32 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@multiversx/sdk-core": "12.19.0",
+    "@multiversx/sdk-core": "12.19.1",
     "@multiversx/sdk-extension-provider": "3.0.0",
     "@multiversx/sdk-hw-provider": "6.4.0",
-    "@multiversx/sdk-native-auth-client": "1.0.7",
-    "@multiversx/sdk-network-providers": "2.3.0",
+    "@multiversx/sdk-native-auth-client": "1.0.8",
+    "@multiversx/sdk-network-providers": "2.4.3",
     "@multiversx/sdk-wallet-connect-provider": "4.1.1",
     "@multiversx/sdk-web-wallet-provider": "3.2.1",
     "lodash.clonedeep": "4.5.0",
     "swr": "2.2.5",
-    "valtio": "1.13.1"
+    "valtio": "1.13.2"
   },
   "devDependencies": {
     "@types/lodash.clonedeep": "4.5.9",
-    "@types/node": "20.11.21",
-    "@types/react": "18.2.60",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.1.0",
+    "@types/node": "20.12.2",
+    "@types/react": "18.2.73",
+    "@typescript-eslint/eslint-plugin": "7.4.0",
+    "@typescript-eslint/parser": "7.4.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "prettier": "3.2.5",
     "rimraf": "5.0.5",
     "tsup": "8.0.2",
-    "typescript": "5.3.3"
+    "typescript": "5.4.3"
   },
   "peerDependencies": {
     "react": "^18.2.0"

diff --git a/src/hooks/common-helpers/signAndSendTxOperations.ts b/src/hooks/common-helpers/signAndSendTxOperations.ts
@@ -20,6 +20,7 @@ import { WalletProvider } from '@multiversx/sdk-web-wallet-provider';
 import { DappProvider } from '../../types/network';
 import { errorParse } from '../../utils/errorParse';
 import { DAPP_INIT_ROUTE } from '../../config/network';
+import { getCallbackUrl } from '../../utils/getCallbackUrl';
 
 export interface TransactionCallbackParams {
   transaction?: Transaction | null;
@@ -109,12 +110,9 @@ export const checkNeedsGuardianSigning = (
   return true;
 };
 
-const getCallbackUrl = (ongoingTxId?: string, callbackUrl?: string) => {
-  const currentUrl = window?.location?.href;
-  const clbck =
-    callbackUrl && window
-      ? `${window.location.origin}${callbackUrl}`
-      : currentUrl;
+const getClbckUrl = (ongoingTxId?: string, callbackUrl?: string) => {
+  const clbck = getCallbackUrl(callbackUrl);
+
   if (!ongoingTxId) return clbck;
 
   const alteredCallbackUrl = new URL(clbck);
@@ -133,7 +131,7 @@ export const sendTxToGuardian = async (
     `${walletAddress}${DAPP_INIT_ROUTE}`
   );
 
-  const clbck = getCallbackUrl(ongoingTxId, callbackUrl);
+  const clbck = getClbckUrl(ongoingTxId, callbackUrl);
 
   const alteredCallbackUrl = new URL(clbck);
   alteredCallbackUrl.searchParams.set(
@@ -172,9 +170,7 @@ export const signAndSendTxOperations = async (
   try {
     if (dappProvider instanceof WalletProvider) {
       await dappProvider.signTransaction(tx, {
-        callbackUrl: encodeURIComponent(
-          getCallbackUrl(ongoingTxId, callbackUrl)
-        ),
+        callbackUrl: encodeURIComponent(getClbckUrl(ongoingTxId, callbackUrl)),
       });
     }
     if (dappProvider instanceof ExtensionProvider) {

diff --git a/src/hooks/common-helpers/useWebWalletXaliasLogin.tsx b/src/hooks/common-helpers/useWebWalletXaliasLogin.tsx
@@ -10,7 +10,8 @@ import { errorParse } from '../../utils/errorParse';
 import { useConfig } from '../useConfig';
 import { getLoginToken } from '../common-helpers/getLoginToken';
 import { useEffect } from 'react';
-import { getParamFromUrl } from 'src/utils/getParamFromUrl';
+import { getParamFromUrl } from '../../utils/getParamFromUrl';
+import { getCallbackUrl } from '../../utils/getCallbackUrl';
 
 export const useWebWalletXaliasLogin = (
   type: 'webwallet' | 'xalias',
@@ -40,14 +41,8 @@ export const useWebWalletXaliasLogin = (
       }${DAPP_INIT_ROUTE}`
     );
 
-    const callbackUrl: string =
-      typeof window !== 'undefined'
-        ? encodeURIComponent(
-            `${window.location.origin}${params?.callbackUrl || '/'}`
-          )
-        : '/';
     const providerLoginData = {
-      callbackUrl,
+      callbackUrl: getCallbackUrl(params?.callbackUrl),
       token: loginToken,
     };
 

diff --git a/src/hooks/useExtensionLogin.tsx b/src/hooks/useExtensionLogin.tsx
@@ -16,6 +16,7 @@ import { errorParse } from '../utils/errorParse';
 import { getLoginToken } from './common-helpers/getLoginToken';
 import { useNetwork } from './useNetwork';
 import { getNativeAuthClient } from '../utils/getNativeAuthClient';
+import { getCallbackUrl } from '../utils/getCallbackUrl';
 
 export const useExtensionLogin = (params?: Login) => {
   const { logout } = useLogout();
@@ -43,14 +44,8 @@ export const useExtensionLogin = (params?: Login) => {
 
       setLoginInfoState('loginMethod', LoginMethodsEnum.extension);
 
-      const callbackUrl: string =
-        typeof window !== 'undefined'
-          ? encodeURIComponent(
-              `${window.location.origin}${params?.callbackUrl}`
-            )
-          : '/';
       const providerLoginData = {
-        callbackUrl,
+        callbackUrl: getCallbackUrl(params?.callbackUrl),
         token: loginToken,
       };
 
@@ -119,7 +114,9 @@ export const useExtensionLogin = (params?: Login) => {
         setLoginInfoState('accessToken', accessToken);
       }
 
-      optionalRedirect(params?.callbackUrl);
+      if (params?.callbackUrl) {
+        optionalRedirect(getCallbackUrl(params?.callbackUrl));
+      }
     } catch (e) {
       const err = errorParse(e);
       setLoggingInState('error', `Error logging in ${err}`);

diff --git a/src/hooks/useLedgerLogin.tsx b/src/hooks/useLedgerLogin.tsx
@@ -16,6 +16,7 @@ import { errorParse } from '../utils/errorParse';
 import { useNetwork } from './useNetwork';
 import { getLoginToken } from './common-helpers/getLoginToken';
 import { getNativeAuthClient } from '../utils/getNativeAuthClient';
+import { getCallbackUrl } from '../utils/getCallbackUrl';
 
 export const useLedgerLogin = (params?: Login) => {
   const { logout } = useLogout();
@@ -102,7 +103,9 @@ export const useLedgerLogin = (params?: Login) => {
 
       setLoginInfoState('expires', getNewLoginExpiresTimestamp());
 
-      optionalRedirect(params?.callbackUrl);
+      if (params?.callbackUrl) {
+        optionalRedirect(getCallbackUrl(params?.callbackUrl));
+      }
     } catch (e) {
       const err = errorParse(e);
       setLoggingInState('error', `Error logging in ${err}`);

diff --git a/src/hooks/useLogout.tsx b/src/hooks/useLogout.tsx
@@ -4,11 +4,12 @@ import { DappProvider } from '../types/network';
 import { errorParse } from '../utils/errorParse';
 import { useLoggingIn } from './useLoggingIn';
 import { useNetwork } from './useNetwork';
+import { optionalRedirect } from '../utils/optionalRedirect';
+import { getCallbackUrl } from '../utils/getCallbackUrl';
 
 export interface Logout {
   dappProvider?: DappProvider;
   callbackUrl?: string;
-  redirectFn?: (callbackUrl?: string) => void;
 }
 
 export const useLogout = () => {
@@ -27,11 +28,7 @@ export const useLogout = () => {
         await dappProvider.logout();
 
         if (params?.callbackUrl) {
-          if (typeof params?.redirectFn === 'function') {
-            params?.redirectFn(params?.callbackUrl);
-          } else if (typeof window !== 'undefined') {
-            window.location.href = params?.callbackUrl;
-          }
+          optionalRedirect(getCallbackUrl(params?.callbackUrl));
         }
 
         setLoggingInState('loggedIn', false);

diff --git a/src/hooks/useMobileAppLogin.tsx b/src/hooks/useMobileAppLogin.tsx
@@ -26,6 +26,7 @@ import { useConfig } from './useConfig';
 import { useNetwork } from './useNetwork';
 import { getLoginToken } from './common-helpers/getLoginToken';
 import { getNativeAuthClient } from '../utils/getNativeAuthClient';
+import { getCallbackUrl } from '../utils/getCallbackUrl';
 
 export interface PairingTypesStruct {
   topic: string;
@@ -64,7 +65,7 @@ export const useMobileAppLogin = (params?: Login) => {
 
   const handleOnLogout = () => {
     logout({
-      callbackUrl: params?.callbackUrl,
+      callbackUrl: getCallbackUrl(params?.callbackUrl),
       dappProvider: dappProviderRef?.current,
     });
   };

diff --git a/src/utils/getCallbackUrl.ts b/src/utils/getCallbackUrl.ts
@@ -0,0 +1,8 @@
+export const getCallbackUrl = (callbackUrl?: string) => {
+  const currentUrl = window?.location?.href;
+  const clbck =
+    callbackUrl && window
+      ? `${window.location.origin}${callbackUrl}`
+      : currentUrl;
+  return clbck;
+};
diff --git a/src/utils/walletConnectCbs.ts b/src/utils/walletConnectCbs.ts
@@ -5,6 +5,7 @@ import { setAccountState, setLoginInfoState } from '../store/auth';
 import { LoginMethodsEnum } from '../types/enums';
 import { optionalRedirect } from '../utils/optionalRedirect';
 import { errorParse } from './errorParse';
+import { getCallbackUrl } from './getCallbackUrl';
 
 export const WcOnLogin = async (
   apiNetworkProvider?: ApiNetworkProvider,
@@ -41,5 +42,7 @@ export const WcOnLogin = async (
 
   setLoginInfoState('loginMethod', LoginMethodsEnum.walletconnect);
 
-  optionalRedirect(callbackUrl);
+  if (callbackUrl) {
+    optionalRedirect(getCallbackUrl(callbackUrl));
+  }
 };