Merge pull request #132 from shopware/brain-00000/fixes-for-fraud-det…

…ection BRAIN-41: fraud protection fixes
shopware · Nov 15, 2024 · 56aeef0 · 56aeef0
2 parents cd527a4 + a7f24f5
commit 56aeef0
Show file tree

Hide file tree

Showing 20 changed files with 768 additions and 224 deletions.
diff --git a/assets/src/component/sw-braintree-app-settings/sw-braintree-app-settings-general.vue b/assets/src/component/sw-braintree-app-settings/sw-braintree-app-settings-general.vue
@@ -4,16 +4,16 @@
     :title='$t("settings.general.title")'
     :is-loading='loading'
 >
-    <div class='sw-braintree-app-settings-general__container'>
+    <div class='sw-braintree-app-settings-general__threeDSecuredEnforced'>
         <mt-switch
-            class='sw-braintree-app-settings-general__threeDSecureEnforced'
+            class='sw-braintree-app-settings-general__threeDSecureEnforced__input'
             :label='$t("settings.general.threeDSecureEnforced.label")'
             :checked='activeConfig?.threeDSecureEnforced ?? undefined'
-            :is-inherited='isThreeDSecureEnforcedInherited'
+            :is-inherited='isFieldInherited("threeDSecureEnforced")'
             :is-inheritance-field='!!salesChannelId'
-            @change='onChanceThreeDSecureEnforcedInherited'
-            @inheritance-remove='onRemoveInheritance'
-            @inheritance-restore='onRestoreInheritance'
+            @change='activeConfig.threeDSecureEnforced = !activeConfig.threeDSecureEnforced'
+            @inheritance-remove='onRemoveInheritance("threeDSecureEnforced")'
+            @inheritance-restore='onRestoreInheritance("threeDSecureEnforced")'
         />
 
         <mt-icon
@@ -23,21 +23,35 @@
             name='solid-question-circle-s'
         />
     </div>
+    <div class='sw-braintree-app-settings-general__shipsFromPostalCode'>
+        <mt-text-field
+            class='sw-braintree-app-settings-general__shipsFromPostalCode__input'
+            :label='$t("settings.general.shipsFromPostalCode.label")'
+            :placeholder='$t("settings.general.shipsFromPostalCode.placeholder")'
+            :value='activeConfig?.shipsFromPostalCode ?? undefined'
+            :is-inherited='isFieldInherited("shipsFromPostalCode")'
+            :is-inheritance-field='!!salesChannelId'
+            :model-value='activeConfig.shipsFromPostalCode ?? undefined'
+            @update:model-value='activeConfig.shipsFromPostalCode = $event ?? null'
+            @inheritance-remove='onRemoveInheritance("shipsFromPostalCode")'
+            @inheritance-restore='onRestoreInheritance("shipsFromPostalCode")'
+        />
+    </div>
 </mt-card>
 </template>
 
 <script lang='ts'>
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
-import { MtCard, MtSwitch, MtIcon } from '@shopware-ag/meteor-component-library';
+import { MtCard, MtSwitch, MtIcon, MtTextField } from '@shopware-ag/meteor-component-library';
 import { registerSaveHandler } from '@/resources/inject-keys';
 import { DefaultConfigEntity } from '@/resources/entities';
 import { inject } from 'vue';
 
 export default defineComponent({
     name: 'sw-braintree-app-settings-general',
 
-    components: { MtCard, MtSwitch, MtIcon },
+    components: { MtTextField, MtCard, MtSwitch, MtIcon },
 
     props: {
         salesChannelId: {
@@ -71,13 +85,6 @@ export default defineComponent({
         activeConfig(): ConfigEntity {
             return this.config[this.stringifySalesChannelId] ?? DefaultConfigEntity(this.salesChannelId);
         },
-
-        isThreeDSecureEnforcedInherited(){
-            if(this.salesChannelId === null)
-                return false;
-
-            return this.activeConfig.threeDSecureEnforced === null;
-        },
     },
 
     watch: {
@@ -116,31 +123,43 @@ export default defineComponent({
                 .catch((e) => this.$notify.error('save_settings', e));
         },
 
-        onChanceThreeDSecureEnforcedInherited(){
-            this.activeConfig.threeDSecureEnforced = !this.activeConfig.threeDSecureEnforced;
+        isFieldInherited(key: keyof ConfigEntity): boolean {
+            if (this.salesChannelId === null)
+                return false;
+
+            return this.activeConfig[key] === null;
         },
 
-        onRemoveInheritance(){
-            this.activeConfig.threeDSecureEnforced = this.config['null']?.threeDSecureEnforced ?? false;
+        onRemoveInheritance(key: keyof ConfigEntity): void {
+            // @ts-expect-error - TS does not know that the value of key is a valid assignment
+            this.activeConfig[key] = this.config['null']?.[key]?? DefaultConfigEntity(this.salesChannelId)[key];
         },
 
-        onRestoreInheritance(){
-            this.activeConfig.threeDSecureEnforced = null;
+        onRestoreInheritance(key: keyof ConfigEntity): void {
+            // @ts-expect-error - TS does not know that the value of key is a valid assignment
+            this.activeConfig[key] = null;
         },
     },
 });
 </script>
 
 <style lang='scss'>
 .sw-braintree-app-settings-general {
-    &__container {
+    display: flex;
+    flex-direction: column;
+
+    &__threeDSecuredEnforced {
         display: flex;
         align-items: center;
         gap: 8px;
+
+        .mt-field--switch__container .mt-field--switch {
+            margin: 0;
+        }
     }
 
-    .mt-field--switch__container .mt-field--switch {
-        margin: 0;
+    &__shipsFromPostalCode {
+        margin-top: 24px;
     }
 }
 </style>
diff --git a/assets/src/i18n/en-GB.json b/assets/src/i18n/en-GB.json
@@ -55,7 +55,11 @@
       "threeDSecureEnforced": {
         "label": "Only accept transactions with 3D Secure"
       },
-      "threeDSecureToolTip": "Transaction will not be accepted, if 3D Secure is not available"
+      "threeDSecureToolTip": "Transaction will not be accepted, if 3D Secure is not available",
+      "shipsFromPostalCode": {
+        "label": "Sender shipping address postal code",
+        "placeholder": "e.g. 48268"
+      }
     },
     "currency": {
       "missingAccountTitle": "Missing information",

diff --git a/assets/src/resources/entities.ts b/assets/src/resources/entities.ts
@@ -2,6 +2,7 @@ export const DefaultConfigEntity = (salesChannelId?: string | null): ConfigEntit
     id: null,
     shop: '',
     threeDSecureEnforced: false,
+    shipsFromPostalCode: null,
     salesChannelId: salesChannelId ?? null,
     createdAt: (new Date()).toISOString(),
     updatedAt: null,

diff --git a/assets/src/types/global.ts b/assets/src/types/global.ts
@@ -22,11 +22,14 @@ declare global {
         id: string | null,
         shop: string,
         threeDSecureEnforced: boolean | null,
+        shipsFromPostalCode: string | null,
         salesChannelId: string | null,
         createdAt: string,
         updatedAt: string | null,
     }
 
+    type ConfigEntityProperties = keyof Omit<ConfigEntity, 'shop' | 'createdAt' | 'updatedAt' | 'id' | 'salesChannelId'>;
+
     interface CurrencyMappingEntity {
         id: string | null,
         shop: string,