@open-rlb/ng-app 3.0.2 → 3.0.4

package/fesm2022/open-rlb-ng-app.mjs

@@ -304,6 +304,7 @@ class AuthFeatureService {
         this.store = store;
     }
     login() {
+        console.log("AuthFeatureService, dispatch login call");
         this.store.dispatch(AuthActions.login());
     }
     logout() {
@@ -1275,14 +1276,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
         }] });
 
 class AuthenticationService {
-    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, envConfig, authConfig) {
+    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, log, envConfig, authConfig) {
         this.oidcSecurityService = oidcSecurityService;
         this.cookiesService = cookiesService;
         this.router = router;
         this.parseJwtService = parseJwtService;
         this.store = store;
+        this.log = log;
         this.envConfig = envConfig;
         this.authConfig = authConfig;
+        this.logger = this.log.for(this.constructor.name);
+        this.logger.log('AuthenticationService initialized');
     }
     get oidc() {
         return this.oidcSecurityService;
@@ -1318,6 +1322,7 @@ class AuthenticationService {
     }
     login() {
         this.cookiesService.setCookie('loginRedirectUrl', this.router.url || '/', 1);
+        this.logger.log(`call login method, loginRedirectUrl: ${this.router.url || '/'}`);
         // electron
         if (typeof (process) !== 'undefined' &&
             typeof (process?.version) !== 'undefined' &&
@@ -1373,7 +1378,7 @@ class AuthenticationService {
     matchRoles(roles) {
         return this.accessToken$.pipe(map(token => this.parseJwtService.parseJwt(token)), map(payload => payload['roles']), map(userRoles => roles.some(role => userRoles.includes(role))));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: AppLoggerService }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, decorators: [{
@@ -1381,7 +1386,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: AppLoggerService }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -1807,9 +1812,11 @@ class AppTemplateComponent {
     loginNav(event) {
         event?.preventDefault();
         event?.stopPropagation();
+        console.log("AppTemplateComponent -> loginNav() called, dispatch login call");
         this.store.dispatch(AuthActions.login());
     }
     login() {
+        console.log("AppTemplateComponent -> login() called, dispatch login call");
         this.store.dispatch(AuthActions.login());
     }
     onSideBarItemClick(item) {
@@ -2317,6 +2324,7 @@ const oauthGuard = (route, state) => {
     const authService = inject(AuthenticationService);
     return authService.isAuthenticated$.pipe(take(1), map((isAuthenticated) => {
         if (!isAuthenticated) {
+            console.warn("Attention! Guard navigates to login!!!");
             authService.login();
             return false;
         }
@@ -2328,12 +2336,13 @@ const SESSION_RT = 'RT';
 const SESSION_AT = 'AT';
 const TOKEN_URL = `protocol/openid-connect/token`;
 class OauthPasswordService {
-    //private _user: User | null = null
-    constructor(httpClient, authenticationService) {
+    constructor(httpClient, authenticationService, log) {
         this.httpClient = httpClient;
         this.authenticationService = authenticationService;
+        this.log = log;
         this.timer = null;
         this._onUpdateToken = null;
+        this.logger = this.log.for(this.constructor.name);
         this.initRefreshToken().catch(e => console.error("Error in refresh token", e));
     }
     intercept(req, next) {
@@ -2430,6 +2439,7 @@ class OauthPasswordService {
         body.set('scope', 'addubby-order');
         body.set('username', username);
         body.set('password', password);
+        this.logger.log(`password service call _login()`);
         return await lastValueFrom(this.httpClient.post(`${this.authenticationService.currentProvider.authority}/${TOKEN_URL}`, body.toString(), {
             headers: { 'content-type': 'application/x-www-form-urlencoded' },
         }));
@@ -2475,7 +2485,7 @@ class OauthPasswordService {
             }, r.expires_in * 1000 - 60000);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OauthPasswordService, deps: [{ token: i1$3.HttpClient }, { token: AuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OauthPasswordService, deps: [{ token: i1$3.HttpClient }, { token: AuthenticationService }, { token: AppLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OauthPasswordService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: OauthPasswordService, decorators: [{
@@ -2483,7 +2493,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: AuthenticationService }] });
+        }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: AuthenticationService }, { type: AppLoggerService }] });
 
 const oauthPasswordGuard = (route, state) => {
     const auth = inject(OauthPasswordService);
@@ -2830,28 +2840,31 @@ const appReducer = appFeature.reducer;
 const { selectAppState, selectApps, selectCurrentApp, selectSupportedLanguages } = appFeature;
 
 class AuthEffects {
-    constructor(actions$, auth, authConfig) {
+    constructor(actions$, auth, loggerService, authConfig) {
         this.actions$ = actions$;
         this.auth = auth;
+        this.loggerService = loggerService;
         this.login$ = createEffect(() => {
-            return this.actions$.pipe(ofType(AuthActions.login), tap$1(() => this.auth.login()), map$1(() => AuthActionsInternal.setLoading({ loading: true })));
+            return this.actions$.pipe(ofType(AuthActions.login), tap$1(() => this.logger.log('auth effects going to call login()')), tap$1(() => this.auth.login()), map$1(() => AuthActionsInternal.setLoading({ loading: true })));
         });
         this.logout$ = createEffect(() => {
-            return this.actions$.pipe(ofType(AuthActions.logout), switchMap$1(() => this.auth.logout$()), map$1(() => AuthActionsInternal.reset()));
+            return this.actions$.pipe(ofType(AuthActions.logout), tap$1(() => this.logger.log('auth effects going to call logout$()')), switchMap$1(() => this.auth.logout$()), map$1(() => AuthActionsInternal.reset()));
         });
         this.setCurrentProvider$ = createEffect(() => {
             return this.actions$.pipe(ofType(AuthActions.setCurrentProvider), map$1(({ currentProvider }) => AuthActionsInternal.setCurrentProvider({ currentProvider })));
         });
+        this.logger = this.loggerService.for(this.constructor.name);
+        this.logger.log('Initialized AuthEffects');
         if (authConfig) {
             auth.checkAuthMultiple().subscribe();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects, deps: [{ token: i1$8.Actions }, { token: AuthenticationService }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects, deps: [{ token: i1$8.Actions }, { token: AuthenticationService }, { token: AppLoggerService }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects, decorators: [{
             type: Injectable
-        }], ctorParameters: () => [{ type: i1$8.Actions }, { type: AuthenticationService }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1$8.Actions }, { type: AuthenticationService }, { type: AppLoggerService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [RLB_CFG_AUTH]
                 }, {