@aakash58/chatbot 1.1.6 → 1.1.7

package/fesm2022/aakash58-chatbot.mjs

@@ -1,7 +1,7 @@
 import * as i1$2 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { isDevMode, Injectable, signal, inject, effect, EventEmitter, Output, Input, Component, Pipe, ViewChild, Inject, HostListener, Directive, InjectionToken, computed, ChangeDetectionStrategy, ChangeDetectorRef, ElementRef, ViewEncapsulation, ContentChildren, makeEnvironmentProviders, APP_INITIALIZER } from '@angular/core';
+import { isDevMode, Injectable, InjectionToken, inject, signal, effect, EventEmitter, Output, Input, Component, Pipe, ViewChild, Inject, HostListener, Directive, computed, ChangeDetectionStrategy, ChangeDetectorRef, ElementRef, ViewEncapsulation, ContentChildren, makeEnvironmentProviders, APP_INITIALIZER } from '@angular/core';
 import { ReplaySubject, delay, retry, map, catchError, of, BehaviorSubject, firstValueFrom, throwError, tap, Observable, Subject, lastValueFrom, switchMap, filter, take } from 'rxjs';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import * as i1 from '@angular/common/http';
@@ -214,6 +214,23 @@ class SnackbarUtils {
     }
 }
 
+/**
+ * Injection token for advanced configuration
+ */
+const DOOHBOT_ADVANCED_CONFIG = new InjectionToken('DOOHBOT_ADVANCED_CONFIG', {
+    providedIn: 'root',
+    factory: () => ({
+        authMode: 'manual',
+        tenantResolution: 'static',
+        enableMultiTenant: false,
+        persistChatPerTenant: true,
+        authHeaderName: 'Authorization',
+        authHeaderFormat: 'Bearer {token}',
+        enableRoleBasedFeatures: false,
+        debugMode: false,
+    }),
+});
+
 class StorageService {
     storageKey;
     secretKey;
@@ -508,6 +525,7 @@ class AuthService {
     secretKey;
     companyCode;
     jwtHelper = new JwtHelperService();
+    config = inject(DOOHBOT_ADVANCED_CONFIG, { optional: true });
     // Reactive Authentication State
     authStatusSubject = new BehaviorSubject('unauthenticated');
     authStatus$ = this.authStatusSubject.asObservable();
@@ -545,11 +563,44 @@ class AuthService {
     get authStatus() {
         return this.authStatusSubject.value;
     }
+    /**
+     * Resolves a federated token from browser storage
+     */
+    resolveSilentToken() {
+        const commonKeys = ['access_token', 'id_token', 'token', 'authToken'];
+        const configuredKey = this.config?.autoConfigFromStorage;
+        // Try configured storage key (both localStorage and sessionStorage)
+        if (configuredKey) {
+            const token = localStorage.getItem(configuredKey) || sessionStorage.getItem(configuredKey);
+            if (token) {
+                Logger.debug(`[Auth] Resolved token from configured key: ${configuredKey}`);
+                return token;
+            }
+        }
+        // Try common fallback keys
+        for (const key of commonKeys) {
+            const token = localStorage.getItem(key) || sessionStorage.getItem(key);
+            if (token) {
+                Logger.debug(`[Auth] Resolved token from fallback key: ${key}`);
+                return token;
+            }
+        }
+        return null;
+    }
     /**
      * Authenticate user with federated credentials
      */
-    async federatedLogin(credentials, silent = false) {
+    async federatedLogin(credentials, silent = true) {
         Logger.log('>>>>>>>Attempting federated login...');
+        // Resolve token if not provided
+        if (!credentials.accessToken) {
+            credentials.accessToken = this.resolveSilentToken() || '';
+        }
+        // If still no token, exit gracefully
+        if (!credentials.accessToken) {
+            Logger.log('[Auth] No federated token found in storage. Exiting silently.');
+            return false;
+        }
         this.isLoggingIn.set(true);
         if (!silent) {
             this.authError.set(null);
@@ -565,7 +616,7 @@ class AuthService {
                     access_token: response.data.access_token,
                     refresh_token: credentials.rememberMe ? response.data.refresh_token : '',
                 };
-                this.setSession(authResult, credentials.rememberMe);
+                this.setSession(authResult, credentials.rememberMe || false);
                 Logger.log('Federated login successful, authenticated state set to true');
                 if (!silent) {
                     SnackbarUtils.success('Login successful!');
@@ -2473,23 +2524,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }], ctorParameters: () => [] });
 
-/**
- * Injection token for advanced configuration
- */
-const DOOHBOT_ADVANCED_CONFIG = new InjectionToken('DOOHBOT_ADVANCED_CONFIG', {
-    providedIn: 'root',
-    factory: () => ({
-        authMode: 'manual',
-        tenantResolution: 'static',
-        enableMultiTenant: false,
-        persistChatPerTenant: true,
-        authHeaderName: 'Authorization',
-        authHeaderFormat: 'Bearer {token}',
-        enableRoleBasedFeatures: false,
-        debugMode: false,
-    }),
-});
-
 /**
  * ChatUIStateService - Centralized UI state management
  *
@@ -4414,9 +4448,9 @@ class Doohbot extends DoohbotInput {
         if (this.isAuthenticated()) {
             this.initializeUI();
         }
-        else if (this.config.authToken) {
-            //! Auto-authenticate if authToken is provided on startup
-            this.onFederatedLogin(this.config.authToken);
+        else {
+            //! Always attempt silent federated login on startup if not authenticated
+            this.onFederatedLogin();
         }
     }
     initializeUI() {
@@ -4495,11 +4529,12 @@ class Doohbot extends DoohbotInput {
         if (autoKey) {
             this.authService.setLicenseKey(autoKey);
         }
-        this.authService.federatedLogin({
+        const request = {
             accessToken: token,
             rememberMe: true,
             license: autoKey,
-        });
+        };
+        this.authService.federatedLogin(request);
     }
     performLogout() {
         DialogUtils.confirmLogout(this.dialogService).subscribe((confirmed) => {