From 0224edfbf6064e490561159d7e9475a6725976eb Mon Sep 17 00:00:00 2001
From: Max Mclaughlin <max@thinkst.com>
Date: Tue, 22 Oct 2024 18:02:34 +0200
Subject: [PATCH] .

---
 canarytokens/credit_card_v2.py                | 14 +----------
 canarytokens/models.py                        |  4 +++
 frontend_vue/src/components/HistoryToken.vue  | 17 +++++++++++--
 .../src/components/ui/IncidentDetails.vue     | 17 ++++++++++---
 .../components/ui/IncidentDetailsSummary.vue  |  2 +-
 .../src/utils/incidentAlertService.ts         | 25 +++++++++++++------
 6 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/canarytokens/credit_card_v2.py b/canarytokens/credit_card_v2.py
index 0b9dab77a..e1e0fb747 100644
--- a/canarytokens/credit_card_v2.py
+++ b/canarytokens/credit_card_v2.py
@@ -53,25 +53,13 @@ class Customer:
 
 class CreditCardTrigger(BaseModel):
     canarytoken: Canarytoken
-    auth_code: Optional[str]
-    billing_amount: Optional[str]
-    billing_currency: Optional[str]
-    card_id: Optional[str]
-    card_nickname: Optional[str]
-    client_data: Optional[str]
-    failure_reason: Optional[str]
     masked_card_number: Optional[str]
     merchant: Optional[dict]
-    network_transaction_id: Optional[str]
-    posted_date: Optional[str]
-    retrieval_ref: Optional[str]
-    status: Optional[str]
     transaction_amount: Optional[str]
     transaction_currency: Optional[str]
     transaction_date: Optional[str]
-    transaction_id: Optional[str]
     transaction_type: Optional[str]
-    risk_details: Optional[dict]
+    status: Optional[str]
 
 
 def _get_lambda_client(refresh_client: bool = False):
diff --git a/canarytokens/models.py b/canarytokens/models.py
index 4643a5ec0..9cb05eba3 100644
--- a/canarytokens/models.py
+++ b/canarytokens/models.py
@@ -1727,6 +1727,10 @@ class CreditCardV2AdditionalInfo(BaseModel):
     merchant: Optional[dict]
     transaction_amount: Optional[str]
     transaction_currency: Optional[str]
+    masked_card_number: Optional[str]
+    transaction_date: Optional[str]
+    transaction_type: Optional[str]
+    status: Optional[str]
 
 
 class CreditCardV2TokenHit(TokenHit):
diff --git a/frontend_vue/src/components/HistoryToken.vue b/frontend_vue/src/components/HistoryToken.vue
index 111da2d92..134af1552 100644
--- a/frontend_vue/src/components/HistoryToken.vue
+++ b/frontend_vue/src/components/HistoryToken.vue
@@ -72,12 +72,13 @@
           <IncidentDetails
             v-if="selectedAlert"
             id="incident_detail"
+            :showingMap="showMap()"
             :hit-alert="selectedAlert"
             class="absolute top-[120px] left-[0] md:top-[0px] md:relative grid-areas z-10 md:overflow-scroll w-full sm:w-auto"
             @close="selectedAlert = null"
           ></IncidentDetails>
         </transition>
-        <CustomMap :hits-list="hitsList"></CustomMap>
+        <CustomMap v-if="showMap()" :hits-list="hitsList"></CustomMap>
       </div>
       <!-- Benner for larger screens -->
       <BannerDeviceCanarytools class="hidden sm:flex" />
@@ -102,6 +103,7 @@ import BannerDeviceCanarytools from '@/components/ui/BannerDeviceCanarytools.vue
 import IncidentDetails from '@/components/ui/IncidentDetails.vue';
 import AlertsListDownload from '@/components/ui/AlertsListDownload.vue';
 import { addViewTransition } from '@/utils/utils';
+import { TOKENS_TYPE } from '@/components/constants';
 
 const emits = defineEmits(['update-token-title']);
 
@@ -112,6 +114,7 @@ const isLoading = ref(false);
 const error = ref(null);
 const hitsList: Ref<HitsType[] | undefined> = ref();
 const selectedAlert = ref();
