Merge branch 'master' into IOPAE-1118-services-by-institution-id

pagopa · May 6, 2024 · 27f2200 · 27f2200
2 parents eefc23b + 80403a4
commit 27f2200
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/assets/bonus_available/bonus_available_v2.json b/assets/bonus_available/bonus_available_v2.json
@@ -35,10 +35,10 @@
     "visibility": "visible",
     "valid_from": "2020-07-01T00:00:00.000Z",
     "valid_to": "2020-12-31T00:00:00.000Z",
-    "cover": "https://assets.cdn.io.italia.it/bonus/cgn/logo/logo-cgn.png",
+    "cover": "https://assets.cdn.io.pagopa.it/bonus/cgn/logo/logo-cgn.png",
     "hero_image": "https://github.com/pagopa/io-services-metadata/blob/d579d53c2a6e1a1defcc393df657e7cfcb70b969/bonus/cgn/cover/hero-CGN.png?raw=true",
     "sponsorship_description": "PCM - Dipartimento per le Politiche Giovanili e il Servizio Civile Universale",
-    "sponsorship_cover": "https://assets.cdn.io.italia.it/bonus/cgn/logo/logo-cgn.png"
+    "sponsorship_cover": "https://assets.cdn.io.pagopa.it/bonus/cgn/logo/logo-cgn.png"
   },
   {
     "id_type": 4,
@@ -62,8 +62,8 @@
     "visibility": "hidden",
     "valid_from": "2022-07-01T00:00:00.000Z",
     "valid_to": "2022-12-31T00:00:00.000Z",
-    "cover": "https://assets.cdn.io.italia.it/bonus/cdc/logo/logo-cdc.png",
+    "cover": "https://assets.cdn.io.pagopa.it/bonus/cdc/logo/logo-cdc.png",
     "sponsorship_description": "Ministero della Cultura",
-    "sponsorship_cover": "https://assets.cdn.io.italia.it/bonus/cdc/logo/logo-cdc.png"
+    "sponsorship_cover": "https://assets.cdn.io.pagopa.it/bonus/cdc/logo/logo-cdc.png"
   }
 ]
diff --git a/assets/spid/idps/spid-idp-etnaid.png b/assets/spid/idps/spid-idp-etnaid.png
diff --git a/assets/spid/idps/spid-idp-infocamereid.png b/assets/spid/idps/spid-idp-infocamereid.png
diff --git a/assets/spid/idps/spid-idp-intesigroupspid.png b/assets/spid/idps/spid-idp-intesigroupspid.png
diff --git a/assets/spid/idps/spid-idp-teamsystemid.png b/assets/spid/idps/spid-idp-teamsystemid.png
diff --git a/src/payloads/backend.ts b/src/payloads/backend.ts
@@ -9,7 +9,7 @@ export const backendInfo = {
   version: "2.1.2"
 };
 
-// ref https://assets.cdn.io.italia.it/status/backend.json
+// ref https://assets.cdn.io.pagopa.it/status/backend.json
 export const backendStatus: BackendStatus = {
   is_alive: true,
   message: {
@@ -56,7 +56,7 @@ export const backendStatus: BackendStatus = {
           "en-EN":
             "Make a donation to humanitarian organizations that assist the civilians affected by the crisis in Ukraine"
         },
-        url: "https://assets.cdn.io.italia.it/html/donate.html"
+        url: "https://assets.cdn.io.pagopa.it/html/donate.html"
       }
     },
     premiumMessages: {

diff --git a/src/payloads/wallet.ts b/src/payloads/wallet.ts
@@ -64,8 +64,8 @@ const validPsp2: Psp = {
   paymentType: "CP",
   idIntermediary: "idIntermediario1",
   idChannel: "idCanale14",
-  logoPSP: "https://assets.cdn.io.italia.it/logos/abi/03015.png",
-  serviceLogo: "https://assets.cdn.io.italia.it/logos/abi/03015.png",
+  logoPSP: "https://assets.cdn.io.pagopa.it/logos/abi/03015.png",
+  serviceLogo: "https://assets.cdn.io.pagopa.it/logos/abi/03015.png",
   serviceName: "nomeServizio 10 red",
   fixedCost: {
     currency: "EUR",
@@ -89,8 +89,8 @@ const validPsp3: Psp = {
   paymentType: "CP",
   idIntermediary: "idIntermediario1",
   idChannel: "idCanale14",
-  logoPSP: "https://assets.cdn.io.italia.it/logos/abi/01030.png",
-  serviceLogo: "https://assets.cdn.io.italia.it/logos/abi/01030.png",
+  logoPSP: "https://assets.cdn.io.pagopa.it/logos/abi/01030.png",
+  serviceLogo: "https://assets.cdn.io.pagopa.it/logos/abi/01030.png",
   serviceName: "nomeServizio 10 Blu",
   fixedCost: {
     currency: "EUR",

diff --git a/src/routers/services_metadata.ts b/src/routers/services_metadata.ts
@@ -211,10 +211,14 @@ addHandler(
         },
         idps => {
           // set the logo url as server local resource
-          const idpsWithLogo = idps.items.map(idp => ({
-            ...idp,
-            logo: `${serverUrl}${staticContentRootPath}/logos/spid/idps/spid-idp-${idp.id}.png`
-          }));
+          const idpsWithLogo = idps.items.map(idp => {
+            const urlSegments = idp.logo.split("/");
+            const logoImageName = urlSegments[urlSegments.length - 1];
+            return {
+              ...idp,
+              logo: `${serverUrl}${staticContentRootPath}/logos/spid/idps/${logoImageName}`
+            };
+          });
           res.json({ ...idps, items: idpsWithLogo });
         }
       )