@chat21/chat21-web-widget 5.1.0-rc13 → 5.1.0-rc16

package/CHANGELOG.md

@@ -6,6 +6,13 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.1.0-rc16
+- **added**: hideOnSpecificUrlList replaced in favour of hideOnSpecificDomainList
+
+# 5.1.0-rc15
+# 5.1.0-rc14
+- **added**: ability to hide widget on selected domains based on hideOnSpecificDomainList variable
+
 # 5.1.0-rc13
 - **added**: ability to manage embedded chatbot-panel.html page into an iframe and hide some elements
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.1.0-rc13",
+  "version": "5.1.0-rc16",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/app.component.ts

@@ -262,6 +262,14 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                 this.tabTitle = this.g.windowContext.window.document.title
                 this.appStorageService.initialize(environment.storage_prefix, this.g.persistence, this.g.projectid)
                 
+                //check if allowed to load
+                let canLoad = this.globalSettingsService.manageLoadingDomains();
+                if(!canLoad){
+                    console.error('[Check canLoad] Widget is not able to load on this domain!!!')
+                    this.hideWidget()
+                    this.disposeWidget();
+                }
+
                 //set visibility
                 if((this.g.isMobile && !this.g.displayOnMobile) || (!this.g.isMobile && !this.g.displayOnDesktop)){
                     this.disposeWidget()

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.ts

@@ -539,7 +539,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
   }
 
   checkForUrlDomain(text){
-    if(this.project && this.project.settings?.allowed_urls === true){
+    if(this.project && this.project.settings?.allowed_urls === true && this.project.settings?.allowed_urls_list){
       this.showAlertUrl = !isAllowedUrlInText(text, this.project.settings?.allowed_urls_list);
       if(this.showAlertUrl){
         return false

package/src/app/providers/global-settings.service.ts

@@ -10,7 +10,7 @@ import { TemplateBindingParseResult } from '@angular/compiler';
 import { AppStorageService } from '../../chat21-core/providers/abstract/app-storage.service';
 import { LoggerService } from '../../chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../../chat21-core/providers/logger/loggerInstance';
-import { invertColor, isJsonArray } from '../../chat21-core/utils/utils';
+import { invertColor, isAllowedUrlInText, isJsonArray } from '../../chat21-core/utils/utils';
 import { AppConfigService } from './app-config.service';
 
 
@@ -516,6 +516,12 @@ export class GlobalSettingsService {
                     if (variables.hasOwnProperty('showAudioRecorderFooterButton')) {
                         globals['showAudioRecorderFooterButton'] = variables['showAudioRecorderFooterButton'];
                     }
+                    if (variables.hasOwnProperty('hideOnSpecificUrl')) {
+                        globals['hideOnSpecificUrl'] = variables['hideOnSpecificUrl'];
+                    }
+                    if (variables.hasOwnProperty('hideOnSpecificUrlList')) {
+                        globals['hideOnSpecificUrlList'] = variables['hideOnSpecificUrlList'];
+                    }
                     
                 }
             }
@@ -1970,4 +1976,29 @@ export class GlobalSettingsService {
         }
     }
 
+    manageLoadingDomains(): boolean {
+
+        if(!this.globals.hideOnSpecificUrlList || !this.globals.hideOnSpecificUrl){
+            console.log('No hideOnSpecificUrlList or hideOnSpecificUrl');
+            return true
+        }
+
+        function wildcardToRegex(pattern: string): RegExp {
+            // Escape caratteri speciali della regex, tranne * che poi sostituiremo
+            const escaped = pattern.replace(/[-/\\^+?.()|[\]{}]/g, '\\$&');
+            // Sostituisci * con .*
+            const regexPattern = '^' + escaped.replace(/\*/g, '.*') + '$';
+            return new RegExp(regexPattern);
+        }
+        
+        const currentUrl = this.globals.windowContext.location.href;
+        const shouldHide = this.globals.hideOnSpecificUrlList.some(pattern => {
+            const regex = wildcardToRegex(pattern);
+            return regex.test(currentUrl);
+        });
+        
+        // let isAllowedToLoad = !isAllowedUrlInText(this.globals.windowContext.location.origin, this.globals.hideOnSpecificDomainList)
+        return !shouldHide
+    }
+
 }

package/src/app/utils/globals.ts

@@ -218,6 +218,9 @@ export class Globals {
   showEmojiFooterButton: boolean // *******  new ********
   showAttachmentFooterButton: boolean // *******  new ********
   showAudioRecorderFooterButton: boolean // *******  new ********
+
+  hideOnSpecificUrl: boolean // *******  new ********
+  hideOnSpecificUrlList: Array<string> // *******  new ********
   constructor(
   ) { }
 
@@ -417,6 +420,10 @@ export class Globals {
     this.showAttachmentFooterButton = true;
     /** show/hide rec audio option in footer chat-detail page */
     this.showAudioRecorderFooterButton = true;
+    /** enabled to set a list of domain not able to load the widget **/
+    this.hideOnSpecificUrl = false
+    /** set a list of domain not able to load the widget */
+    this.hideOnSpecificUrlList = [];
 
     // ============ END: SET EXTERNAL PARAMETERS ==============//
 

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -470,6 +470,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const that = this;
         const commands = msg.attributes.commands;
         let i=0;
+        if(commands.length === 0) return;
         return new Promise((resolve, reject)=>{
             function execute(command){
                 if(command.type === "message"){

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -465,6 +465,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const that = this;
         const commands = msg.attributes.commands;
         let i=0;
+        if(commands.length === 0) return;
         return new Promise((resolve, reject)=>{
             function execute(command){
                 if(command.type === "message"){

package/src/chat21-core/utils/utils.ts

@@ -619,7 +619,6 @@ function componentFromStr(numStr, percent) {
 
 export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
   const urlsInMessage = extractUrls(text);
-  console.log('urlsInMessage ++++ :', urlsInMessage);
 
   const allowedPatterns = allowedUrls.map((url) => {
     try {
@@ -634,6 +633,9 @@ export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
 
   const matchesAllowed = (domain: string) => {
     return allowedPatterns.some((pattern) => {
+      if (pattern === '*') {
+        return true; //accept all
+      }
       if (pattern.startsWith('*.')) {
         const base = pattern.replace(/^\*\./, '');
         return domain === base || domain.endsWith('.' + base);