Refactor detectActiveWalletAddress to be in useAuth composable

consensusnetworks · Oct 5, 2023 · efd124d · efd124d
1 parent e1eab91
commit efd124d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/apps/web/src/composables/auth.ts b/apps/web/src/composables/auth.ts
@@ -9,7 +9,7 @@ import useWalletConnect from '@/composables/walletConnectV2'
 import { Account, ApiResponse, LoginCredentials, ProviderString, UserAuthState } from '@casimir/types'
 
 const { usersUrl } = useEnvironment()
-const { ethersProviderList, detectActiveWalletAddress, loginWithEthers } = useEthers()
+const { ethersProviderList, detectActiveEthersWalletAddress, loginWithEthers } = useEthers()
 const { loginWithLedger } = useLedger()
 const { loginWithTrezor } = useTrezor()
 const { setUser, user } = useUser()
@@ -86,6 +86,17 @@ export default function useAuth() {
         }
     }
 
+    async function detectActiveWalletAddress(providerString: ProviderString) {
+        if (ethersProviderList.includes(providerString)) {
+          return await detectActiveEthersWalletAddress(providerString)
+        } else if (providerString === 'Ledger') {
+
+          // await loginWithLedger(loginCredentials, JSON.stringify(pathIndex))
+        } else {
+          alert('detectActiveWalletAddress not yet implemented for this wallet provider')
+        }
+      }
+
     async function getUser() {
         try {
             const requestOptions = {
@@ -157,6 +168,8 @@ export default function useAuth() {
                 // TODO: Implement this for all providers
                 // Then check if address is the same as the one that is active in their wallet
                 const activeAddress = await detectActiveWalletAddress(provider as ProviderString)
+                console.log('activeAddress :>> ', activeAddress)
+                console.log('address :>> ', address)
                 if (activeAddress === address) {
                     await loginWithProvider({ provider: provider as ProviderString, address, currency: 'ETH' })
                     return 'Successfully logged in'

diff --git a/apps/web/src/composables/ethers.ts b/apps/web/src/composables/ethers.ts
@@ -28,13 +28,21 @@ export default function useEthers() {
     }
   }
 
-  async function detectActiveWalletAddress(providerString: ProviderString) {
+  async function detectActiveEthersWalletAddress(providerString: ProviderString): Promise<string> {
     const provider = getBrowserProvider(providerString)
-    if (ethersProviderList.includes(providerString)) {
-      const accounts = await provider.request({ method: 'eth_accounts' })
-      if (accounts.length > 0) return accounts[0]
-    } else {
-      alert('detectActiveWalletAddress not yet implemented for this wallet provider')
+    try {
+      if (provider) {
+        const accounts = await provider.request({ method: 'eth_accounts' })
+        if (accounts.length > 0) {
+          return accounts[0] as string
+        } 
+        return ''
+      } else {
+        return ''
+      }
+    } catch(err) {
+      console.error('There was an error in detectActiveEthersWalletAddress :>> ', err)
+      return ''
     }
   }
 
@@ -241,7 +249,7 @@ export default function useEthers() {
 
   return { 
     ethersProviderList,
-    detectActiveWalletAddress,
+    detectActiveEthersWalletAddress,
     getEthersAddressesWithBalances,
     getEthersBalance,
     getEthersBrowserSigner,