Merge pull request #298 from consensusnetworks/feature/pg-users

Connect user account methods to PG

apps/web/src/composables/auth.ts

@@ -1,10 +1,16 @@
-import { LoginCredentials } from '@casimir/types'
 import useEnvironment from '@/composables/environment'
-import { ProviderString } from '@casimir/types'
+import { LoginCredentials, ProviderString } from '@casimir/types'
 
 const { usersBaseURL } = useEnvironment()
 
 export default function useAuth() {
+    /**
+     * Gets a message from the server to sign
+     * 
+     * @param {ProviderString} provider - The provider the user is using to sign in
+     * @param {string} address - The user's address
+     * @returns {Promise<Response>} - The response from the message request
+     */ 
     async function getMessage(provider: ProviderString, address: string) {
         const requestOptions = {
             method: 'GET',

apps/web/src/composables/ethers.ts

@@ -1,12 +1,8 @@
 import { ref } from 'vue'
 import { ethers } from 'ethers'
-import { BrowserProviders } from '@/interfaces/BrowserProviders'
-import { EthersProvider } from '@/interfaces/EthersProvider'
-import { ProviderString } from '@casimir/types'
-import { TransactionInit } from '@/interfaces/TransactionInit'
-import { MessageInit } from '@/interfaces/MessageInit'
+import { BrowserProviders, EthersProvider, MessageInit, TransactionInit } from '@/interfaces/index'
+import { Currency, ProviderString } from '@casimir/types'
 import useAuth from '@/composables/auth'
-import { Currency } from '@casimir/types'
 
 const { getMessage, login } = useAuth()
 
@@ -117,26 +113,30 @@ export default function useEthers() {
   async function loginWithEthers(provider: ProviderString, address: string, currency: Currency) {
     const browserProvider = availableProviders.value[provider as keyof BrowserProviders]
     const web3Provider: ethers.providers.Web3Provider = new ethers.providers.Web3Provider(browserProvider as EthersProvider)
-    const messageJson = await getMessage(provider, address)
-    const { message } = await messageJson.json()
-    const signer = web3Provider.getSigner()
-    const signature = await signer.signMessage(message)
-    const response = await login({ 
-      provider, 
-      address, 
-      message: message.toString(), 
-      signedMessage: signature,
-      currency
-    })
-    return await response.json()
+    try {
+      const { message } = await (await getMessage(provider, address)).json()
+      const signer = web3Provider.getSigner()
+      const signature = await signer.signMessage(message)
+      const ethersLoginResponse = await login({ 
+        provider, 
+        address, 
+        message: message.toString(), 
+        signedMessage: signature,
+        currency
+      })
+      return await ethersLoginResponse.json()
+    } catch (err) {
+      console.log('Error logging in: ', err)
+      return err
+    }
   }
 
   async function getEthersBrowserProviderSelectedCurrency(providerString: ProviderString) {
     // IOTEX Smart Contract Address: 0x6fb3e0a217407efff7ca062d46c26e5d60a14d69
     const browserProvider = availableProviders.value[providerString as keyof BrowserProviders]
     const web3Provider: ethers.providers.Web3Provider = new ethers.providers.Web3Provider(browserProvider as EthersProvider)
     const network = await web3Provider.getNetwork()
-    console.log('network.chainId :>> ', network.chainId)
+    // console.log('network.chainId :>> ', network.chainId)
     const { currency } = currenciesByChainId[network.chainId.toString() as keyof typeof currenciesByChainId]
     return currency
   }

apps/web/src/composables/ledger.ts

@@ -1,7 +1,6 @@
 import { BitcoinLedgerSigner, EthersLedgerSigner } from '@casimir/wallets'
 import { ethers } from 'ethers'
-import { TransactionInit } from '@/interfaces/TransactionInit'
-import { MessageInit } from '@/interfaces/MessageInit'
+import { MessageInit, TransactionInit } from '@/interfaces/index'
 import useEnvironment from '@/composables/environment'
 import useEthers from '@/composables/ethers'
 

apps/web/src/composables/solana.ts

@@ -5,10 +5,8 @@ import {
   SystemProgram,
   PublicKey
 } from '@solana/web3.js'
-import { BrowserProviders } from '@/interfaces/BrowserProviders'
+import { BrowserProviders, MessageInit, TransactionInit } from '@/interfaces/index'
 import { ProviderString } from '@casimir/types'
-import { TransactionInit } from '@/interfaces/TransactionInit'
-import { MessageInit } from '@/interfaces/MessageInit'
 
 export default function useSolana() {
   const solanaProviderList = ['Phantom']

apps/web/src/composables/ssv.ts

@@ -7,8 +7,7 @@ import useEthers from './ethers'
 import useLedger from './ledger'
 import useTrezor from './trezor'
 import useWalletConnect from './walletConnect'
-import { ProviderString } from '@casimir/types'
-import { Pool } from '@casimir/types'
+import { Pool, ProviderString } from '@casimir/types'
 
 /** SSV Manager contract */
 let ssvManager: SSVManager

apps/web/src/composables/trezor.ts

@@ -2,8 +2,7 @@ import { EthersTrezorSigner } from '@casimir/wallets'
 import useEthers from '@/composables/ethers'
 import useEnvironment from '@/composables/environment'
 import { ethers } from 'ethers'
-import { MessageInit } from '@/interfaces/MessageInit'
-import { TransactionInit } from '@/interfaces/TransactionInit'
+import { MessageInit, TransactionInit } from '@/interfaces/index'
 
 const trezorPath = 'm/44\'/60\'/0\'/0/0'
 

apps/web/src/composables/users.ts

@@ -1,12 +1,9 @@
+import { onMounted, ref } from 'vue'
+import { AddAccountOptions, ProviderString, RemoveAccountOptions, User } from '@casimir/types'
 import { ethers } from 'ethers'
 import useEnvironment from '@/composables/environment'
 import useSSV from '@/composables/ssv'
 import useWallet from '@/composables/wallet'
-import { onMounted, ref } from 'vue'
-import { User } from '@casimir/types'
-import { Account } from '@casimir/types'
-import { Currency } from '@casimir/types'
-import { ProviderString } from '@casimir/types'
 
 const { usersBaseURL, ethereumURL } = useEnvironment()
 
@@ -125,62 +122,38 @@ export default function useUsers () {
     //     subscribeToUserEvents()
     // })
 
-    async function addAccount(provider: ProviderString, address: string, currency: Currency): Promise<{ error: boolean, message: string, data: User | null }> {
-        address = address.toLowerCase()
-        const account = user.value?.accounts?.find((account: Account) => {
-            const accountAddress = account.address.toLowerCase()
-            const accountProvider = account.walletProvider
-            const accountCurrency = account.currency
-            const addressIsEqual = accountAddress === address
-            const providerIsEqual = accountProvider === provider
-            const currencyIsEqual = accountCurrency === currency
-            const isEqual = addressIsEqual && providerIsEqual && currencyIsEqual
-            return isEqual
-        }) as Account
-        if (account) {
-            return { error: false, message: `Account already exists on user: ${account}`, data: user.value }
-        } else {
-            const accountToAdd = {
-                address,
-                currency,
-                balance: '0', // TODO: Decide how we want to handle this
-                balanceSnapshots: [],
-                roi: 0,
-                walletProvider: provider
-            }
-            const requestOptions = {
-                method: 'POST',
-                headers: { 
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    address: user.value?.address,
-                    account: accountToAdd
-                })
-            }
-            const response = await fetch(`${usersBaseURL}/user/add-sub-account`, requestOptions)
-            const { data: userAccount } = await response.json()
-            user.value = userAccount
-            return { error: false, message: `Account added to user: ${userAccount}`, data: userAccount }
+    async function addAccount(account: AddAccountOptions): Promise<{ error: boolean, message: string, data: User | null }> {
+        const requestOptions = {
+            method: 'POST',
+            headers: { 
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ account })
         }
+        const response = await fetch(`${usersBaseURL}/user/add-sub-account`, requestOptions)
+        const { data: userAccount } = await response.json()
+        user.value = userAccount
+        return { error: false, message: `Account added to user: ${userAccount}`, data: userAccount }
     }
 
-    // TODO: Refactor this next. 2/14
-    async function removeAccount(provider: ProviderString, address: string, currency: Currency) {
+    async function removeAccount({ address, currency, ownerAddress, walletProvider }: RemoveAccountOptions) {
         address = address.toLowerCase()
         const requestOptions = {
             method: 'POST',
             headers: { 
                 'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-                primaryAddress: user.value?.address,
-                provider,
                 address,
-                currency
+                currency,
+                ownerAddress,
+                walletProvider,
             })
         }
-        return await fetch(`${usersBaseURL}/user/remove-sub-account`, requestOptions)
+        const response = await fetch(`${usersBaseURL}/user/remove-sub-account`, requestOptions)
+        const { data: userAccount } = await response.json()
+        user.value = userAccount
+        return { error: false, message: `Account removed from user: ${userAccount}`, data: userAccount }
     }
 
     async function getMessage(address: string) {