Merge remote-tracking branch 'origin/develop' into feat/pn-4727

pagopa · May 17, 2024 · 6f72fd0 · 6f72fd0
2 parents f7b5b89 + 186bd48
commit 6f72fd0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/pn-personafisica-login/src/pages/login/SpidSelect.tsx b/packages/pn-personafisica-login/src/pages/login/SpidSelect.tsx
@@ -29,10 +29,6 @@ const SpidSelect = ({ onBack }: { onBack: () => void }) => {
       SPID_IDP_ID: IDP.entityId,
     });
 
-    PFLoginEventStrategyFactory.triggerEvent(PFLoginEventsType.SEND_LOGIN_METHOD, {
-      entityID: IDP.entityId,
-    });
-
     window.location.assign(
       `${URL_API_LOGIN}/login?entityID=${IDP.entityId}&authLevel=SpidL2&RelayState=send`
     );

diff --git a/packages/pn-personafisica-login/src/pages/success/Success.tsx b/packages/pn-personafisica-login/src/pages/success/Success.tsx
@@ -2,7 +2,9 @@ import { useCallback, useEffect, useMemo } from 'react';
 
 import { AppRouteParams, sanitizeString } from '@pagopa-pn/pn-commons';
 
+import { PFLoginEventsType } from '../../models/PFLoginEventsType';
 import { getConfiguration } from '../../services/configuration.service';
+import PFLoginEventStrategyFactory from '../../utility/MixpanelUtils/PFLoginEventStrategyFactory';
 import { storageAarOps } from '../../utility/storage';
 
 const SuccessPage = () => {
@@ -26,12 +28,18 @@ const SuccessPage = () => {
     if (redirectUrl && [PF_URL].findIndex((url) => url && redirectUrl.startsWith(url)) > -1) {
       window.location.replace(`${redirectUrl}${sanitizeString(token)}`);
     }
-
-    sessionStorage.removeItem('IDP');
   }, [aar, token]);
 
   useEffect(() => {
     calcRedirectUrl();
+
+    const IDP = sessionStorage.getItem('IDP');
+
+    PFLoginEventStrategyFactory.triggerEvent(PFLoginEventsType.SEND_LOGIN_METHOD, {
+      entityID: IDP,
+    });
+
+    sessionStorage.removeItem('IDP');
   }, []);
 
   return null;

diff --git a/packages/pn-personafisica-webapp/src/App.tsx b/packages/pn-personafisica-webapp/src/App.tsx
@@ -250,7 +250,7 @@ const App = () => {
 
     PFEventStrategyFactory.triggerEvent(PFEventsType.SEND_TOAST_ERROR, {
       reason: error.code,
-      traceid: traceId,
+      traceId,
       page_name: getCurrentEventTypePage(pathname),
       message: error.message,
       httpStatusCode: status,