fix: handle ecommerce-fe redirection

pagopa · May 22, 2024 · e724c15 · e724c15
1 parent e0511c2
commit e724c15
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/routes/PaymentCheckPage.tsx b/src/routes/PaymentCheckPage.tsx
@@ -54,6 +54,7 @@ import { Bundle } from "../../generated/definitions/payment-ecommerce/Bundle";
 import { CalculateFeeResponse } from "../../generated/definitions/payment-ecommerce/CalculateFeeResponse";
 import { SessionPaymentMethodResponse } from "../../generated/definitions/payment-ecommerce/SessionPaymentMethodResponse";
 import { ImageComponent } from "../features/payment/components/PaymentChoice/PaymentMethodImage";
+import { isEcommerceFrontendRedirection } from "../utils/regex/urlUtilities";
 import { CheckoutRoutes } from "./models/routeModel";
 
 const defaultStyle = {
@@ -154,7 +155,10 @@ export default function PaymentCheckPage() {
     try {
       window.removeEventListener("beforeunload", onBrowserUnload);
       const url = new URL(authorizationUrl);
-      if (url.origin === window.location.origin) {
+      if (
+        url.origin === window.location.origin &&
+        !isEcommerceFrontendRedirection(url)
+      ) {
         navigate(`${url.pathname}${url.hash}`);
         setPayLoading(false);
       } else {

diff --git a/src/utils/__tests__/urlUtili.test.ts b/src/utils/__tests__/urlUtili.test.ts
@@ -1,5 +1,8 @@
 import { ROUTE_FRAGMENT } from "../../routes/models/routeModel";
-import { getFragmentParameter } from "../../utils/regex/urlUtilities";
+import {
+  getFragmentParameter,
+  isEcommerceFrontendRedirection,
+} from "../../utils/regex/urlUtilities";
 
 describe("getFragmentParameter function utility", () => {
   it("Should return the param value correctly", () => {
@@ -31,4 +34,18 @@ describe("getFragmentParameter function utility", () => {
       ""
     );
   });
+
+  it("Should return true if the URL require ecommerce-fe redirection", () => {
+    expect(
+      isEcommerceFrontendRedirection(
+        new URL("http://localhost:1234/ecommerce-fe/gdi-check#iframe=0")
+      )
+    ).toEqual(true);
+
+    expect(
+      isEcommerceFrontendRedirection(
+        new URL("http://localhost:1234/v2/esito#outcome=0")
+      )
+    ).toEqual(false);
+  });
 });
diff --git a/src/utils/regex/urlUtilities.ts b/src/utils/regex/urlUtilities.ts
@@ -35,3 +35,7 @@ export function getFragmentParameter(
     return "";
   }
 }
+
+const eCommerceFrontendPathNameRegex = /^\/ecommerce-fe/;
+export const isEcommerceFrontendRedirection = (url: URL) =>
+  eCommerceFrontendPathNameRegex.test(url.pathname);