+const tokenType = ref();
 
 onMounted(async () => {
   await fetchTokenHistoryData();
@@ -129,12 +132,17 @@ async function fetchTokenHistoryData() {
     const res = await historyToken(params);
     const historyTokenData = (await res.data) as HistoryTokenBackendType;
     hitsList.value = historyTokenData.history.hits.sort((a, b) => b.time_of_hit - a.time_of_hit);
-    
+    tokenType.value = historyTokenData.history.token_type;
+
     emits(
       'update-token-title',
       historyTokenData.history.token_type,
       route.params.token
     );
+
+    if (tokenType.value == TOKENS_TYPE.CREDIT_CARD_V2 && hitsList.value.length > 0) {
+      handleSelectAlert(hitsList.value[0]);
+    }
   } catch (err: any) {
     console.log(err, 'err!');
     error.value = err.toString();
@@ -153,6 +161,11 @@ async function handleSelectAlert(incident: HitsType) {
     : window.scrollTo({ top: 0, behavior: 'smooth' });
   });
 }
+
+function showMap(): boolean {
+  const tokensWithoutGeoIPInfo = [TOKENS_TYPE.CREDIT_CARD_V2];
+  return !tokensWithoutGeoIPInfo.includes(tokenType.value);
+}
 </script>
 
 <style>
diff --git a/frontend_vue/src/components/ui/IncidentDetails.vue b/frontend_vue/src/components/ui/IncidentDetails.vue
index 65fa9ed17..21dea4d52 100644
--- a/frontend_vue/src/components/ui/IncidentDetails.vue
+++ b/frontend_vue/src/components/ui/IncidentDetails.vue
@@ -1,7 +1,10 @@
 <template>
-  <div class="pb-32 bg-white sm:m-8 rounded-3xl">
+  <div
+    class="pb-32 bg-white rounded-3xl"
+    :class="{ 'sm:m-8': props.showingMap, 'border shadow-solid-shadow-grey border-grey-100': !props.showingMap }">
     <div class="sticky top-[0px] bg-white h-[4rem] sm:h-40 flex justify-end">
       <button
+        v-if="props.showingMap"
         type="button"
         class="px-16"
         @click="emit('close')"
@@ -113,10 +116,16 @@ import {
   isNotEmpty,
   buildIncidentDetails,
 } from '@/utils/incidentAlertService';
+import { boolean } from 'yup';
 
-const props = defineProps<{
-  hitAlert: HitsType;
-}>();
+const props = withDefaults(
+  defineProps<{
+    hitAlert: HitsType;
+    showingMap: boolean;
+  }>(), {
+    showingMap: true,
+  },
+);
 
 const emit = defineEmits(['close']);
 const builtIncidentDetail: Ref<FormattedHitsType | HitsType | null> = ref(null);
diff --git a/frontend_vue/src/components/ui/IncidentDetailsSummary.vue b/frontend_vue/src/components/ui/IncidentDetailsSummary.vue
index 68a8d4546..81961ce34 100644
--- a/frontend_vue/src/components/ui/IncidentDetailsSummary.vue
+++ b/frontend_vue/src/components/ui/IncidentDetailsSummary.vue
@@ -6,7 +6,7 @@
         <span class="text-xs text-red-100">Date</span>
         <span class="font-semibold">{{ date }} </span>
       </li>
-      <li class="flex flex-col gap-2">
+      <li v-if="ip" class="flex flex-col gap-2">
         <span class="text-xs text-red-100">IP</span>
         <span class="font-semibold">{{ ip }}</span>
       </li>
diff --git a/frontend_vue/src/utils/incidentAlertService.ts b/frontend_vue/src/utils/incidentAlertService.ts
index c057a5cc8..bcebb4705 100644
--- a/frontend_vue/src/utils/incidentAlertService.ts
+++ b/frontend_vue/src/utils/incidentAlertService.ts
@@ -13,6 +13,7 @@ import {
   INCIDENT_CHANNEL_TYPE_LABELS,
   INCIDENT_DETAIL_CUSTOM_LABELS,
 } from '@/components/constants';
+import { useScrollLock } from '@vueuse/core';
 
 /**
  * Checks if the token type exists in INCIDENT_CHANNEL_TYPE_LABELS
@@ -127,6 +128,21 @@ function locationValue(
     : location;
 }
 
+function parseGeoInfo(hitAlert: Record<string, any>) {
+  if (isCreditCardtoken(hitAlert.token_type)) return null;
+
+  if (!hitAlert.geo_info.bogon) {
+    return {
+      ...hitAlert.geo_info,
+    }
+  }
+
+  return {
+    ip: hitAlert.geo_info.ip,
+    bogon: hitAlert.geo_info.bogon,
+  };
+}
+
 export function buildIncidentDetails(
   hitAlert: HitsType
 ): FormattedHitsType | HitsType {
@@ -153,14 +169,7 @@ export function buildIncidentDetails(
       },
       time_of_hit: convertUnixTimeStampToDate(hitAlert.time_of_hit),
       src_ip: hitAlert.src_ip,
-      geo_info: !hitAlert.geo_info.bogon
-        ? {
-            ...hitAlert.geo_info,
-          }
-        : {
-            ip: hitAlert.geo_info.ip,
-            bogon: hitAlert.geo_info.bogon,
-          },
+      geo_info: parseGeoInfo(hitAlert),
       is_tor_relay: !isCreditCardtoken(hitAlert.token_type)
         ? hitAlert.is_tor_relay
         : null,