@flusys/ng-auth 9.1.2 → 9.2.1

package/fesm2022/flusys-ng-auth.mjs

@@ -2,7 +2,7 @@ import { HttpClient } from "@angular/common/http";
 import * as i0 from "@angular/core";
 import { Component, DOCUMENT, DestroyRef, InjectionToken, PLATFORM_ID, Service, computed, effect, inject, input, output, resource, signal } from "@angular/core";
 import { APP_CONFIG, getServiceUrl, isCompanyFeatureEnabled } from "@flusys/ng-core";
-import { BehaviorSubject, catchError, filter, finalize, firstValueFrom, from, map, of, shareReplay, switchMap, take, tap, throwError, timeout } from "rxjs";
+import { BehaviorSubject, Subject, catchError, filter, finalize, firstValueFrom, from, map, of, race, shareReplay, switchMap, take, tap, throwError, timeout } from "rxjs";
 import { Router } from "@angular/router";
 import { AUTH_STATE_PROVIDER, ApiResourceService, BRANCH_PERMISSIONS, COMPANY_API_PROVIDER, COMPANY_PERMISSIONS, CookieService, HasPermissionDirective, PermissionValidatorService, PlatformService, SHARED_MESSAGES, SOCIAL_AUTH_CONFIG_PERMISSIONS, TranslatePipe, TranslateService, USER_PERMISSIONS, USER_PERMISSION_PROVIDER, USER_PROVIDER, flattenBranchTree, getBranchPath, permissionGuard, resolveTranslationModule } from "@flusys/ng-shared";
 import { catchError as catchError$1, map as map$1, tap as tap$1 } from "rxjs/operators";
