feat: Interledger Cards (#2147)

* order cards form

* add ordering cards form continued

* Revert "chore(deps): update actions/labeler action to v6 (#2135)"

This reverts commit 8903b44.

* new cards continued

* Update TerminateCardDialog.tsx

* cards for Interledger

* feat: add password check for terminate

* Add password check

* Update card.tsx

* Update controller.test.ts

---------

Co-authored-by: dragosp1011 <dragosh1011@gmail.com>

Author: Tymmmy

packages/wallet/backend/src/app.ts

@@ -424,6 +424,11 @@ export class App {
 
     router.post('/cards', isAuth, interledgerCardController.create)
 
+    router.put(
+      '/cards/:cardId/activate',
+      isAuth,
+      interledgerCardController.activate
+    )
     router.put(
       '/cards/:cardId/freeze',
       isAuth,

packages/wallet/backend/src/interledgerCard/controller.ts

@@ -1,9 +1,15 @@
 import type { NextFunction, Request } from 'express'
 import { validate } from '@/shared/validate'
 import { CreateCardResponse, InterledgerCardService } from './service'
-import { cardIdSchema, cardSchema } from './validation'
-import { Controller, toSuccessResponse } from '@shared/backend'
+import { cardIdSchema, cardSchema, terminateCardSchema } from './validation'
+import {
+  BadRequest,
+  Controller,
+  NotFound,
+  toSuccessResponse
+} from '@shared/backend'
 import { Card } from '@/interledgerCard/model'
+import { UserService } from '@/user/service'
 
 interface IInterledgerCardController {
   create: Controller<CreateCardResponse>
@@ -15,7 +21,10 @@ interface IInterledgerCardController {
 }
 
 export class InterledgerCardController implements IInterledgerCardController {
-  constructor(private interledgerCardService: InterledgerCardService) {}
+  constructor(
+    private interledgerCardService: InterledgerCardService,
+    private userService: UserService
+  ) {}
 
   create = async (
     req: Request,
@@ -48,9 +57,8 @@ export class InterledgerCardController implements IInterledgerCardController {
     const userId = req.session.user.id
 
     try {
-      const accounts = await this.interledgerCardService.list(userId)
-
-      res.status(200).json(toSuccessResponse(accounts))
+      const cards = await this.interledgerCardService.list(userId)
+      res.status(200).json(toSuccessResponse(cards))
     } catch (e) {
       next(e)
     }
@@ -78,6 +86,21 @@ export class InterledgerCardController implements IInterledgerCardController {
     }
   }
 
+  activate = async (req: Request, res: CustomResponse, next: NextFunction) => {
+    try {
+      const userId = req.session.user.id
+      const {
+        params: { cardId }
+      } = await validate(cardIdSchema, req)
+
+      await this.interledgerCardService.activate(userId, cardId)
+
+      res.status(200).json(toSuccessResponse())
+    } catch (e) {
+      next(e)
+    }
+  }
+
   freeze = async (req: Request, res: CustomResponse, next: NextFunction) => {
     try {
       const userId = req.session.user.id
@@ -112,8 +135,20 @@ export class InterledgerCardController implements IInterledgerCardController {
     try {
       const userId = req.session.user.id
       const {
-        params: { cardId }
-      } = await validate(cardIdSchema, req)
+        params: { cardId },
+        body: { password }
+      } = await validate(terminateCardSchema, req)
+
+      const user = await this.userService.getById(userId)
+
+      if (!user) {
+        throw new NotFound()
+      }
+
+      const passwordIsValid = await user?.verifyPassword(password)
+      if (!passwordIsValid) {
+        throw new BadRequest('Password is not valid')
+      }
 
       await this.interledgerCardService.terminate(userId, cardId)
 

packages/wallet/backend/src/interledgerCard/service.ts

@@ -99,6 +99,17 @@ export class InterledgerCardService implements IInterledgerCardService {
     return card
   }
 
+  async activate(userId: string, cardId: string) {
+    const card = await this.getById(userId, cardId)
+    if (card.status !== 'ORDERED') {
+      throw new BadRequest('Incorrect status')
+    }
+
+    await card.$query().patch({
+      status: 'ACTIVE'
+    })
+  }
+
   async freeze(userId: string, cardId: string) {
     const card = await this.getById(userId, cardId)
     if (card.status !== 'ACTIVE') {

packages/wallet/backend/src/interledgerCard/validation.ts

@@ -12,3 +12,11 @@ export const cardIdSchema = z.object({
     cardId: z.string().uuid()
   })
 })
+export const terminateCardSchema = z.object({
+  params: z.object({
+    cardId: z.string().uuid()
+  }),
+  body: z.object({
+    password: z.string().min(1)
+  })
+})

packages/wallet/backend/src/reorder.ts

@@ -74,9 +74,7 @@ async function reorder() {
         card: { productCode: cardProductCode }
       })
 
-      logger.info(
-        `Created card with cardId: ${card.id}; customerId: ${card.customerId}`
-      )
+      logger.info(`Created card with cardId: ${card.id};`)
 
       await gateHubClient.orderPlasticForCard(
         '32c471ae-f7d3-4ca9-ac95-68345013d1d4',

packages/wallet/backend/tests/cards/controller.test.ts

@@ -107,20 +107,14 @@ describe('CardController', () => {
 
       const mockedCards: ICardResponse[] = [
         {
-          sourceId: '3dc96e41-279d-4355-921a-e1946e90e1ff',
-          nameOnCard: 'Jane Doe',
           id: 'test-card-id',
-          accountId: '469E3666F8914020B6B2604F7D4A10F6',
-          accountSourceId: 'c44e6bc8-d0ef-491e-b374-6d09b6fa6332',
-          maskedPan: '528700******9830',
-          status: 'Active',
-          statusReasonCode: null,
-          lockLevel: null,
-          expiryDate: '0929',
-          customerId: 'customer-id',
-          customerSourceId: 'a5aba6c7-b8ad-4cfe-98d5-497366a4ee2c',
-          productCode: 'VMDTKPREB',
-          isPinSet: false
+          status: 'ORDERED',
+          walletAddress: {
+            id: 'test-wa-id',
+            publicName: 'test',
+            url: 'test-url',
+            active: false
+          }
         }
       ]
 

packages/wallet/frontend/src/components/dialogs/TerminateCardDialog.tsx

@@ -14,7 +14,6 @@ import { Form } from '@/ui/forms/Form'
 import { UserCardFront } from '../userCards/UserCard'
 import { cardService, terminateCardSchema } from '@/lib/api/card'
 import { useToast } from '@/lib/hooks/useToast'
-import { getObjectKeys } from '@/utils/helpers'
 import { ICardResponse } from '@wallet/shared'
 import { Input } from '@/ui/forms/Input'
 import { useRouter } from 'next/router'
@@ -72,7 +71,7 @@ export const TerminateCardDialog = ({
                     onSubmit={async (data) => {
                       const response = await cardService.terminate(
                         card.id,
-                        data
+                        data.password
                       )
 
                       if (response.success) {
@@ -83,14 +82,7 @@ export const TerminateCardDialog = ({
                         })
                         router.replace(router.pathname)
                       } else {
-                        const { errors, message } = response
-                        if (errors) {
-                          getObjectKeys(errors).map((field) =>
-                            terminateCardForm.setError(field, {
-                              message: errors[field]
-                            })
-                          )
-                        }
+                        const { message } = response
                         if (message) {
                           terminateCardForm.setError('root', { message })
                         }
@@ -99,7 +91,7 @@ export const TerminateCardDialog = ({
                   >
                     <div className="flex flex-col items-center justify-center gap-2">
                       <UserCardFront
-                        nameOnCard={`${card.nameOnCard} ${card.walletAddress ? card.walletAddress.replace('https://', '$') : ''}`}
+                        cardWalletAddress={card ? card.walletAddress.url : ''}
                         isBlocked={false}
                       />
                       <p className="text-center">

packages/wallet/frontend/src/components/dialogs/UserCardPINDialog.tsx

@@ -72,7 +72,7 @@ export const UserCardPINDialog = ({
                 </DialogTitle>
                 <div className="flex space-x-5">
                   <UserCardFront
-                    nameOnCard={`${card.nameOnCard} ${card.walletAddress ? card.walletAddress.replace('https://', '$') : ''}`}
+                    cardWalletAddress={card ? card.walletAddress.url : ''}
                     isBlocked={false}
                     className="origin-top-left scale-[.3] [margin:0_calc(-20rem*(1-.3))_calc(-13rem*(1-0.3))_0] "
                   />