ssi-security-commons 0.16.0 → 0.16.1

package/fesm2022/ssi-security-commons.mjs

@@ -1,13 +1,11 @@
 import * as i0 from '@angular/core';
 import { Injectable, Component, Inject, NgModule } from '@angular/core';
-import * as i2 from '@angular/material/dialog';
-import { MatDialogModule } from '@angular/material/dialog';
+import * as i1 from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import * as i2$1 from '@angular/material/snack-bar';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import * as CryptoJS from 'crypto-js';
-import * as i1 from '@angular/material/legacy-dialog';
-import { MAT_LEGACY_DIALOG_DATA } from '@angular/material/legacy-dialog';
-import * as i3 from '@angular/material/button';
+import * as i2 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
 import * as i1$1 from '@angular/common/http';
 import { HttpHeaders, HttpResponse, HttpErrorResponse } from '@angular/common/http';
@@ -48,9 +46,15 @@ class CryptoService {
         this.key = CryptoJS.lib.WordArray.create(hash.words.slice(0, 16 / 4));
     }
     encrypt(text) {
+        if (!text) {
+            return '';
+        }
         return CryptoJS.AES.encrypt(text, this.key, this.configuration).toString();
     }
     decrypt(text) {
+        if (!text) {
+            return '';
+        }
         return CryptoJS.AES.decrypt(text, this.key, this.configuration).toString(CryptoJS.enc.Utf8);
     }
     encryptWithSecret(text, secret) {
@@ -81,27 +85,62 @@ class AlertComponent {
     onCancel() {
         this.dialogRef.close(null);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AlertComponent, deps: [{ token: i1.MatLegacyDialogRef }, { token: MAT_LEGACY_DIALOG_DATA }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.0.3", type: AlertComponent, selector: "lib-app-alert", ngImport: i0, template: "<h1 mat-dialog-title>{{data.title?data.title:'Alert'}}</h1>\n<div mat-dialog-content class=\"alert-min-width\">\n    <div>\n        {{data.message}}\n    </div>\n</div>\n<div mat-dialog-actions align=\"end\">\n    <button *ngIf=\"data?.cancelText\" mat-button (click)=\"onCancel()\">{{data.cancelText ? data.cancelText : 'Cancel'}}</button>\n    <button mat-button color=\"primary\" (click)=\"onConfirm()\">{{data.okText ? data.okText : 'OK'}}</button>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.MatDialogTitle, selector: "[mat-dialog-title], [matDialogTitle]", inputs: ["id"], exportAs: ["matDialogTitle"] }, { kind: "directive", type: i2.MatDialogContent, selector: "[mat-dialog-content], mat-dialog-content, [matDialogContent]" }, { kind: "directive", type: i2.MatDialogActions, selector: "[mat-dialog-actions], mat-dialog-actions, [matDialogActions]", inputs: ["align"] }, { kind: "component", type: i3.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AlertComponent, deps: [{ token: i1.MatDialogRef }, { token: MAT_DIALOG_DATA }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.0.3", type: AlertComponent, selector: "lib-app-alert", ngImport: i0, template: "<h1 mat-dialog-title>{{data.title?data.title:'Alert'}}</h1>\n<div mat-dialog-content class=\"alert-min-width\">\n    <div>\n        {{data.message}}\n    </div>\n</div>\n<div mat-dialog-actions align=\"end\">\n    <button *ngIf=\"data?.cancelText\" mat-button (click)=\"onCancel()\">{{data.cancelText ? data.cancelText : 'Cancel'}}</button>\n    <button mat-button color=\"primary\" (click)=\"onConfirm()\">{{data.okText ? data.okText : 'OK'}}</button>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i1.MatDialogTitle, selector: "[mat-dialog-title], [matDialogTitle]", inputs: ["id"], exportAs: ["matDialogTitle"] }, { kind: "directive", type: i1.MatDialogContent, selector: "[mat-dialog-content], mat-dialog-content, [matDialogContent]" }, { kind: "directive", type: i1.MatDialogActions, selector: "[mat-dialog-actions], mat-dialog-actions, [matDialogActions]", inputs: ["align"] }, { kind: "component", type: i2.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AlertComponent, decorators: [{
             type: Component,
             args: [{ selector: 'lib-app-alert', template: "<h1 mat-dialog-title>{{data.title?data.title:'Alert'}}</h1>\n<div mat-dialog-content class=\"alert-min-width\">\n    <div>\n        {{data.message}}\n    </div>\n</div>\n<div mat-dialog-actions align=\"end\">\n    <button *ngIf=\"data?.cancelText\" mat-button (click)=\"onCancel()\">{{data.cancelText ? data.cancelText : 'Cancel'}}</button>\n    <button mat-button color=\"primary\" (click)=\"onConfirm()\">{{data.okText ? data.okText : 'OK'}}</button>\n</div>\n" }]
-        }], ctorParameters: function () { return [{ type: i1.MatLegacyDialogRef }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.MatDialogRef }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: [MAT_LEGACY_DIALOG_DATA]
+                    args: [MAT_DIALOG_DATA]
                 }] }]; } });
 
