@flusys/ng-auth 6.2.1 → 6.3.0

package/fesm2022/flusys-ng-auth.mjs

@@ -5,7 +5,7 @@ import { APP_CONFIG, getServiceUrl, isCompanyFeatureEnabled, isServiceEnabled, i
 import { of, timeout, switchMap, map, tap, catchError, shareReplay, finalize, BehaviorSubject, throwError, filter, take, from, forkJoin, firstValueFrom } from 'rxjs';
 import * as i2 from '@angular/router';
 import { Router, RouterOutlet, ActivatedRoute } from '@angular/router';
-import { PlatformService, TranslateService, ApiResourceService, CookieService, PermissionValidatorService, USER_PERMISSIONS, COMPANY_PERMISSIONS, BRANCH_PERMISSIONS, resolveTranslationModule, SHARED_MESSAGES, permissionGuard, USER_PROVIDER, COMPANY_API_PROVIDER, USER_PERMISSION_PROVIDER, AUTH_STATE_PROVIDER, RouterTabsComponent, TranslatePipe, AngularModule, HasPermissionDirective, BaseFormComponent, BaseListComponent, BaseListTemplateDirective, FileUrlService, FILE_PROVIDER, PROFILE_PERMISSION_PROVIDER, FileUploaderComponent } from '@flusys/ng-shared';
+import { PlatformService, TranslateService, PermissionValidatorService, ApiResourceService, CookieService, USER_PERMISSIONS, COMPANY_PERMISSIONS, BRANCH_PERMISSIONS, resolveTranslationModule, SHARED_MESSAGES, permissionGuard, USER_PROVIDER, COMPANY_API_PROVIDER, USER_PERMISSION_PROVIDER, AUTH_STATE_PROVIDER, RouterTabsComponent, TranslatePipe, AngularModule, HasPermissionDirective, BaseFormComponent, BaseListComponent, BaseListTemplateDirective, FileUrlService, FILE_PROVIDER, PROFILE_PERMISSION_PROVIDER, FileUploaderComponent } from '@flusys/ng-shared';
 import { map as map$1, catchError as catchError$1, tap as tap$1 } from 'rxjs/operators';
 import * as i2$1 from '@angular/common';
 import { isPlatformBrowser } from '@angular/common';
@@ -94,6 +94,7 @@ const STORAGE = {
     COMPANY_ID: 'selectedCompanyId',
     BRANCH_ID: 'selectedBranchId',
 };
+const SAVED_USER_NAME_KEY = 'savedUserName';
 /**
  * Auth State Service
  * Minimal signal-based state management for authentication
@@ -106,6 +107,7 @@ class AuthStateService {
     translateAdapter = inject(TranslateService, {
         optional: true,
     });
+    permissionValidator = inject(PermissionValidatorService);
     // Core State (private writable, public readonly)
     _user = signal(null, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "_user" }] : /* istanbul ignore next */ []));
@@ -174,6 +176,13 @@ class AuthStateService {
                 ? this.store(STORAGE.BRANCH_ID, branchId)
                 : this.remove(STORAGE.BRANCH_ID);
         });
+        // Persist display name for the login page's "welcome back" greeting
+        effect(() => {
+            const user = this._user();
+            const name = user?.name?.trim() || user?.email;
+            if (name)
+                this.store(SAVED_USER_NAME_KEY, name);
+        });
         // Load initial state from storage (expiry only, not token)
         this.loadFromStorage();
     }
@@ -206,6 +215,7 @@ class AuthStateService {
         this._branch.set(null);
         this.clearSelectionState();
         Object.values(STORAGE).forEach((key) => this.remove(key));
+        this.permissionValidator.clearPermissions();
     }
     // ==========================================================================
     // Individual Setters (for external use where needed)
