@aakash58/chatbot 1.1.4 → 1.1.6

package/fesm2022/aakash58-chatbot.mjs

@@ -117,6 +117,7 @@ class Logger {
 }
 
 class AppConst {
+    static appBaseUrl = environment.apiBaseUrl;
     static data;
     config$ = new ReplaySubject(1);
     constructor() { }
@@ -575,7 +576,6 @@ class AuthService {
             }
             else {
                 if (!silent) {
-                    SnackbarUtils.error('Federated login failed.');
                     this.authError.set('Federated login failed.');
                 }
                 this.isLoggingIn.set(false);
@@ -585,7 +585,6 @@ class AuthService {
         catch (error) {
             Logger.error('Federated login failed:', error);
             if (!silent) {
-                SnackbarUtils.error('An error occurred during federated login.');
                 this.authError.set('An error occurred during federated login.');
             }
             this.isLoggingIn.set(false);
@@ -598,7 +597,7 @@ class AuthService {
     async login(credentials, silent = false) {
         this.isLoggingIn.set(true);
         if (!silent) {
-            this.authError.set(null);
+            this.authError.set(null); //TODO
             this.authSuccess.set(null);
         }
         try {
@@ -625,7 +624,6 @@ class AuthService {
         catch (error) {
             Logger.error('Login failed:', error);
             if (!silent) {
-                SnackbarUtils.error('An error occurred during login.');
                 this.authError.set('An error occurred during login.');
             }
             this.isLoggingIn.set(false);
@@ -991,7 +989,7 @@ class ThemeService {
             this.updateActiveTheme(mode);
             // Update primary color globally
             this.applyPrimaryColorToGlobal(primaryColor);
-        });
+        }, { allowSignalWrites: true });
     }
     applyPrimaryColorToGlobal(color) {
         const root = document.documentElement;
@@ -4265,39 +4263,44 @@ class LicenseService {
      * Returns the key for 'doohbot' or null if not found.
      */
     resolveTenantLicenseKey(appBaseUrl) {
+        // Extract current URL parts
         const hostname = window.location.hostname;
         const protocol = window.location.protocol;
-        const port = window.location.port ? ':' + window.location.port : '';
+        const port = window.location.port ? `:${window.location.port}` : '';
         const currentUrl = `${protocol}//${hostname}${port}`;
+        // Use provided appBaseUrl or fallback to AppConst
         const finalAppBaseUrl = appBaseUrl || AppConst.data?.appBaseUrl;
         // Resolve tenancy name
         let tenancyName = null;
-        if (finalAppBaseUrl && finalAppBaseUrl.includes('{TENANCY_NAME}')) {
+        // Try extracting tenant from URL pattern if {TENANCY_NAME} is present
+        if (finalAppBaseUrl?.includes('{TENANCY_NAME}')) {
             const pattern = finalAppBaseUrl.replace('{TENANCY_NAME}', '(.*?)');
             const regex = new RegExp(pattern);
             const match = currentUrl.match(regex);
-            tenancyName = match && match[1] ? match[1] : null;
+            tenancyName = match?.[1] ?? null;
         }
         if (!tenancyName) {
-            // Fallback: assume first subdomain part
+            // use first subdomain part as tenancy name
             const parts = hostname.split('.');
             if (parts.length > 2)
                 tenancyName = parts[0];
         }
+        // If still not resolved, log and exit
         if (!tenancyName) {
             Logger.log('[LicenseService] Could not resolve tenancy name.');
             return null;
         }
         Logger.log(`[LicenseService] Detected tenant: ${tenancyName}`);
-        // Lookup license key in registry
+        // Lookup license key in registry ===
         const reg = this.registry();
         if (!reg)
             return null;
         const searchKey = `tenant:${tenancyName}`;
-        const packages = reg.subjectLicenses.get(searchKey);
-        if (packages && packages['doohbot']) {
+        const tenantLicenses = reg.subjectLicenses.get(searchKey);
+        // Return the 'doohbot' license if it exists
+        if (tenantLicenses?.['doohbot']) {
             Logger.log(`[LicenseService] Found key for tenant: ${tenancyName}`);
-            return packages['doohbot'];
+            return tenantLicenses['doohbot'];
         }
         return null;
     }
@@ -4411,6 +4414,10 @@ 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);
+        }
     }
     initializeUI() {
         // Apply theme
@@ -4446,6 +4453,10 @@ class Doohbot extends DoohbotInput {
                     buttonStyle: this.buttonStyle || this.config.buttonStyle,
                 });
             }
+            // Handle dynamic authToken updates
+            if (this.config.authToken && !this.isAuthenticated()) {
+                this.onFederatedLogin(this.config.authToken);
+            }
         }
         if (changes['buttonStyle'] && this.buttonStyle) {
             this.personalization.setDeveloperDefaults({ buttonStyle: this.buttonStyle });
@@ -4474,6 +4485,22 @@ class Doohbot extends DoohbotInput {
         }
         this.authService.login(credentials, false);
     }
+    onFederatedLogin(token) {
+        // Try to resolve Key from Subdomain
+        let autoKey = this.licenseService.resolveTenantLicenseKey();
+        // Fallback to Config Input
+        if (!autoKey) {
+            autoKey = this.config.licenseKey || '';
+        }
+        if (autoKey) {
+            this.authService.setLicenseKey(autoKey);
+        }
+        this.authService.federatedLogin({
+            accessToken: token,
+            rememberMe: true,
+            license: autoKey,
+        });
+    }
     performLogout() {
         DialogUtils.confirmLogout(this.dialogService).subscribe((confirmed) => {
             if (confirmed) {