adb-shared 6.0.28 → 6.0.31

package/fesm2022/adb-shared.mjs

@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import * as i1 from '@angular/common/http';
 import { provideHttpClient, withInterceptorsFromDi, HttpHeaders, HTTP_INTERCEPTORS } from '@angular/common/http';
 import * as i1$1 from '@angular/router';
-import { NavigationEnd, RouterModule, NavigationStart } from '@angular/router';
+import { NavigationEnd, RouterModule } from '@angular/router';
 import { Subscription, Subject, of, BehaviorSubject, catchError, throwError } from 'rxjs';
 import { startOfDay, subYears, endOfDay, addYears, getMonth, subMonths, addMonths, isSameYear, startOfMonth, endOfMonth, eachWeekOfInterval, getISOWeek, addDays, eachDayOfInterval, getHours, getMinutes, isSameDay, isSameMonth, isWithinInterval, isValid, parseISO, addSeconds, format } from 'date-fns';
 import * as i2$1 from '@angular/forms';
@@ -2020,15 +2020,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImpor
                 }]
         }] });
 
-class SessionIds {
-    static { this.CURRENT_URL = "current_url"; }
-    static { this.CODE_VERIFIER = 'nonce'; }
-    static { this.REFRESH_TOKEN = 'refresh-token'; }
-    static { this.TOKEN_EXPIRES = 'token_expires'; }
-    static { this.ACCESS_TOKEN = 'access-token'; }
-    static { this.USER_LAST_ACTIVE = 'lastActive'; }
-}
-
 const ADB_USER_SERVICE_CONFIG = new InjectionToken('ADB_DATA_SERVICE_CONFIG');
 const DEFAULT_ADB_USER_SERVICE_CONFIG = {
     scope: 'roles profile email',
@@ -2038,6 +2029,16 @@ const DEFAULT_ADB_USER_SERVICE_CONFIG = {
     log: false
 };
 
+class UserModuleConstants {
+    static { this.CURRENT_URL = "current_url"; }
+    static { this.CODE_VERIFIER = 'nonce'; }
+    static { this.REFRESH_TOKEN = 'refresh-token'; }
+    static { this.TOKEN_EXPIRES = 'token_expires'; }
+    static { this.ACCESS_TOKEN = 'access-token'; }
+    static { this.USER_LAST_ACTIVE = 'lastActive'; }
+    static { this.ONGOING_CODEFLOW = 'ongoing-codeflow'; }
+}
+
 class AdbUserService {
     constructor(config, http, router) {
         this.config = config;
@@ -2051,22 +2052,11 @@ class AdbUserService {
         this.config = { ...{ scope: 'roles', idleTime: 30, response_type: 'code' }, ...config };
     }
     init() {
-        this.router.events.subscribe((event) => {
-            if (event instanceof NavigationStart) {
-                this.log('init with url', event.url);
-                if (event.url.includes('auth-callback')) {
-                    return;
-                }
-                if (event.url && event.url !== '/') {
-                    sessionStorage.setItem(SessionIds.CURRENT_URL, event.url);
-                }
-                this.checkStatus();
-            }
-        });
-        const accessToken = sessionStorage.getItem(SessionIds.ACCESS_TOKEN);
+        const accessToken = sessionStorage.getItem(UserModuleConstants.ACCESS_TOKEN);
         if (accessToken) {
             const user = this.getUser(accessToken);
             this.userSubject.next(user);
+            this.startMainLoop();
         }
     }
     startMainLoop() {
@@ -2074,9 +2064,9 @@ class AdbUserService {
         this.intervalId = setInterval(() => this.checkStatus(), 60 * 1000); // 60 seconds * 1000 milliseconds
     }
     login() {
-        this.log('login at url', this.router.url);
-        sessionStorage.setItem(SessionIds.CURRENT_URL, this.router.url);
-        this.checkStatus();
+        this.log('url when login', this.router.url);
+        sessionStorage.setItem(UserModuleConstants.CURRENT_URL, this.router.url);
+        this.authorize();
     }
     logout() {
         clearInterval(this.intervalId);
@@ -2086,12 +2076,13 @@ class AdbUserService {
     }
     checkStatus() {
         this.log('checkStatus runs');
-        const accessToken = sessionStorage.getItem(SessionIds.ACCESS_TOKEN);
+        const accessToken = sessionStorage.getItem(UserModuleConstants.ACCESS_TOKEN);
         if (accessToken) {
             this.log('has accesstoken');
             const timeToLive = this.getTokenTimeToLive();
             this.log('timeToLive', timeToLive);
             if (timeToLive === 0) {
+                sessionStorage.removeItem(UserModuleConstants.ACCESS_TOKEN);
                 this.authorize();
             }
             else {
@@ -2107,14 +2098,11 @@ class AdbUserService {
                 }
             }
         }
-        else {
-            this.authorize();
-        }
     }
     refreshToken() {
         const body = `client_id=${encodeURIComponent(this.config.clientId)}&` +
             `grant_type=${encodeURIComponent("refresh_token")}&` +
-            `refresh_token=${encodeURIComponent(sessionStorage.getItem(SessionIds.REFRESH_TOKEN))}`;
+            `refresh_token=${encodeURIComponent(sessionStorage.getItem(UserModuleConstants.REFRESH_TOKEN))}`;
         this.http.post(`${this.config.issuer}/connect/token`, body, { headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }) }).subscribe({
             next: response => {
                 this.setTokensInSession(response);
@@ -2124,19 +2112,19 @@ class AdbUserService {
     }
     setTokensInSession(params) {
         if (params.refresh_token) {
-            sessionStorage.setItem(SessionIds.REFRESH_TOKEN, params.refresh_token);
+            sessionStorage.setItem(UserModuleConstants.REFRESH_TOKEN, params.refresh_token);
         }
         if (params.access_token) {
-            sessionStorage.setItem(SessionIds.ACCESS_TOKEN, params.access_token);
+            sessionStorage.setItem(UserModuleConstants.ACCESS_TOKEN, params.access_token);
         }
         if (params.expires_in) {
             const expireTime = addSeconds(new Date(), params.expires_in);
-            sessionStorage.setItem(SessionIds.TOKEN_EXPIRES, format(expireTime, 'yyyy-MM-dd HH:mm:ss'));
+            sessionStorage.setItem(UserModuleConstants.TOKEN_EXPIRES, format(expireTime, 'yyyy-MM-dd HH:mm:ss'));
         }
     }
     async authorize() {
         const codeVerifier = Array.from(crypto.getRandomValues(new Uint8Array(64)), byte => 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'[byte % 62]).join('');
-        sessionStorage.setItem(SessionIds.CODE_VERIFIER, codeVerifier);
+        sessionStorage.setItem(UserModuleConstants.CODE_VERIFIER, codeVerifier);
         const encoder = new TextEncoder();
         const data = encoder.encode(codeVerifier);
         const hashBuffer = await crypto.subtle.digest('SHA-256', data);
@@ -2168,7 +2156,7 @@ class AdbUserService {
         return urlParams;
     }
     getTokenTimeToLive() {
-        const expires = sessionStorage.getItem(SessionIds.TOKEN_EXPIRES);
+        const expires = sessionStorage.getItem(UserModuleConstants.TOKEN_EXPIRES);
         if (expires) {
             const expireDate = new Date(expires);
             const now = new Date();
@@ -2186,7 +2174,7 @@ class AdbUserService {
         return false;
     }
     hasUserBeenActive() {
-        const lastActive = sessionStorage.getItem(SessionIds.USER_LAST_ACTIVE);
+        const lastActive = sessionStorage.getItem(UserModuleConstants.USER_LAST_ACTIVE);
         if (!lastActive) {
             return false;
         }
@@ -2196,7 +2184,7 @@ class AdbUserService {
     }
     log(message, ...optionalParams) {
         if (this.config?.log) {
-            if (optionalParams) {
+            if (optionalParams?.length > 0) {
                 console.log(message, optionalParams);
             }
             else {
@@ -2230,6 +2218,54 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImpor
                     args: [ADB_USER_SERVICE_CONFIG]
                 }] }, { type: i1.HttpClient }, { type: i1$1.Router }] });
 
+class AuthCallbackComponent {
+    constructor(activatedRoute, router, http, adbUserService) {
+        this.activatedRoute = activatedRoute;
+        this.router = router;
+        this.http = http;
+        this.adbUserService = adbUserService;
+        this.subscriptions = new Subscription();
+    }
+    ngOnInit() {
+        this.subscriptions.add(this.activatedRoute.queryParamMap.subscribe(qParmas => {
+            if (qParmas.has('code')) {
+                const body = `grant_type=authorization_code` +
+                    `&code=${encodeURIComponent(qParmas.get('code'))}` +
+                    `&code_verifier=${encodeURIComponent(sessionStorage.getItem(UserModuleConstants.CODE_VERIFIER))}` +
+                    `&redirect_uri=${encodeURIComponent(this.adbUserService.config.redirectUrl)}` +
+                    `&client_id=${encodeURIComponent(this.adbUserService.config.clientId)}`;
+                this.http.post(`${this.adbUserService.config.issuer}/connect/token`, body, { headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }) }).subscribe({
+                    next: response => {
+                        this.adbUserService.setTokensInSession(response);
+                        let requestedUrl = sessionStorage.getItem(UserModuleConstants.CURRENT_URL) ?? null;
+                        this.adbUserService.log('redirect url in auth-callback', requestedUrl);
+                        if (requestedUrl) {
+                            this.router.navigate([requestedUrl], { replaceUrl: true }).then(() => {
+                                this.adbUserService.startMainLoop();
+                            });
+                            sessionStorage.removeItem(UserModuleConstants.CURRENT_URL);
+                        }
+                        else {
+                            this.router.navigate(['/'], { replaceUrl: true }).then(() => {
+                                this.adbUserService.startMainLoop();
+                            });
+                            ;
+                        }
+                    }
+                });
+            }
+        }));
+    }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: AuthCallbackComponent, deps: [{ token: i1$1.ActivatedRoute }, { token: i1$1.Router }, { token: i1.HttpClient }, { token: AdbUserService }], target: i0.ɵɵFactoryTarget.Component }); }
+    /** @nocollapse */ static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.8", type: AuthCallbackComponent, selector: "ng-component", ngImport: i0, template: '<div class="loading-dead-spinner"></div>', isInline: true }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: AuthCallbackComponent, decorators: [{
+            type: Component,
+            args: [{
+                    template: '<div class="loading-dead-spinner"></div>'
+                }]
+        }], ctorParameters: () => [{ type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: i1.HttpClient }, { type: AdbUserService }] });
+
 class AdbUserInterceptor {
     static { this.UNAUTHENTICATED = 401; }
     constructor(adbUserService) {
@@ -2237,9 +2273,9 @@ class AdbUserInterceptor {
     }
     intercept(req, next) {
         if (req.headers.get('X-System-Request') !== 'true') {
-            sessionStorage.setItem(SessionIds.USER_LAST_ACTIVE, Date.now().toString());
+            sessionStorage.setItem(UserModuleConstants.USER_LAST_ACTIVE, Date.now().toString());
         }
-        const accessToken = sessionStorage.getItem(SessionIds.ACCESS_TOKEN);
+        const accessToken = sessionStorage.getItem(UserModuleConstants.ACCESS_TOKEN);
         if (accessToken) {
             const clonedRequest = req.clone({
                 setHeaders: {
@@ -2259,7 +2295,7 @@ class AdbUserInterceptor {
         }
         else {
             if (error.status === AdbUserInterceptor.UNAUTHENTICATED) {
-                this.adbUserService.init();
+                this.adbUserService.login();
             }
         }
         return throwError(() => error);
@@ -2271,50 +2307,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImpor
             type: Injectable
         }], ctorParameters: () => [{ type: AdbUserService }] });
 
-class AuthCallbackComponent {
-    constructor(activatedRoute, router, http, adbUserService) {
-        this.activatedRoute = activatedRoute;
-        this.router = router;
-        this.http = http;
-        this.adbUserService = adbUserService;
-        this.subscriptions = new Subscription();
-    }
-    ngOnInit() {
-        this.subscriptions.add(this.activatedRoute.queryParamMap.subscribe(qParmas => {
-            if (qParmas.has('code')) {
-                const body = `grant_type=authorization_code` +
-                    `&code=${encodeURIComponent(qParmas.get('code'))}` +
-                    `&code_verifier=${encodeURIComponent(sessionStorage.getItem(SessionIds.CODE_VERIFIER))}` +
-                    `&redirect_uri=${encodeURIComponent(this.adbUserService.config.redirectUrl)}` +
-                    `&client_id=${encodeURIComponent(this.adbUserService.config.clientId)}`;
-                this.http.post(`${this.adbUserService.config.issuer}/connect/token`, body, { headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }) }).subscribe({
-                    next: response => {
-                        this.adbUserService.setTokensInSession(response);
-                        let requestedUrl = sessionStorage.getItem(SessionIds.CURRENT_URL) ?? null;
-                        this.adbUserService.startMainLoop();
-                        console.log('redirect url', requestedUrl);
-                        if (requestedUrl) {
-                            this.router.navigate([requestedUrl], { replaceUrl: true });
-                            sessionStorage.removeItem(SessionIds.CURRENT_URL);
-                        }
-                        else {
-                            this.router.navigate(['/'], { replaceUrl: true });
-                        }
-                    }
-                });
-            }
-        }));
-    }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: AuthCallbackComponent, deps: [{ token: i1$1.ActivatedRoute }, { token: i1$1.Router }, { token: i1.HttpClient }, { token: AdbUserService }], target: i0.ɵɵFactoryTarget.Component }); }
-    /** @nocollapse */ static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.8", type: AuthCallbackComponent, selector: "ng-component", ngImport: i0, template: '<div class="loading-dead-spinner"></div>', isInline: true }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: AuthCallbackComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: '<div class="loading-dead-spinner"></div>'
-                }]
-        }], ctorParameters: () => [{ type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: i1.HttpClient }, { type: AdbUserService }] });
-
 const routes = [
     { path: 'auth-callback', component: AuthCallbackComponent }
 ];
