From 20eb647472356bcbe3b5d3991e45996f2787eb65 Mon Sep 17 00:00:00 2001
From: Travis Semple <travis8814@gmail.com>
Date: Mon, 21 Oct 2024 16:09:30 -0700
Subject: [PATCH 1/5] If transaction is already completed jump directly to
 redirect url

---
 auth-web/package-lock.json             | 4 ++--
 auth-web/package.json                  | 2 +-
 auth-web/src/views/pay/PaymentView.vue | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
index 829a0ee74..28201335e 100644
--- a/auth-web/package-lock.json
+++ b/auth-web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "auth-web",
-  "version": "2.6.99",
+  "version": "2.6.100",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "auth-web",
-      "version": "2.6.99",
+      "version": "2.6.100",
       "dependencies": {
         "@bcrs-shared-components/base-address": "2.0.3",
         "@bcrs-shared-components/bread-crumb": "1.0.8",
diff --git a/auth-web/package.json b/auth-web/package.json
index db56998f4..5770eb2bb 100644
--- a/auth-web/package.json
+++ b/auth-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "2.6.99",
+  "version": "2.6.100",
   "appName": "Auth Web",
   "sbcName": "SBC Common Components",
   "private": true,
diff --git a/auth-web/src/views/pay/PaymentView.vue b/auth-web/src/views/pay/PaymentView.vue
index 966b440af..528efc9de 100644
--- a/auth-web/src/views/pay/PaymentView.vue
+++ b/auth-web/src/views/pay/PaymentView.vue
@@ -81,7 +81,7 @@
 <script lang="ts">
 
 import { Component, Prop, Vue } from 'vue-property-decorator'
-import { PaymentTypes, SessionStorageKeys } from '@/util/constants'
+import { InvoiceStatus, PaymentTypes, SessionStorageKeys } from '@/util/constants'
 import { AccountSettings } from '@/models/account-settings'
 import CommonUtils from '@/util/common-util'
 import ConfigHelper from '@/util/config-helper'
@@ -155,6 +155,11 @@ export default class PaymentView extends Vue {
             // if isOnlineBankingAllowed is true, allowed show CC as only payment type
             this.showPayWithOnlyCC = !invoice?.isOnlineBankingAllowed
           }
+          else if (invoice.statusCode === InvoiceStatus.COMPLETED) {
+            // Skip PAYBC, take directly to the "clients redirect url", this avoids transaction already done error.
+            this.goToUrl(this.redirectUrlFixed)
+            return
+          }
         } catch (error) {
           // eslint-disable-next-line no-console
           console.error('error in accessing the invoice.Defaulting to CC flow')

From b005768bc367e9f9eb15c87f58fa2addde0f4b86 Mon Sep 17 00:00:00 2001
From: Travis Semple <travis8814@gmail.com>
Date: Wed, 23 Oct 2024 14:16:22 -0700
Subject: [PATCH 2/5] Small tweaks to use new route

---
 auth-web/src/services/payment.services.ts | 10 ++++++++++
 auth-web/src/views/pay/PaymentView.vue    | 19 ++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/auth-web/src/services/payment.services.ts b/auth-web/src/services/payment.services.ts
index 21a3caafe..1d1730001 100644
--- a/auth-web/src/services/payment.services.ts
+++ b/auth-web/src/services/payment.services.ts
@@ -347,4 +347,14 @@ export default class PaymentService {
     const url = `${ConfigHelper.getPayAPIURL()}/eft-shortnames/${shortNameId}/payment`
     return axios.post(url, bodyParams)
   }
+  
+  static async isValidRedirectUrl (redirectUrl: string): AxiosPromise<boolean> {
+    const body = {
+      redirectUrl: redirectUrl
+    }
+    const url = `${ConfigHelper.getPayAPIURL()}/valid-redirect-url`
+    // Using post here, easier to deal with urls, without having to deal with encoding / decoding.
+    const response = await axios.post(url, body)
+    return response?.data?.isValid
+  }
 }
