Make sure walletProvider returns on user accounts in /check-secondary…

…-address
consensusnetworks · May 17, 2023 · a6fb5d7 · a6fb5d7
1 parent 088c66c
commit a6fb5d7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
@@ -296,6 +296,7 @@ export default function useWallet() {
     }
 
     const accountsIfSecondaryAddress : Account[] | void = await checkIfSecondaryAddress(selectedAddress.value)
+    console.log('accountsIfSecondaryAddress :>> ', accountsIfSecondaryAddress)
     if (accountsIfSecondaryAddress.length) {
       return accountsIfSecondaryAddress
     } else {

diff --git a/common/data/src/schemas/user.schema.json b/common/data/src/schemas/user.schema.json
@@ -19,12 +19,17 @@
         "updated_at": {
             "type": "string",
             "description": "The account last update date in ISO 8601 format"
+        },
+        "wallet_provider": {
+            "type": "string",
+            "description": "The wallet provider used set a primary user account"
         }
     },
     "required": [
         "address",
         "created_at",
         "id",
-        "updated_at"
+        "updated_at",
+        "wallet_provider"
     ]
 }
diff --git a/common/types/src/interfaces/User.ts b/common/types/src/interfaces/User.ts
@@ -1,3 +1,5 @@
+import { ProviderString } from '@casimir/types'
+
 export interface User {
     /** Unique ID (and essential for auth verification) */
     address: string
@@ -7,4 +9,6 @@ export interface User {
     id: number
     /* ISO Timestamp of when user was last updated */
     updatedAt?: string
+    /** Wallet provider (e.g. metamask) */
+    walletProvider: ProviderString
 }
diff --git a/services/users/src/providers/db.ts b/services/users/src/providers/db.ts
@@ -41,9 +41,9 @@ export default function useDB() {
      * @returns The new user
      */
     async function addUser(user: User, account: Account) : Promise<UserAddedSuccess | undefined> {
-        const { address, createdAt, updatedAt } = user
-        const text = 'INSERT INTO users (address, created_at, updated_at) VALUES ($1, $2, $3) RETURNING *;'
-        const params = [address, createdAt, updatedAt]
+        const { address, createdAt, updatedAt, walletProvider } = user
+        const text = 'INSERT INTO users (address, created_at, updated_at, wallet_provider) VALUES ($1, $2, $3, $4) RETURNING *;'
+        const params = [address, createdAt, updatedAt, walletProvider]
         const rows = await postgres.query(text, params)
         const addedUser = rows[0]
         account.userId = addedUser.id

diff --git a/services/users/src/routes/auth.ts b/services/users/src/routes/auth.ts
@@ -56,6 +56,7 @@ router.post('/login', async (req: express.Request, res: express.Response) => {
                     address,
                     createdAt: now,
                     updatedAt: now,
+                    walletProvider: provider,
                 } as User
                 const account = {
                     address,
@@ -107,9 +108,11 @@ router.post('/check-secondary-address', async (req: express.Request, res: expres
         const users = await Promise.all(accounts.map(async account => {
             const { userId } = account
             const user = await getUserById(userId)
-            // TODO: Update users schema to include walletProvider
-            const { address } = user
-            return { address: maskAddress(address) }
+            const { address, walletProvider } = user
+            return { 
+                address: maskAddress(address),
+                walletProvider,
+            }
         }))
         res.setHeader('Content-Type', 'application/json')
         res.status(200)