+const TOKEN = 'TOKEN';
+const REFRESH_TOKEN = 'REFRESH_TOKEN';
+const USERDATA = 'USERDATA';
+const LANG = 'LANG';
+
+/* eslint-disable */
+class JwtService {
+    decodeToken(token) {
+        const _decodeToken = (token) => {
+            try {
+                return JSON.parse(atob(token));
+            }
+            catch {
+                return;
+            }
+        };
+        return token
+            .split('.')
+            .map(token => _decodeToken(token))
+            .reduce((acc, curr) => {
+            if (!!curr)
+                acc = { ...acc, ...curr };
+            return acc;
+        }, Object.create(null));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: JwtService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: JwtService }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: JwtService, decorators: [{
+            type: Injectable
+        }] });
+
 /* eslint-disable max-lines-per-function */
 /* eslint-disable arrow-body-style */
 /* eslint-disable @typescript-eslint/naming-convention */
 class SessionService {
-    constructor(http, environment) {
+    constructor(http, environment, cryptoService, jwtService) {
         this.http = http;
+        this.cryptoService = cryptoService;
+        this.jwtService = jwtService;
         this.loginUrl = 'http://localhost:4200/login';
         this.endPoint = environment.endPoint;
         this.applicationId = environment.applicationId;
         const urlHub = environment.sessionHub;
+        this.environment = environment;
         console.log(urlHub);
         this.storage = new CrossStorageClient(urlHub, { timeout: 5000 });
     }
@@ -110,18 +149,32 @@ class SessionService {
             let data;
             let token;
             let refreshToken;
+            // eslint-disable-next-line @typescript-eslint/no-this-alias
             const self = this;
             this.storage.onConnect().then(function () {
-                return self.storage.get('USERDATA', 'TOKEN', 'REFRESH_TOKEN');
+                if (self.environment.production) {
+                    const u = self.cryptoService.encrypt(USERDATA);
+                    const t = self.cryptoService.encrypt(TOKEN);
+                    const r = self.cryptoService.encrypt(REFRESH_TOKEN);
+                    return self.storage.get(u, t, r);
+                }
+                else {
+                    return self.storage.get(USERDATA, TOKEN, REFRESH_TOKEN);
+                }
             }).then(function (res) {
                 console.log(res);
-                data = res[0];
-                token = res[1];
-                refreshToken = res[2];
+                if (self.environment.production) {
+                    data = self.cryptoService.decrypt(res[0]);
+                    token = self.cryptoService.decrypt(res[1]);
+                    refreshToken = self.cryptoService.decrypt(res[2]);
+                }
+                else {
+                    data = res[0];
+                    token = res[1];
+                    refreshToken = res[2];
+                }
                 if (data && token && refreshToken) {
-                    const user = JSON.parse(data);
                     self.saveCredentials(token, refreshToken);
-                    self.saveUserData(user);
                     self.checkAppPermissions().then((res1) => {
                         console.log(res1);
                         resolve('OK');
@@ -153,6 +206,20 @@ class SessionService {
         });
         return promise;
     }
+    buildUserdataFromToken(token) {
+        const tokenData = this.jwtService.decodeToken(token);
+        const userData = {
+            givenName: tokenData.given_name,
+            familyName: tokenData.family_name,
+            name: tokenData.name,
+            roles: tokenData.realm_access.roles,
+            userId: tokenData.sub,
+            username: tokenData.preferred_username,
+            email: tokenData.email,
+            emailVerified: tokenData.email_verified
+        };
+        return userData;
+    }
     async reviewSessionData() {
         const value = await this.checkSessionData();
         console.log(`async result: ${value}`);
@@ -170,20 +237,14 @@ class SessionService {
     }
     setRefreshToken(refreshToken) {
         this.refreshToken = refreshToken;
-        window.localStorage.setItem('REFRESH_TOKEN', refreshToken);
-        this.storage.onConnect().then(() => {
-            return this.storage.set('REFRESH_TOKEN', refreshToken);
-        });
+        this.saveStorageData(REFRESH_TOKEN, refreshToken);
     }
     getRefreshToken() {
         return this.refreshToken;
     }
     setToken(token) {
         this.token = token;
-        window.localStorage.setItem('TOKEN', token);
-        this.storage.onConnect().then(() => {
-            return this.storage.set('TOKEN', token);
-        });
+        this.saveStorageData(TOKEN, token);
     }
     getToken() {
         return this.token;
@@ -191,44 +252,30 @@ class SessionService {
     destroyCredentials() {
         this.token = undefined;
         this.refreshToken = undefined;
-        window.localStorage.removeItem('TOKEN');
-        window.localStorage.removeItem('REFRESH_TOKEN');
-        this.storage.onConnect().then(() => {
-            return this.storage.del('TOKEN', 'REFRESH_TOKEN');
-        });
+        this.deleteStorageData(TOKEN);
+        this.deleteStorageData(REFRESH_TOKEN);
     }
     destroyUserData() {
         this.userdata = undefined;
-        window.localStorage.removeItem('USERDATA');
-        this.storage.onConnect().then(() => {
-            return this.storage.del('USERDATA');
-        });
+        this.deleteStorageData(USERDATA);
     }
     saveCredentials(token, refreshToken) {
         this.token = token;
         this.refreshToken = refreshToken;
-        window.localStorage.setItem('TOKEN', token);
-        window.localStorage.setItem('REFRESH_TOKEN', refreshToken);
-        this.storage.onConnect().then(() => {
-            return this.storage.set('TOKEN', token);
-        });
-        this.storage.onConnect().then(() => {
-            return this.storage.set('REFRESH_TOKEN', refreshToken);
-        });
+        this.saveStorageData(TOKEN, token);
+        this.saveStorageData(REFRESH_TOKEN, refreshToken);
+        this.saveUserData(this.buildUserdataFromToken(token));
     }
-    saveUserData(userdata) {
-        this.userdata = userdata;
-        window.localStorage.setItem('USERDATA', JSON.stringify(this.userdata));
-        this.storage.onConnect().then(() => {
-            return this.storage.set('USERDATA', JSON.stringify(this.userdata));
-        });
+    saveUserData(userData) {
+        this.userdata = userData;
+        this.saveStorageData(USERDATA, JSON.stringify(userData));
     }
     isLoggedIn() {
         return !!this.userdata;
     }
     logout() {
         return new Promise((resolve, reject) => {
-            this.logoutApi(this.userdata?.userId).subscribe(res => {
+            this.logoutApi().subscribe(res => {
                 console.log(res);
                 this.destroyCredentials();
                 this.destroyUserData();
@@ -244,10 +291,10 @@ class SessionService {
     }
     getNewToken(refreshToken) {
         console.log('getNewToken');
-        const httpOptions = {
-            headers: new HttpHeaders({ 'Content-Type': 'application/json' })
-        };
-        return this.http.post(this.endPoint + '/auth/refresh-token', { refreshToken }, httpOptions);
+        const body = 'grant_type=refresh_token' + '&refresh_token=' + refreshToken + '&client_id=' + this.environment.authClient;
+        const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded');
+        return this.http.post(`${this.environment.authEndPoint}/realms/${this.environment.authRealm}/protocol/openid-connect/token`, body, { headers })
+            .pipe(map(res => res));
     }
     getLoginUrl() {
         return this.http.get(this.endPoint + '/auth/login/url')
@@ -257,8 +304,10 @@ class SessionService {
         return this.http.get(this.endPoint + '/auth/home/url')
             .pipe(map(res => res));
     }
-    logoutApi(userId) {
-        return this.http.post(this.endPoint + '/auth/logout', { userId })
+    logoutApi() {
+        const body = 'refresh_token=' + this.refreshToken + '&client_id=' + this.environment.authClient;
+        const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded');
+        return this.http.post(`${this.environment.authEndPoint}/realms/${this.environment.authRealm}/protocol/openid-connect/logout`, body, { headers })
             .pipe(map(res => res));
     }
     goToLogin() {
@@ -271,9 +320,22 @@ class SessionService {
         });
     }
     loadSessionData() {
-        const data = window.localStorage.getItem('USERDATA');
-        const token = window.localStorage.getItem('TOKEN');
-        const refreshToken = window.localStorage.getItem('REFRESH_TOKEN');
+        let data;
+        let token;
+        let refreshToken;
+        if (this.environment.production) {
+            const u = this.cryptoService.encrypt(USERDATA);
+            const t = this.cryptoService.encrypt(TOKEN);
+            const r = this.cryptoService.encrypt(REFRESH_TOKEN);
+            data = window.localStorage.getItem(u);
+            token = window.localStorage.getItem(t);
+            refreshToken = window.localStorage.getItem(r);
+        }
+        else {
+            data = window.localStorage.getItem(USERDATA);
+            token = window.localStorage.getItem(TOKEN);
+            refreshToken = window.localStorage.getItem(REFRESH_TOKEN);
+        }
         if (data && token && refreshToken) {
             const user = JSON.parse(data);
             this.setTokens(token, refreshToken);
@@ -334,7 +396,38 @@ class SessionService {
         return this.http.post(this.endPoint + '/auth/exception/log', param, { headers })
             .pipe(map(res => res));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: SessionService, deps: [{ token: i1$1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    saveStorageData(key, value) {
+        if (this.environment.production) {
+            const k = this.cryptoService.encrypt(key);
+            const v = this.cryptoService.encrypt(value);
+            window.localStorage.setItem(k, v);
+            this.storage.onConnect().then(() => {
+                return this.storage.set(k, v);
+            });
+        }
+        else {
+            window.localStorage.setItem(key, value);
+            this.storage.onConnect().then(() => {
+                return this.storage.set(key, value);
+            });
+        }
+    }
+    deleteStorageData(key) {
+        if (this.environment.production) {
+            const k = this.cryptoService.encrypt(key);
+            window.localStorage.removeItem(k);
+            this.storage.onConnect().then(() => {
+                return this.storage.del(k);
+            });
+        }
+        else {
+            window.localStorage.removeItem(key);
+            this.storage.onConnect().then(() => {
+                return this.storage.del(key);
+            });
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: SessionService, deps: [{ token: i1$1.HttpClient }, { token: 'environment' }, { token: CryptoService }, { token: JwtService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: SessionService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: SessionService, decorators: [{
@@ -342,7 +435,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImpor
         }], ctorParameters: function () { return [{ type: i1$1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }]; } });
+                }] }, { type: CryptoService }, { type: JwtService }]; } });
 
 class MessagesService {
     constructor(auth, 
@@ -536,12 +629,12 @@ class MessagesService {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: MessagesService, deps: [{ token: SessionService }, { token: i2$1.MatSnackBar }, { token: i2.MatDialog }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: MessagesService, deps: [{ token: SessionService }, { token: i2$1.MatSnackBar }, { token: i1.MatDialog }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: MessagesService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: MessagesService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: SessionService }, { type: i2$1.MatSnackBar }, { type: i2.MatDialog }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: SessionService }, { type: i2$1.MatSnackBar }, { type: i1.MatDialog }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -561,7 +654,8 @@ class SsiSecurityCommonsModule {
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: SsiSecurityCommonsModule, providers: [
             MessagesService,
             SessionService,
-            CryptoService
+            CryptoService,
+            JwtService
         ], imports: [MatSnackBarModule,
             MatDialogModule,
             MatButtonModule] }); }
@@ -584,22 +678,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImpor
                     providers: [
                         MessagesService,
                         SessionService,
-                        CryptoService
+                        CryptoService,
+                        JwtService
                     ]
                 }]
         }] });
 
 /* eslint-disable */
 class AuthInterceptor {
-    constructor(cryptoService) {
+    constructor(cryptoService, environment) {
         this.cryptoService = cryptoService;
         console.log('AuthInterceptor constructor');
+        this.environment = environment;
     }
     intercept(request, next) {
-        //console.log('intercept');
-        const token = window.localStorage.getItem('TOKEN');
-        //console.log(token);
-        //console.log(request);
+        let token;
+        if (this.environment.production) {
+            const t = this.cryptoService.encrypt(TOKEN);
+            const to = window.localStorage.getItem(t);
+            if (to) {
+                token = this.cryptoService.decrypt(to);
+            }
+        }
+        else {
+            token = window.localStorage.getItem(TOKEN);
+        }
         let encrypt = request.headers.get('encrypted');
         if (encrypt && encrypt === 'true') {
             let body = request.body;
@@ -618,14 +721,23 @@ class AuthInterceptor {
                 }
             });
         }
+        const l = window.localStorage.getItem(LANG);
+        if (l && request.url.indexOf(this.environment.authEndPoint) < 0) {
+            request = request.clone({
+                headers: request.headers.append('Language', l)
+            });
+        }
         return next.handle(request);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AuthInterceptor, deps: [{ token: CryptoService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AuthInterceptor, deps: [{ token: CryptoService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AuthInterceptor }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImport: i0, type: AuthInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: CryptoService }]; } });
+        }], ctorParameters: function () { return [{ type: CryptoService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 class ResponseInterceptor {
     constructor(injector, router, cryptoService, sessionService) {
         this.injector = injector;
@@ -634,7 +746,6 @@ class ResponseInterceptor {
         this.sessionService = sessionService;
         this.isRefreshing = false;
         this.refreshTokenSubject = new BehaviorSubject(null);
-        //console.log('ResponseInterceptor constructor');
         setTimeout(() => {
             this.messages = this.injector.get(MessagesService);
         });
@@ -642,7 +753,6 @@ class ResponseInterceptor {
     intercept(request, next) {
         return next.handle(request).pipe(map((event) => {
             if (event instanceof HttpResponse) {
-                //console.log(request.headers.get('encrypted'));
                 let encrypt = request.headers.get('encrypted');
                 if (encrypt && encrypt === 'true' && event.body.encrypted) {
                     event = event.clone({ body: this.decryptBody(event.body) });
@@ -653,34 +763,22 @@ class ResponseInterceptor {
             if (error instanceof HttpErrorResponse) {
                 console.error(error);
                 let nerror = error;
-                /*let encrypt = request.headers.get('encrypted');
-                if(encrypt && encrypt === 'true'){
-                  nerror = new HttpErrorResponse({
-                    error: this.decryptBody(error.error),
-                    headers: error.headers,
-                    status: error.status,
-                    statusText: error.statusText,
-                    url: error.url || request.urlWithParams || undefined,
-                  });
-                }*/
-                if (nerror.status === 401) {
-                    console.log(this.router.url);
-                    if (this.router.url != '/login' && this.router.url.indexOf('/login') < 0) {
-                        console.log('401--->' + request.url);
+                if (this.router.url != '/login' && this.router.url.indexOf('/login') < 0) {
+                    if (nerror.status === 401) {
                         return this.handle401Error(request, next);
                     }
                     else {
-                        return throwError(nerror);
+                        let skipError = request.headers.get('skipError');
+                        if (skipError && skipError === 'true') {
+                            return throwError(nerror);
+                        }
+                        else {
+                            this.messages?.showErrorMessage(nerror, request);
+                        }
                     }
                 }
                 else {
-                    let skipError = request.headers.get('skipError');
-                    if (skipError && skipError === 'true') {
-                        return throwError(nerror);
-                    }
-                    else {
-                        this.messages?.showErrorMessage(nerror, request);
-                    }
+                    return throwError(nerror);
                 }
             }
         }));
@@ -691,13 +789,10 @@ class ResponseInterceptor {
         return JSON.parse(strJson);
     }
     handle401Error(request, next) {
-        //console.log('handle401Error');
-        //console.log(this.isRefreshing);
         if (!this.isRefreshing) {
             this.isRefreshing = true;
             this.refreshTokenSubject.next(null);
             const refreshToken = this.sessionService.getRefreshToken();
-            //console.log(refreshToken);
             if (refreshToken) {
                 return this.sessionService.getNewToken(refreshToken).pipe(switchMap((res) => {
                     console.log('refresh token response');
@@ -710,7 +805,6 @@ class ResponseInterceptor {
                 }), catchError((err) => {
                     this.isRefreshing = false;
                     this.sessionService.logout();
-                    //this.router.navigate(['/login']);
                     this.goToLogin();
                     return throwError(err);
                 }));
@@ -750,5 +844,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AuthInterceptor, CryptoService, MessagesService, ResponseInterceptor, SessionService, SsiSecurityCommonsComponent, SsiSecurityCommonsModule, SsiSecurityCommonsService };
+export { AuthInterceptor, CryptoService, JwtService, LANG, MessagesService, REFRESH_TOKEN, ResponseInterceptor, SessionService, SsiSecurityCommonsComponent, SsiSecurityCommonsModule, SsiSecurityCommonsService, TOKEN, USERDATA };
 //# sourceMappingURL=ssi-security-commons.mjs.map