@igo2/auth 16.0.0-rc.1 → 16.0.0-rc.2

package/fesm2022/igo2-auth.mjs

@@ -2,14 +2,14 @@ import * as i0 from '@angular/core';
 import { Injectable, Optional, EventEmitter, Component, ChangeDetectionStrategy, Output, Input, Inject, Directive, NgModule } from '@angular/core';
 import * as i3 from '@angular/router';
 import { NavigationStart, RouterModule } from '@angular/router';
-import { tap, catchError, filter, takeUntil, map } from 'rxjs/operators';
 import * as i2 from '@igo2/core';
 import { ConfigService, BaseStorage, StorageScope, StorageService, IgoLanguageModule } from '@igo2/core';
+import { tap, catchError, filter, takeUntil, map } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Base64 } from '@igo2/utils';
 import { BehaviorSubject, of, Subject, from } from 'rxjs';
 import { globalCacheBusterNotifier } from 'ts-cacheable';
-import { Base64 } from '@igo2/utils';
 import jwtDecode from 'jwt-decode';
 import * as i1$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
@@ -85,8 +85,9 @@ class AuthService {
     redirectUrl;
     languageForce = false;
     anonymous = false;
+    authOptions;
     get hasAuthService() {
-        return this.config.getConfig('auth.url') !== undefined;
+        return this.authOptions?.url !== undefined;
     }
     constructor(http, tokenService, config, languageService, messageService, router) {
         this.http = http;
@@ -95,6 +96,7 @@ class AuthService {
         this.languageService = languageService;
         this.messageService = messageService;
         this.router = router;
+        this.authOptions = this.config.getConfig('auth');
         this.authenticate$.next(this.authenticated);
         this.authenticate$.subscribe((authenticated) => {
             this.logged$.next(authenticated);
@@ -124,8 +126,7 @@ class AuthService {
         return of(true);
     }
     refresh() {
-        const url = this.config.getConfig('auth.url');
-        return this.http.post(`${url}/refresh`, {}).pipe(tap((data) => {
+        return this.http.post(`${this.authOptions?.url}/refresh`, {}).pipe(tap((data) => {
             this.tokenService.set(data.token);
         }), catchError((err) => {
             err.error.caught = true;
@@ -155,9 +156,8 @@ class AuthService {
             return;
         }
         const redirectUrl = this.redirectUrl || this.router.url;
-        const options = this.config.getConfig('auth') || {};
-        if (redirectUrl === options.loginRoute) {
-            const homeRoute = options.homeRoute || '/';
+        if (redirectUrl === this.authOptions.loginRoute) {
+            const homeRoute = this.authOptions.homeRoute || '/';
             this.router.navigateByUrl(homeRoute);
         }
         else if (redirectUrl) {
@@ -165,16 +165,14 @@ class AuthService {
         }
     }
     getUserInfo() {
-        const url = this.config.getConfig('auth.url') + '/info';
+        const url = this.authOptions?.url + '/info';
         return this.http.get(url);
     }
     getProfils() {
-        const url = this.config.getConfig('auth.url');
-        return this.http.get(`${url}/profils`);
+        return this.http.get(`${this.authOptions?.url}/profils`);
     }
     updateUser(user) {
-        const url = this.config.getConfig('auth.url');
-        return this.http.patch(url, user);
+        return this.http.patch(this.authOptions?.url, user);
     }
     encodePassword(password) {
         return Base64.encode(password);
@@ -197,8 +195,9 @@ class AuthService {
         return false;
     }
     loginCall(body, headers) {
-        const url = this.config.getConfig('auth.url');
-        return this.http.post(`${url}/login`, body, { headers }).pipe(tap((data) => {
+        return this.http
+            .post(`${this.authOptions?.url}/login`, body, { headers })
+            .pipe(tap((data) => {
             this.tokenService.set(data.token);
             const tokenDecoded = this.decodeToken();
             if (tokenDecoded && tokenDecoded.user) {
@@ -1095,7 +1094,7 @@ class LoggedGuard {
         }
         this.authService.redirectUrl = state.url;
         const authConfig = this.config.getConfig('auth');
-        if (authConfig && authConfig.loginRoute) {
+        if (authConfig?.loginRoute) {
             this.router.navigateByUrl(authConfig.loginRoute);
         }
         return false;
@@ -1125,7 +1124,7 @@ class AuthGuard {
         }
         this.authService.redirectUrl = state.url;
         const authConfig = this.config.getConfig('auth');
-        if (authConfig && authConfig.loginRoute) {
+        if (authConfig?.loginRoute) {
             this.router.navigateByUrl(authConfig.loginRoute);
         }
         return false;
@@ -1156,7 +1155,7 @@ class AdminGuard {
         }
         this.authService.redirectUrl = state.url;
         const authConfig = this.config.getConfig('auth');
-        if (authConfig && authConfig.loginRoute) {
+        if (authConfig?.loginRoute) {
             this.router.navigateByUrl(authConfig.loginRoute);
         }
         return false;
@@ -1189,7 +1188,7 @@ class ProfilsGuard {
                 return true;
             }
             this.authService.redirectUrl = state.url;
-            if (authConfig && authConfig.loginRoute) {
+            if (authConfig?.loginRoute) {
                 this.router.navigateByUrl(authConfig.loginRoute);
             }
             return false;
@@ -1209,6 +1208,7 @@ class AuthInterceptor {
     config;
     tokenService;
     http;
+    authOptions;
     refreshInProgress = false;
     trustHosts;
     hostsWithCredentials;
@@ -1217,11 +1217,11 @@ class AuthInterceptor {
         this.config = config;
         this.tokenService = tokenService;
         this.http = http;
-        this.trustHosts = this.config.getConfig('auth.trustHosts') || [];
+        this.authOptions = this.config.getConfig('auth');
+        this.trustHosts = this.authOptions?.trustHosts || [];
         this.trustHosts.push(window.location.hostname);
-        this.hostsWithCredentials =
-            this.config.getConfig('auth.hostsWithCredentials') || [];
-        this.hostsWithAuthByKey = this.config.getConfig('auth.hostsByKey') || [];
+        this.hostsWithCredentials = this.authOptions?.hostsWithCredentials || [];
+        this.hostsWithAuthByKey = this.authOptions?.hostsByKey || [];
     }
     intercept(originalReq, next) {
         const withCredentials = this.handleHostsWithCredentials(originalReq.url);
@@ -1340,7 +1340,7 @@ class AuthInterceptor {
             currentTime < jwt.exp &&
             currentTime > jwt.exp - 1800) {
             this.refreshInProgress = true;
-            const url = this.config.getConfig('auth.url');
+            const url = this.authOptions?.url;
             return this.http.post(`${url}/refresh`, {}).subscribe((data) => {
                 this.tokenService.set(data.token);
                 this.refreshInProgress = false;