@dsivd/prestations-ng 18.3.8 → 18.3.10

package/CHANGELOG.md

@@ -5,6 +5,20 @@
 - **You can follow how these changes are used in a real project. See: [Skeleton repo](https://portail.etat-de-vaud.ch/outils/git/projects/CYBSDK/repos/skeleton/browse)**
 
 ---
+## [18.3.9]
+
+### Fixed
+
+- [foehn-header.component.ts](projects/prestations-ng/src/foehn-header/foehn-header.component.ts)
+    - Do not display preferences in the menu if they are not ready
+
+## [18.3.10]
+
+### Fixed
+
+- [IamExpiredInterceptorService](projects/prestations-ng/src/sdk-redirect/iam-expired-interceptor.service.ts)
+- [gesdem-error-handler.service.ts](projects/prestations-ng/src/gesdem/gesdem-error-handler.service.ts)
+    - fix action recovery not showing OTP for since v18.3.5
 
 ## [18.3.8]
 

package/fesm2022/dsivd-prestations-ng.mjs

@@ -1964,9 +1964,11 @@ class IamExpiredInterceptorService {
             const errorUrl = err.url ?? '';
             const isUrlAcvLogin = this.iamAcvRedirectLocationRegex.test(errorUrl);
             const isUrlAcvOidcLogin = this.iamAcvOidcRedirectLocationRegex.test(errorUrl);
-            if (err.status === HttpStatusCode.Unauthorized ||
-                isUrlAcvLogin ||
-                isUrlAcvOidcLogin) {
+            const isIamSessionExpired = err.status === HttpStatusCode.Unauthorized &&
+                // ensure this is not a session token error to let GesdemErrorHandlerService do its job
+                (!err.error?.message ||
+                    err.error?.message !== 'Session expired');
+            if (isIamSessionExpired || isUrlAcvLogin || isUrlAcvOidcLogin) {
                 this.setIamSessionExpiredManually();
             }
         }
@@ -2007,10 +2009,10 @@ class GesdemErrorHandlerService {
         if (isPdfGenerationError) {
             return this.onPdfGenerationError(response.error.message);
         }
-        const isSessionExpired = response.status === 401 &&
+        const isSessionTokenExpired = response.status === 401 &&
             response.error &&
-            response.error.code === 'Unauthorized';
-        const errorCode = isSessionExpired
+            response.error.message === 'Session expired';
+        const errorCode = isSessionTokenExpired
             ? SESSION_EXPIRED
             : response.error
                 ? response.error.code
@@ -7044,41 +7046,43 @@ class FoehnHeaderComponent {
                 }
             ]
         });
-        menu.push({
-            items: [
-                {
-                    title: this.dictionaryService.getKeySync('espace-securise.menu.item.preferences.title'),
-                    label: this.dictionaryService.getKeySync('espace-securise.menu.item.preferences.label'),
-                    href: '/100002/preferences'
-                },
-                {
-                    title: this.dictionaryService.getKeySync('espace-securise.menu.item.gestion-compte.title'),
-                    label: this.dictionaryService.getKeySync('espace-securise.menu.item.gestion-compte.label'),
-                    href: '/100013/'
-                }
-            ]
-        });
-        if (this.userInfo.type !== this.AVS) {
+        if (!!info.preferences) {
             menu.push({
                 items: [
                     {
-                        title: this.dictionaryService.getKeySync('espace-securise.menu.item.administrer-espace-pro.title'),
-                        label: this.dictionaryService.getKeySync('espace-securise.menu.item.administrer-espace-pro.label'),
-                        href: '/100002/administrer-espace-pro'
-                    }
-                ]
-            });
-        }
-        if (this.userInfo.type === this.AVS) {
-            menu.push({
-                items: [
+                        title: this.dictionaryService.getKeySync('espace-securise.menu.item.preferences.title'),
+                        label: this.dictionaryService.getKeySync('espace-securise.menu.item.preferences.label'),
+                        href: '/100002/preferences'
+                    },
                     {
-                        title: this.dictionaryService.getKeySync('espace-securise.menu.item.operations-liees-espace-pro.title'),
-                        label: this.dictionaryService.getKeySync('espace-securise.menu.item.operations-liees-espace-pro.label'),
-                        href: '/100002/espaces-professionnels'
+                        title: this.dictionaryService.getKeySync('espace-securise.menu.item.gestion-compte.title'),
+                        label: this.dictionaryService.getKeySync('espace-securise.menu.item.gestion-compte.label'),
+                        href: '/100013/'
                     }
                 ]
             });
+            if (this.userInfo.type !== this.AVS) {
+                menu.push({
+                    items: [
+                        {
+                            title: this.dictionaryService.getKeySync('espace-securise.menu.item.administrer-espace-pro.title'),
+                            label: this.dictionaryService.getKeySync('espace-securise.menu.item.administrer-espace-pro.label'),
+                            href: '/100002/administrer-espace-pro'
+                        }
+                    ]
+                });
+            }
+            if (this.userInfo.type === this.AVS) {
+                menu.push({
+                    items: [
+                        {
+                            title: this.dictionaryService.getKeySync('espace-securise.menu.item.operations-liees-espace-pro.title'),
+                            label: this.dictionaryService.getKeySync('espace-securise.menu.item.operations-liees-espace-pro.label'),
+                            href: '/100002/espaces-professionnels'
+                        }
+                    ]
+                });
+            }
         }
         menu.push({
             items: [