Merge pull request #57 from AmbireTech/fix-user-loging

Fix user logging
AmbireTech · Mar 25, 2024 · 350f272 · 350f272
2 parents 333124a + d1a80fc
commit 350f272
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/src/components/TopBar/TopBar.tsx b/src/components/TopBar/TopBar.tsx
@@ -46,7 +46,7 @@ const useStyles = createStyles((theme) => ({
 
 function TopBar() {
   const { classes, cx } = useStyles()
-  const { adexAccount, disconnectWallet, updateAdexAccount } = useAccount()
+  const { adexAccount, disconnectWallet, resetAdexAccount } = useAccount()
   const { showInfoNotification, showDangerNotification } = useCustomNotifications()
   const location = useLocation()
   const splitPath = useMemo(() => location.pathname.split('/'), [location.pathname])
@@ -77,7 +77,7 @@ function TopBar() {
     })
       .then((res) => {
         if (res) {
-          updateAdexAccount(null)
+          resetAdexAccount()
           showInfoNotification('Successfully logged out', 'Logging out')
           navigate('/login', { replace: true })
         }
@@ -92,7 +92,7 @@ function TopBar() {
     disconnectWallet,
     fetchAuthRequest,
     navigate,
-    updateAdexAccount,
+    resetAdexAccount,
     showInfoNotification,
     showDangerNotification
   ])

diff --git a/src/contexts/AccountContext/AccountContext.tsx b/src/contexts/AccountContext/AccountContext.tsx
@@ -19,6 +19,7 @@ interface IAccountContext {
   disconnectWallet: () => void
   updateAdexAccount: (value: any) => void
   updateAccessToken: () => Promise<any>
+  resetAdexAccount: () => void
 }
 
 const AccountContext = createContext<IAccountContext | null>(null)
@@ -43,6 +44,7 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
       setAdexAccount((prevState) => (newValue === null ? newValue : { ...prevState, ...newValue })),
     [setAdexAccount]
   )
+  const resetAdexAccount = useCallback(() => updateAdexAccount(null), [updateAdexAccount])
 
   const connectWallet = useCallback(
     () => ambireSDK.openLogin({ chainId: DEFAULT_CHAIN_ID }),
@@ -53,7 +55,6 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
     (type: string, message: string) => ambireSDK.openSignMessage(type, message),
     [ambireSDK]
   )
-  const hideAmbireSDKIframe = useCallback(() => ambireSDK.hideIframe(), [ambireSDK])
 
   const updateAccessToken = useCallback(async () => {
     if (!adexAccount?.accessToken || !adexAccount?.refreshToken) return
@@ -81,7 +82,7 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
     showDangerNotification
   ])
 
-  const handleLoginSuccess = useCallback(
+  const handleRegistrationOrLoginSuccess = useCallback(
     ({ address, chainId }: any) => {
       if (
         !address ||
@@ -99,7 +100,6 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
         })
         .catch((error) => {
           console.error('Get message to sign failed', error)
-          disconnectWallet()
           showDangerNotification(error.message, 'Get message to sign failed')
         })
     },
@@ -108,8 +108,7 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
       adexAccount?.chainId,
       adexAccount?.authMsgResp,
       updateAdexAccount,
-      showDangerNotification,
-      disconnectWallet
+      showDangerNotification
     ]
   )
 
@@ -133,16 +132,14 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
         })
         .catch((error) => {
           console.error('Error verify login:', error)
-          disconnectWallet()
           showDangerNotification(error.message, 'Verify login failed')
         })
     },
     [
       adexAccount?.authMsgResp,
       adexAccount?.authenticated,
       updateAdexAccount,
-      showDangerNotification,
-      disconnectWallet
+      showDangerNotification
     ]
   )
 
@@ -151,22 +148,24 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
   }, [disconnectWallet])
 
   const handleLogoutSuccess = useCallback(() => {
-    hideAmbireSDKIframe()
-  }, [hideAmbireSDKIframe])
+    resetAdexAccount()
+  }, [resetAdexAccount])
 
   const handleActionRejected = useCallback(() => {
     disconnectWallet()
   }, [disconnectWallet])
 
   useEffect(() => {
-    ambireSDK.onLoginSuccess(handleLoginSuccess)
+    ambireSDK.onRegistrationSuccess(handleRegistrationOrLoginSuccess)
+    ambireSDK.onLoginSuccess(handleRegistrationOrLoginSuccess)
+    ambireSDK.onAlreadyLoggedIn(handleRegistrationOrLoginSuccess)
     ambireSDK.onMsgSigned(handleMsgSigned)
     ambireSDK.onMsgRejected(handleMsgRejected)
     ambireSDK.onLogoutSuccess(handleLogoutSuccess)
     ambireSDK.onActionRejected(handleActionRejected)
   }, [
     ambireSDK,
-    handleLoginSuccess,
+    handleRegistrationOrLoginSuccess,
     handleMsgSigned,
     handleMsgRejected,
     handleLogoutSuccess,
@@ -188,12 +187,14 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
     () => ({
       adexAccount,
       authenticated,
+      // authenticated: true,
       connectWallet,
       disconnectWallet,
       signMessage,
       ambireSDK,
       updateAdexAccount,
-      updateAccessToken
+      updateAccessToken,
+      resetAdexAccount
     }),
     [
       adexAccount,
@@ -203,7 +204,8 @@ const AccountProvider: FC<PropsWithChildren> = ({ children }) => {
       signMessage,
       ambireSDK,
       updateAdexAccount,
-      updateAccessToken
+      updateAccessToken,
+      resetAdexAccount
     ]
   )