@softheon/armature 21.1.0-alpha → 21.1.0

package/fesm2022/softheon-armature.mjs

@@ -6658,13 +6658,14 @@ class MarketSelectionService {
      * @param translateService translate service
      * @param userEntityService user entity service
      */
-    constructor(cookieService, router, config, selectedMarketContext, translateService, oAuthService) {
+    constructor(cookieService, router, config, selectedMarketContext, translateService, oAuthService, authorizationService) {
         this.cookieService = cookieService;
         this.router = router;
         this.config = config;
         this.selectedMarketContext = selectedMarketContext;
         this.translateService = translateService;
         this.oAuthService = oAuthService;
+        this.authorizationService = authorizationService;
         /** The MFE Queue Lookup Constant Key for Cookie Storage */
         this.MFE_QUEUE_LOOKUP = 'mfe.graphql-domain';
         /** The cookie key for local environment selection */
@@ -6697,9 +6698,12 @@ class MarketSelectionService {
         this.markets = [];
         this.selectedMarket$ = this.selectedMarketContext.selectedMarket$;
         this.ephemeralMarket$ = this.selectedMarketContext.ephemeralMarket$;
-        this.oAuthService.loadUserProfile().then((user) => {
-            this.userEmail = user?.info?.email;
-            this.evaluateLocalEnvSelectionEnabled();
+        this.authorizationService.isLoggedIn$.subscribe((isLoggedIn) => {
+            if (isLoggedIn) {
+                const claims = this.oAuthService.getIdentityClaims();
+                this.userEmail = claims?.upn || claims?.preferred_username || '';
+                this.evaluateLocalEnvSelectionEnabled();
+            }
         });
         this.router.events.subscribe((event) => {
             if (event instanceof NavigationEnd) {
@@ -6968,7 +6972,7 @@ class MarketSelectionService {
             return undefined;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: MarketSelectionService, deps: [{ token: i1$a.CookieService }, { token: i1$4.Router }, { token: BaseConfigService }, { token: SelectedMarketContext }, { token: i2$1.TranslateService }, { token: i1$2.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: MarketSelectionService, deps: [{ token: i1$a.CookieService }, { token: i1$4.Router }, { token: BaseConfigService }, { token: SelectedMarketContext }, { token: i2$1.TranslateService }, { token: i1$2.OAuthService }, { token: AuthorizationService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: MarketSelectionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: MarketSelectionService, decorators: [{
@@ -6976,7 +6980,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$a.CookieService }, { type: i1$4.Router }, { type: BaseConfigService }, { type: SelectedMarketContext }, { type: i2$1.TranslateService }, { type: i1$2.OAuthService }] });
+        }], ctorParameters: () => [{ type: i1$a.CookieService }, { type: i1$4.Router }, { type: BaseConfigService }, { type: SelectedMarketContext }, { type: i2$1.TranslateService }, { type: i1$2.OAuthService }, { type: AuthorizationService }] });
 
 /* Market Selection Config */
 class MarketSelectionConfig {