@@ -2325,8 +2317,8 @@ class AdbUserModule {
             providers: [
                 {
                     provide: ADB_USER_SERVICE_CONFIG,
-                    useValue: { ...DEFAULT_ADB_USER_SERVICE_CONFIG, ...config },
-                },
+                    useValue: { ...DEFAULT_ADB_USER_SERVICE_CONFIG, ...config }
+                }
             ],
         };
     }
@@ -2366,5 +2358,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ADBHeaderModule, ADBNavComponent, ADB_USER_SERVICE_CONFIG, AdbButtonsModule, AdbConfirmModal, AdbDatePickerComponent, AdbDatePickerDirective, AdbDatePickerModule, AdbDirectivesModule, AdbDropdown2Directive, AdbDropdownDirective, AdbDropdownModule, AdbFilterSectionModule, AdbHelpButtonComponent, AdbModalModule, AdbModalService, AdbPagersModule, AdbPipesModule, AdbRichEditorComponent, AdbRichEditorModule, AdbToast, AdbToastModule, AdbToastService, AdbUserInterceptor, AdbUserModule, AdbUserService, ArtportalenFooterComponent, ArtportalenNavComponent, ArtportalenNavModule, AuthCallbackComponent, ClickOutsideDirective, DEFAULT_ADB_USER_SERVICE_CONFIG, EmptyValuePipe, FileUploadDirective, FilterSectionComponent, FocusDirective, HighlightHtmlPipe, HighlightPipe, InfiniteScrollComponent, LocaleDatePipe, NumberSpacingPipe, PagerComponent, PagerInlineComponent, RedListBadgeClassDirective, RichTextComponent, RiskClassDirective, SessionIds, ToastType };
+export { ADBHeaderModule, ADBNavComponent, ADB_USER_SERVICE_CONFIG, AdbButtonsModule, AdbConfirmModal, AdbDatePickerComponent, AdbDatePickerDirective, AdbDatePickerModule, AdbDirectivesModule, AdbDropdown2Directive, AdbDropdownDirective, AdbDropdownModule, AdbFilterSectionModule, AdbHelpButtonComponent, AdbModalModule, AdbModalService, AdbPagersModule, AdbPipesModule, AdbRichEditorComponent, AdbRichEditorModule, AdbToast, AdbToastModule, AdbToastService, AdbUserInterceptor, AdbUserModule, AdbUserService, ArtportalenFooterComponent, ArtportalenNavComponent, ArtportalenNavModule, AuthCallbackComponent, ClickOutsideDirective, DEFAULT_ADB_USER_SERVICE_CONFIG, EmptyValuePipe, FileUploadDirective, FilterSectionComponent, FocusDirective, HighlightHtmlPipe, HighlightPipe, InfiniteScrollComponent, LocaleDatePipe, NumberSpacingPipe, PagerComponent, PagerInlineComponent, RedListBadgeClassDirective, RichTextComponent, RiskClassDirective, ToastType, UserModuleConstants };
 //# sourceMappingURL=adb-shared.mjs.map