Merge branch 'master' into IOCOM-1886_fimsHistorySpec

pagopa · Nov 13, 2024 · 7d708ee · 7d708ee
2 parents 87f53bb + 75aa572
commit 7d708ee
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 8 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,3 +1,3 @@
 # see https://help.github.com/en/articles/about-code-owners#example-of-a-codeowners-file
 
-* @pagopa/io-app
+* @pagopa/io-app @ChrisMattew @gispada @freddi301
diff --git a/assets/html/login.html b/assets/html/login.html
@@ -62,7 +62,8 @@
             ["29", "29 - Identità non erogata"],
             ["1001", "1001 - Cittadino minore di 14 anni"],
             ["1002", "1002 - Utente con identità bloccata da ioapp.it"],
-            ["CIEID_OPERATION_CANCEL", "CIEID_OPERATION_CANCEL"]
+            ["CIEID_OPERATION_CANCEL", "CIEID_OPERATION_CANCEL - Operazione annullata"],
+            ["errorMessage:Missing SAMLResponse in ACS", "SAML_RESPONSE_ERROR_MESSAGE - Missing SAMLResponse in ACS"],
         ];
 
         const simulateSpidError = () => {

diff --git a/assets/wallet/wallet_payment.html b/assets/wallet/wallet_payment.html
@@ -23,6 +23,9 @@
             ["17", "WAITING_CONFIRMATION_EMAIL"],
             ["18", "PAYMENT_REVERSED"],
             ["19", "PAYPAL_REMOVED_ERROR"],
+            ["116", "INSUFFICIENT_AVAILABILITY_ERROR"],
+            ["117", "CVV_ERROR"],
+            ["121", "PLAFOND_LIMIT_ERROR"]
         ];
 
         const simulateOutcome = () => {

diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
   "io_session_manager_api": "https://raw.githubusercontent.com/pagopa/io-auth-n-identity-domain/[email protected]/apps/io-session-manager/api/internal.yaml",
   "io_session_manager_public_api": "https://raw.githubusercontent.com/pagopa/io-auth-n-identity-domain/[email protected]/apps/io-session-manager/api/public.yaml",
   "api_public_specs": "https://raw.githubusercontent.com/pagopa/io-backend/v14.3.0-RELEASE/api_public.yaml",
-  "api_cgn": "https://raw.githubusercontent.com/pagopa/io-backend/v14.3.0-RELEASE/api_cgn.yaml",
-  "api_cgn_merchants": "https://raw.githubusercontent.com/pagopa/io-backend/v14.3.0-RELEASE/api_cgn_operator_search.yaml",
+  "api_cgn": "https://raw.githubusercontent.com/pagopa/io-backend/v16.2.0-RELEASE/api_cgn.yaml",
+  "api_cgn_merchants": "https://raw.githubusercontent.com/pagopa/io-backend/v16.2.0-RELEASE/api_cgn_operator_search.yaml",
   "api_cgn_geo": "https://raw.githubusercontent.com/pagopa/io-backend/here_geoapi_integration/api_geo.yaml",
   "content_specs": "https://raw.githubusercontent.com/pagopa/io-services-metadata/1.0.45/definitions.yml",
   "api_pagopa_walletv2": "https://raw.githubusercontent.com/pagopa/io-services-metadata/1.0.44/bonus/specs/bpd/pm/walletv2.json",

diff --git a/src/payloads/login.ts b/src/payloads/login.ts
@@ -1,6 +1,7 @@
 export const loginLolliPopRedirect: string = "/idp-login";
 export const redirectUrl: string = "/profile.html?token=";
-export const errorRedirectUrl: string = "/error.html?errorCode=";
+export const errorCodeRedirectUrl: string = "/error.html?errorCode=";
+export const errorMessageRedirectUrl: string = "/error.html?errorMessage=";
 
 export enum AppUrlLoginScheme {
   native = "iologin",

diff --git a/src/routers/features/cgn/merchants.ts b/src/routers/features/cgn/merchants.ts
@@ -22,6 +22,7 @@ import { addHandler } from "../../../payloads/response";
 import { sendFileFromRootPath } from "../../../utils/file";
 import { addApiV1Prefix } from "../../../utils/strings";
 import { publicRouter } from "../../public";
+import { SearchRequest } from "../../../../generated/definitions/cgn/merchants/SearchRequest";
 
 export const cgnMerchantsRouter = Router();
 
@@ -74,6 +75,39 @@ addHandler(
   }
 );
 
+addHandler(cgnMerchantsRouter, "get", addPrefix("/count"), (req, res) => {
+  if (SearchRequest.is(req.body)) {
+    return res.status(200).json({
+      count: merchantsAll.length
+    });
+  }
+  return res.status(500);
+});
+
+addHandler(cgnMerchantsRouter, "post", addPrefix("/search"), (req, res) => {
+  if (SearchRequest.is(req.body)) {
+    return res.status(200).json({
+      items: merchantsAll
+        .filter(
+          merchant =>
+            merchant.name
+              .toLowerCase()
+              .includes(req.body.token.toLowerCase()) ||
+            merchant.description
+              ?.toLowerCase()
+              .includes(req.body.token.toLowerCase())
+        )
+        .map(merchant => ({
+          id: merchant.id,
+          name: merchant.name,
+          description: merchant.description,
+          newDiscounts: faker.datatype.boolean()
+        }))
+    });
+  }
+  return res.status(500);
+});
+
 addHandler(
   cgnMerchantsRouter,
   "post",

diff --git a/src/routers/public.ts b/src/routers/public.ts
@@ -13,7 +13,8 @@ import { WALLET_PAYMENT_PATH } from "../features/payments/utils/payment";
 import { backendInfo } from "../payloads/backend";
 import {
   AppUrlLoginScheme,
-  errorRedirectUrl,
+  errorCodeRedirectUrl,
+  errorMessageRedirectUrl,
   loginLolliPopRedirect,
   redirectUrl
 } from "../payloads/login";
@@ -94,8 +95,19 @@ addHandler(publicRouter, "get", "/idp-login", (req, res) => {
     res.redirect(url);
     return;
   }
-  if (req.query.error) {
-    const url = `${urlLoginScheme}://${req.headers.host}${errorRedirectUrl}${req.query.error}`;
+  if (req.query.error && typeof req.query.error === "string") {
+    // eslint-disable-next-line functional/no-let
+    let redirectUrl;
+    // eslint-disable-next-line functional/no-let
+    let errorCodeOrMessage;
+    if (req.query.error.includes("errorMessage:")) {
+      redirectUrl = errorMessageRedirectUrl;
+      errorCodeOrMessage = req.query.error.split(":")[1];
+    } else {
+      redirectUrl = errorCodeRedirectUrl;
+      errorCodeOrMessage = req.query.error;
+    }
+    const url = `${urlLoginScheme}://${req.headers.host}${redirectUrl}${errorCodeOrMessage}`;
     res.redirect(url);
     return;
   }