@@ -250,6 +260,9 @@ class AuthStateService {
     getStoredBranchId() {
         return this.get(STORAGE.BRANCH_ID);
     }
+    getSavedUserName() {
+        return this.get(SAVED_USER_NAME_KEY);
+    }
     // Storage helpers
     loadFromStorage() {
         if (this.platform.isServer)
@@ -447,6 +460,10 @@ class UserApiService extends ApiResourceService {
     updateProfile(data) {
         return this.http.post(`${this.baseUrl}/profile`, data);
     }
+    lookup(filter, search = '') {
+        const params = search ? { q: search } : undefined;
+        return this.http.post(`${this.baseUrl}/lookup`, filter, params ? { params } : undefined);
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.6", ngImport: i0, type: UserApiService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.6", ngImport: i0, type: UserApiService, providedIn: 'root' });
 }
@@ -766,6 +783,7 @@ const AUTH_MESSAGES = {
     'user.email.verify.success': 'Email verified successfully',
     'user.phone.verify.success': 'Phone verified successfully',
     'user.status.update.success': 'User status updated successfully',
+    'user.lookup.success': 'Users retrieved successfully',
     // Company CRUD messages (API keys)
     'company.create.success': 'Company created successfully',
     'company.create.many.success': '{{count}} companies created successfully',
@@ -796,7 +814,8 @@ const AUTH_MESSAGES = {
     'user.permission.not.found': '{{type}} permission not found',
     // === UI KEYS — AUTH DOMAIN (AUTH_ROUTES: login, register, forgot-password, reset-password, verify-email) ===
     // pages/login/login-page.component.ts
-    'auth.login.welcome': 'Welcome back!',
+    'auth.login.welcome': 'Welcome!',
+    'auth.login.welcome.back': 'Welcome back, {{name}}!',
     'auth.login.sign.in.to.continue': 'Sign in to continue to your account',
     'auth.email.label': 'Email Address',
     'auth.email.placeholder': 'Enter email address',
@@ -1330,7 +1349,7 @@ class AuthUserProviderAdapter {
             },
             sort: { name: 'ASC' },
         };
-        return from(this.userApi.getAll(apiFilter, search ?? '')).pipe(map((response) => ({
+        return this.userApi.lookup(apiFilter, search ?? '').pipe(map((response) => ({
             success: response.success,
             message: response.message,
             messageKey: response.messageKey,
@@ -3012,6 +3031,8 @@ class LoginPageComponent {
     ...(ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []));
     unverifiedEmail = signal('', /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "unverifiedEmail" }] : /* istanbul ignore next */ []));
+    savedUserName = signal(this.authState.getSavedUserName(), /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "savedUserName" }] : /* istanbul ignore next */ []));
     loginFormModel = signal({
         email: '',
         password: '',
@@ -3363,7 +3384,14 @@ class LoginPageComponent {
             @if (currentStep() === 'credentials') {
               <div class="text-center mb-8">
                 <div class="text-3xl font-medium mb-4 text-color">
-                  {{ 'auth.login.welcome' | translate }}
+                  @if (savedUserName()) {
+                    {{
+                      'auth.login.welcome.back'
+                        | translate: { name: savedUserName()! }
+                    }}
+                  } @else {
+                    {{ 'auth.login.welcome' | translate }}
+                  }
                 </div>
                 <span class="text-muted-color font-medium">{{
                   'auth.login.sign.in.to.continue' | translate
@@ -3635,7 +3663,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.6", ngImpor
             @if (currentStep() === 'credentials') {
               <div class="text-center mb-8">
                 <div class="text-3xl font-medium mb-4 text-color">
-                  {{ 'auth.login.welcome' | translate }}
+                  @if (savedUserName()) {
+                    {{
+                      'auth.login.welcome.back'
+                        | translate: { name: savedUserName()! }
+                    }}
+                  } @else {
+                    {{ 'auth.login.welcome' | translate }}
+                  }
                 </div>
                 <span class="text-muted-color font-medium">{{
                   'auth.login.sign.in.to.continue' | translate