.

thinkst · Oct 11, 2024 · df59173 · df59173
1 parent 3429433
commit df59173
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/canarytokens/canarydrop.py b/canarytokens/canarydrop.py
@@ -155,7 +155,7 @@ class Canarydrop(BaseModel):
     cc_v2_cvv: Optional[str]
     cc_v2_expiry_month: Optional[int]
     cc_v2_expiry_year: Optional[int]
-    cc_v2_name_on_card: Optional[str]
+    cc_v2_name_on_card: Literal["Canarytokens.org"] = "Canarytokens.org"
 
     @root_validator(pre=True)
     def _validate_triggered_details(cls, values):

diff --git a/canarytokens/models.py b/canarytokens/models.py
@@ -1093,7 +1093,7 @@ class MySQLTokenResponse(TokenResponse):
 
 class CreditCardV2TokenResponse(TokenResponse):
     token_type: Literal[TokenTypes.CREDIT_CARD_V2] = TokenTypes.CREDIT_CARD_V2
-    name_on_card: Literal["Canarytokens.org"] = "Canarytokens.org"
+    name_on_card: str
     card_number: str
     cvv: str
     expiry_month: int

diff --git a/frontend/app.py b/frontend/app.py
@@ -1873,7 +1873,6 @@ def _(
         canarydrop.cc_v2_cvv = card.cvv
         canarydrop.cc_v2_expiry_month = card.expiry_month
         canarydrop.cc_v2_expiry_year = card.expiry_year
-        canarydrop.cc_v2_name_on_card = card.name_on_card
     elif status == credit_card_infra.Status.NO_MORE_CREDITS:
         return JSONResponse(
             {"message": "No more Card Credits available."}, status_code=500
@@ -1891,6 +1890,7 @@ def _(
         auth_token=canarydrop.auth,
         hostname=canarydrop.generated_hostname,
         url_components=list(canarydrop.get_url_components()),
+        name_on_card=canarydrop.cc_v2_name_on_card,
         card_number=canarydrop.cc_v2_card_number,
         cvv=canarydrop.cc_v2_cvv,
         expiry_month=canarydrop.cc_v2_expiry_month,

diff --git a/frontend_vue/src/components/tokens/credit_card_v2/ManageToken.vue b/frontend_vue/src/components/tokens/credit_card_v2/ManageToken.vue
@@ -9,23 +9,14 @@ import TokenDisplay from './TokenDisplay.vue';
 import type { ManageTokenBackendType } from '@/components/tokens/types.ts';
 
 const props = defineProps<{
-	tokenData: ManageTokenBackendType;
+	tokenBackendResponse: ManageTokenBackendType;
 }>();
 
-// TODO: these fields are coming empty from the backend
-// const tokenData = ref({
-// 	name_on_card: props.tokenData.name_on_card || 'Paul Ndegwa Gichuki',
-// 	card_number: props.tokenData.card_number || '0000 0000 0000 0000 0000',
-// expiry_month: props.tokenData.expiry_month || '11',
-// expiry_year: props.tokenData.expiry_year || '27',
-// 	cvv: props.tokenData.cvv || '344',
-// });
-
 const tokenInfo = ref({
-	name_on_card: 'Paul Ndegwa Gichuki',
-	card_number:'0000 0000 0000 0000',
-	expiry_month: '11',
-	expiry_year: '27',
-	cvv: '344',
+	name_on_card: props.tokenBackendResponse.canarydrop?.cc_v2_name_on_card || '',
+	card_number: props.tokenBackendResponse.canarydrop?.cc_v2_card_number || '',
+	expiry_month: props.tokenBackendResponse.canarydrop?.cc_v2_expiry_month || '',
+	expiry_year: props.tokenBackendResponse.canarydrop?.cc_v2_expiry_year || '',
+	cvv: props.tokenBackendResponse?.canarydrop.cc_v2_cvv || '',
 });
 </script>
diff --git a/frontend_vue/src/components/tokens/types.ts b/frontend_vue/src/components/tokens/types.ts
@@ -75,6 +75,12 @@ type CanaryDropType = {
   wg_conf: string;
   pwa_icon: string | null;
   pwa_app_name: string | null;
+  cc_v2_card_id: string;
+  cc_v2_card_number: string;
+  cc_v2_cvv: string;
+  cc_v2_expiry_month: string;
+  cc_v2_expiry_year: string;
+  cc_v2_name_on_card: string;
 };
 
 type NullablePartial<T> = { [P in keyof T]: T[P] | null };