@@ -517,6 +517,8 @@ var TokenRefreshStateService = class TokenRefreshStateService {
 	isRefreshing = this._isRefreshing.asReadonly();
 	_refreshTokenSubject = new BehaviorSubject(null);
 	refreshTokenSubject$ = this._refreshTokenSubject.asObservable();
+	_refreshFailed = new Subject();
+	refreshFailed$ = this._refreshFailed.asObservable();
 	startRefresh() {
 		this._isRefreshing.set(true);
 		this._refreshTokenSubject.next(null);
@@ -525,8 +527,9 @@ var TokenRefreshStateService = class TokenRefreshStateService {
 		this._isRefreshing.set(false);
 		this._refreshTokenSubject.next(newToken);
 	}
-	failRefresh() {
+	failRefresh(error) {
 		this._isRefreshing.set(false);
+		this._refreshFailed.next(error);
 	}
 	static ɵfac = i0.ɵɵngDeclareFactory({
 		minVersion: "12.0.0",
@@ -802,7 +805,7 @@ const guestGuard = (route) => {
 		if (authState.isAuthenticated()) {
 			if (appConfig.enableCompanyFeature && !authState.company()) return true;
 			const returnUrl = route.queryParams["returnUrl"];
-			return router.createUrlTree([isValidReturnUrl(returnUrl) ? returnUrl : "/"]);
+			return isValidReturnUrl(returnUrl) ? router.parseUrl(returnUrl) : router.createUrlTree(["/"]);
 		}
 		return true;
 	};
@@ -877,16 +880,19 @@ function tokenRefreshInterceptor(req, next) {
 	}));
 }
 function handleTokenRefresh(req, next, authState, authApi, messageService, isBrowser, refreshState, t) {
-	if (refreshState.isRefreshing()) return refreshState.refreshTokenSubject$.pipe(filter((token) => token !== null), take(1), switchMap((token) => next(req.clone({ setHeaders: { Authorization: `Bearer ${token}` } }))));
+	if (refreshState.isRefreshing()) return race(refreshState.refreshTokenSubject$.pipe(filter((token) => token !== null), take(1)), refreshState.refreshFailed$.pipe(take(1), switchMap((error) => throwError(() => error)))).pipe(switchMap((token) => next(req.clone({ setHeaders: { Authorization: `Bearer ${token}` } }))));
 	refreshState.startRefresh();
-	return authApi.refresh().pipe(switchMap((response) => {
-		const newToken = response.data.accessToken;
+	return authApi.refresh().pipe(map((response) => {
+		const newToken = response.data?.accessToken;
+		if (!newToken) throw new Error("auth.session.expired");
+		return newToken;
+	}), catchError((refreshError) => {
+		refreshState.failRefresh(refreshError);
+		return handleRefreshFailure(authState, messageService, isBrowser, refreshError, t);
+	}), switchMap((newToken) => {
 		authState.setAccessToken(newToken);
 		refreshState.completeRefresh(newToken);
 		return next(req.clone({ setHeaders: { Authorization: `Bearer ${newToken}` } }));
-	}), catchError((refreshError) => {
-		refreshState.failRefresh();
-		return handleRefreshFailure(authState, messageService, isBrowser, refreshError, t);
 	}));
 }
 function handleRefreshFailure(authState, messageService, isBrowser, error, t) {
@@ -895,7 +901,7 @@ function handleRefreshFailure(authState, messageService, isBrowser, error, t) {
 		messageService.add({
 			severity: "error",
 			summary: t("auth.session.expired.title"),
-			detail: t(detailKey)
+			detail: t(detailKey || "auth.session.expired")
 		});
 	}
 	authState.resetState();
@@ -1258,7 +1264,7 @@ const AUTH_ROUTES = [{
 		},
 		{
 			path: "social/callback",
-			loadComponent: () => import("./flusys-ng-auth-social-callback-page.component-gTD7_LJY.mjs").then((m) => m.SocialCallbackPageComponent)
+			loadComponent: () => import("./flusys-ng-auth-social-callback-page.component-uE6vIUtK.mjs").then((m) => m.SocialCallbackPageComponent)
 		},
 		{
 			path: "verify-email",
@@ -1290,15 +1296,15 @@ const ADMINISTRATION_ROUTES = [{
 			children: [
 				{
 					path: "",
-					loadComponent: () => import("./flusys-ng-auth-user-list.component-Bew7gz-H.mjs").then((m) => m.UserListComponent)
+					loadComponent: () => import("./flusys-ng-auth-user-list.component-BNYmRTlN.mjs").then((m) => m.UserListComponent)
 				},
 				{
 					path: "new",
-					loadComponent: () => import("./flusys-ng-auth-user-form.component-CM9UYc0q.mjs").then((m) => m.UserFormComponent)
+					loadComponent: () => import("./flusys-ng-auth-user-form.component-C5ncAjU9.mjs").then((m) => m.UserFormComponent)
 				},
 				{
 					path: ":id",
-					loadComponent: () => import("./flusys-ng-auth-user-form.component-CM9UYc0q.mjs").then((m) => m.UserFormComponent)
+					loadComponent: () => import("./flusys-ng-auth-user-form.component-C5ncAjU9.mjs").then((m) => m.UserFormComponent)
 				}
 			]
 		},
@@ -1341,7 +1347,7 @@ const ADMINISTRATION_ROUTES = [{
 		{
 			path: "social-config",
 			canActivate: [permissionGuard(SOCIAL_AUTH_CONFIG_PERMISSIONS.READ)],
-			loadComponent: () => import("./flusys-ng-auth-social-config-page.component-DpGmcb9n.mjs").then((m) => m.SocialConfigPageComponent)
+			loadComponent: () => import("./flusys-ng-auth-social-config-page.component-DQvkiR7M.mjs").then((m) => m.SocialConfigPageComponent)
 		},
 		{
 			path: "",
@@ -1420,8 +1426,12 @@ var AuthLayoutApiAdapter = class AuthLayoutApiAdapter {
 	authState = inject(AuthStateService);
 	router = inject(Router);
 	logOut() {
-		return this.authApi.logout().pipe(tap$1(() => {
-			this.authState.resetState();
+		return this.authApi.logout().pipe(tap$1({
+			next: () => this.authState.resetState(),
+			error: () => {
+				this.authState.resetState();
+				this.authState.navigateToLogin();
+			}
 		}));
 	}
 	navigateLogin(withUrl) {
@@ -1753,6 +1763,7 @@ var BranchPermittedUsersDialogComponent = class BranchPermittedUsersDialogCompon
 		this.isLoading.set(true);
 		try {
 			const response = await firstValueFrom(this.permissionApi.getBranchUsers(branch.id));
+			if (this.branch()?.id !== branch.id) return;
 			this.users.set(response.data ?? []);
 		} catch {} finally {
 			this.isLoading.set(false);
@@ -2129,6 +2140,7 @@ var CompanyPermittedUsersDialogComponent = class CompanyPermittedUsersDialogComp
 		this.isLoading.set(true);
 		try {
 			const response = await firstValueFrom(this.permissionApi.getCompanyUsers(company.id));
+			if (this.company()?.id !== company.id) return;
 			this.users.set(response.data ?? []);
 		} catch {} finally {
 			this.isLoading.set(false);
@@ -3363,6 +3375,7 @@ var UserCompanyPermissionDialogComponent = class UserCompanyPermissionDialogComp
 				sort: {}
 			});
 			const assignedResponse = await firstValueFrom(this.permissionApi.getUserCompanies(currentUser.id));
+			if (this.user()?.id !== currentUser.id) return;
 			this.assignedCompanyIds.clear();
 			if (assignedResponse.data) assignedResponse.data.forEach((permission) => {
 				this.assignedCompanyIds.add(permission.companyId);