diff --git a/auth-web/src/views/pay/PaymentView.vue b/auth-web/src/views/pay/PaymentView.vue
index 528efc9de..e0d717c10 100644
--- a/auth-web/src/views/pay/PaymentView.vue
+++ b/auth-web/src/views/pay/PaymentView.vue
@@ -91,6 +91,7 @@ import PaymentCard from '@/components/pay/PaymentCard.vue'
 import SbcSystemError from 'sbc-common-components/src/components/SbcSystemError.vue'
 import { mapActions } from 'pinia'
 import { useOrgStore } from '@/stores/org'
+import PaymentService from '@/services/payment.services'
 
 @Component({
   components: {
@@ -137,8 +138,17 @@ export default class PaymentView extends Vue {
       if (this.isUserSignedIn && !!accountSettings) {
         // get the invoice and check for OB
         try {
-          const invoice: Invoice = await this.getInvoice({ invoiceId: this.paymentId, accountId: accountSettings?.id })
-          if (invoice?.paymentMethod === PaymentTypes.ONLINE_BANKING) {
+          const invoice = await this.getInvoice({ invoiceId: this.paymentId, accountId: accountSettings?.id })
+          if (invoice?.statusCode === InvoiceStatus.COMPLETED) {
+            // Skip PAYBC, take directly to the "clients redirect url", this avoids transaction already done error.
+            const isValid = await PaymentService.isValidRedirectUrl(this.redirectUrlFixed)
+            if (!isValid) {
+              throw new Error('Invalid redirect url: ' + this.redirectUrlFixed)
+            }
+            this.goToUrl(this.redirectUrlFixed)
+            return
+          }
+          else if (invoice?.paymentMethod === PaymentTypes.ONLINE_BANKING) {
             // get account data to show in the UI
             const paymentDetails: OrgPaymentDetails = await this.getOrgPayments(accountSettings?.id)
             this.paymentCardData = {
@@ -155,11 +165,6 @@ export default class PaymentView extends Vue {
             // if isOnlineBankingAllowed is true, allowed show CC as only payment type
             this.showPayWithOnlyCC = !invoice?.isOnlineBankingAllowed
           }
-          else if (invoice.statusCode === InvoiceStatus.COMPLETED) {
-            // Skip PAYBC, take directly to the "clients redirect url", this avoids transaction already done error.
-            this.goToUrl(this.redirectUrlFixed)
-            return
-          }
         } catch (error) {
           // eslint-disable-next-line no-console
           console.error('error in accessing the invoice.Defaulting to CC flow')

From 4aa7e8506c3f67a6c0c4035117fc9867034a9f60 Mon Sep 17 00:00:00 2001
From: Travis Semple <travis8814@gmail.com>
Date: Wed, 23 Oct 2024 14:57:01 -0700
Subject: [PATCH 3/5] Small tweaks

---
 auth-web/src/views/pay/PaymentView.vue | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/auth-web/src/views/pay/PaymentView.vue b/auth-web/src/views/pay/PaymentView.vue
index e0d717c10..6e90463f3 100644
--- a/auth-web/src/views/pay/PaymentView.vue
+++ b/auth-web/src/views/pay/PaymentView.vue
@@ -139,16 +139,8 @@ export default class PaymentView extends Vue {
         // get the invoice and check for OB
         try {
           const invoice = await this.getInvoice({ invoiceId: this.paymentId, accountId: accountSettings?.id })
-          if (invoice?.statusCode === InvoiceStatus.COMPLETED) {
-            // Skip PAYBC, take directly to the "clients redirect url", this avoids transaction already done error.
-            const isValid = await PaymentService.isValidRedirectUrl(this.redirectUrlFixed)
-            if (!isValid) {
-              throw new Error('Invalid redirect url: ' + this.redirectUrlFixed)
-            }
-            this.goToUrl(this.redirectUrlFixed)
-            return
-          }
-          else if (invoice?.paymentMethod === PaymentTypes.ONLINE_BANKING) {
+
+          if (invoice?.paymentMethod === PaymentTypes.ONLINE_BANKING) {
             // get account data to show in the UI
             const paymentDetails: OrgPaymentDetails = await this.getOrgPayments(accountSettings?.id)
             this.paymentCardData = {
@@ -175,7 +167,7 @@ export default class PaymentView extends Vue {
         await this.doCreateTransaction()
       }
     } catch (error) {
-      this.doHandleError(error)
+      await this.doHandleError(error)
     }
   }
 
@@ -211,7 +203,7 @@ export default class PaymentView extends Vue {
       await this.updateInvoicePaymentMethodAsCreditCard({ paymentId: this.paymentId, accountId: accountSettings?.id })
       await this.doCreateTransaction()
     } catch (error) {
-      this.doHandleError(error)
+      await this.doHandleError(error)
     }
   }
 
@@ -248,11 +240,15 @@ export default class PaymentView extends Vue {
     this.goToUrl(this.returnUrl)
   }
 
-  private doHandleError (error) {
+  async doHandleError (error) {
     this.showLoading = false
     this.errorMessage = this.$t('payFailedMessage').toString()
-    if (error.response.data && error.response.data.type === 'INVALID_TRANSACTION') {
-      // Transaction is already completed. Show as a modal.
+    if (error.response.data && ['COMPLETED_PAYMENT', 'INVALID_TRANSACTION'].includes(error.response.data.type)) {
+      // Skip PAYBC, take directly to the "clients redirect url", this avoids transaction already done error.
+      const isValid = await PaymentService.isValidRedirectUrl(this.redirectUrlFixed)
+      if (!isValid) {
+        throw new Error('Invalid redirect url: ' + this.redirectUrlFixed)
+      }
       this.goToUrl(this.redirectUrlFixed)
     } else {
       this.showErrorModal = true

From a5c045c88b56dc0b7f3ffad9fac74e62335a01c3 Mon Sep 17 00:00:00 2001
From: Travis Semple <travis8814@gmail.com>
Date: Wed, 23 Oct 2024 15:00:35 -0700
Subject: [PATCH 4/5] Invoice status removal

---
 auth-web/src/views/pay/PaymentView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth-web/src/views/pay/PaymentView.vue b/auth-web/src/views/pay/PaymentView.vue
index 6e90463f3..c96265a82 100644
--- a/auth-web/src/views/pay/PaymentView.vue
+++ b/auth-web/src/views/pay/PaymentView.vue
@@ -81,7 +81,7 @@
 <script lang="ts">
 
 import { Component, Prop, Vue } from 'vue-property-decorator'
-import { InvoiceStatus, PaymentTypes, SessionStorageKeys } from '@/util/constants'
+import { PaymentTypes, SessionStorageKeys } from '@/util/constants'
 import { AccountSettings } from '@/models/account-settings'
 import CommonUtils from '@/util/common-util'
 import ConfigHelper from '@/util/config-helper'

From d79d1dbab96ec5bfb846abb93f7508d0cb3c3b86 Mon Sep 17 00:00:00 2001
From: Travis Semple <travis8814@gmail.com>
Date: Wed, 23 Oct 2024 15:04:06 -0700
Subject: [PATCH 5/5] oh lint oh lint oh lint waste of time

---
 auth-web/src/views/pay/PaymentView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth-web/src/views/pay/PaymentView.vue b/auth-web/src/views/pay/PaymentView.vue
index c96265a82..14e073a5f 100644
--- a/auth-web/src/views/pay/PaymentView.vue
+++ b/auth-web/src/views/pay/PaymentView.vue
@@ -88,10 +88,10 @@ import ConfigHelper from '@/util/config-helper'
 import { Invoice } from '@/models/invoice'
 import { OrgPaymentDetails } from '@/models/Organization'
 import PaymentCard from '@/components/pay/PaymentCard.vue'
+import PaymentService from '@/services/payment.services'
 import SbcSystemError from 'sbc-common-components/src/components/SbcSystemError.vue'
 import { mapActions } from 'pinia'
 import { useOrgStore } from '@/stores/org'
-import PaymentService from '@/services/payment.services'
 
 @Component({
   components: {