@aakash58/chatbot 1.1.10 → 1.1.12

package/fesm2022/aakash58-chatbot.mjs

@@ -4305,46 +4305,28 @@ 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 currentUrl = `${protocol}//${hostname}${port}`;
-        // Use provided appBaseUrl or fallback to AppConst
-        const finalAppBaseUrl = appBaseUrl || AppConst.data?.appBaseUrl;
-        // Resolve tenancy name
+        // Attempt to resolve tenancy name using ABP utility
         let tenancyName = null;
-        // 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?.[1] ?? null;
+        try {
+            tenancyName =
+                window.AppPreBootstrap?.resolveTenancyName(window.AppConsts?.appBaseUrl || appBaseUrl) ||
+                    null;
         }
-        if (!tenancyName) {
-            // use first subdomain part as tenancy name
-            const parts = hostname.split('.');
-            if (parts.length > 2)
-                tenancyName = parts[0];
+        catch (e) {
+            Logger.error('[LicenseService] Error resolving tenancy name:', e);
         }
-        // If still not resolved, log and exit
+        Logger.info('[LicenseService] Detected tenancy name:', tenancyName);
         if (!tenancyName) {
             Logger.log('[LicenseService] Could not resolve tenancy name.');
             return null;
         }
-        Logger.log(`[LicenseService] Detected tenant: ${tenancyName}`);
-        // Lookup license key in registry ===
-        const reg = this.registry();
-        if (!reg)
-            return null;
-        const searchKey = `tenant:${tenancyName}`;
-        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 tenantLicenses['doohbot'];
-        }
-        return null;
+        Logger.info(`[LicenseService] Detected tenant: ${tenancyName}`);
+        // Lookup license key in registry
+        const tenantLicenses = this.registry()?.subjectLicenses.get(`tenant:${tenancyName}`);
+        const licenseKey = tenantLicenses?.['doohbot'] || null;
+        if (licenseKey)
+            Logger.log(`[LicenseService] Found Doohbot license for tenant: ${tenancyName}`);
+        return licenseKey;
     }
     /**
      * Check if a registry is currently loaded