@chat21/chat21-web-widget 5.0.71-rc.1 → 5.0.71-rc.12

package/src/assets/twp/index.html

@@ -14,11 +14,22 @@
         @-ms-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* IE */
         @keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Opera and prob css3 final iteration */
 
+        body{
+            --font-family-poppins: 'Poppins', 'Roboto', Arial, sans-serif;
+            --blu: #506493;
+            --gray-light-02: rgb(223, 227, 237);
+            --base-company-logo: rgb(224,106,88);
+            --header-height: 80px;
+            --footer-height: 80px;
+        }
+
         #preloader {
             background: #fff;
-            position: fixed;
+            position: absolute;
             top: 0;
             left: 0;
+            bottom: 0;
+            right: 0;
             height: 100%;
             width: 100%;
             z-index: 999999;
@@ -51,6 +62,52 @@
             animation:blink normal 2s infinite ease-in-out; /* Opera and prob css3 final iteration */
         }
 
+        .loader{
+            display: block;
+            z-index: 99;
+            position: absolute;
+            top: calc( 50% - 50px);
+            left: calc( 50% - 50px);
+            width: 100px;
+            height: 100px;
+            border: 3px solid var(--base-company-logo);
+            border-radius: 50%;
+
+            animation: spin 7s ease-in-out;
+            animation-iteration-count: infinite;
+            transition-duration: 0.1s;
+        }
+
+        .loader:hover {
+            scale: 0.95;
+            /*Loader on hover effect*/
+        }
+
+        .loader:active {
+            scale: 1.2;
+            /*Loader on click effect*/
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+                border-bottom: solid 3px transparent;
+                border-top: solid 3px transparent;
+            }
+            50% {
+                transform: rotate(1800deg);
+                border: 3px solid white;
+                border-left: solid 3px transparent;
+                border-right: solid 3px transparent;
+            }
+            100% {
+                /*Reversed spinning*/
+                transform: rotate(0deg);
+                border-bottom: solid 3px transparent;
+                border-top: solid 3px transparent;
+            }
+        }
+
         #deferred-styles {
             display: none;
         }
@@ -86,6 +143,17 @@
             height: 100%;
         }
 
+
+        .container{
+            display: flex;
+            align-items: center;
+            width: 100% !important;
+            justify-content: space-around;
+        }
+        #header-logo{
+            max-height: 45px;
+        }
+
         #wrapper {
             /* display: block!important; */
             min-height: 100%;
@@ -95,27 +163,17 @@
         #main {
             padding-bottom:100px;
             margin: 20px auto 0 auto;
+            /* width: 970px !important; */
+            justify-content: start;
         }
 
-        .row {
-            margin-left: 0;
-            margin-right: 0;
+        .navbar{
+            display: flex;
         }
 
-        .b_frame {
-            -webkit-box-shadow: 0px 19px 147px -41px rgba(0,0,0,0.75);
-            -moz-box-shadow: 0px 19px 147px -41px rgba(0,0,0,0.75);
-            box-shadow: 0px 19px 147px -41px rgba(0,0,0,0.75);
-            border: 0;
-            width: 400px;
-            height: 530px;
-            display: block;
-            margin: 0 auto;
-            margin-bottom: 40px;
-        }
-        .col-md-6 {
-            margin-top: 30px;
-            padding: 0;
+        .row {
+            margin-left: 0 !important;
+            margin-right: 0 !important;
         }
 
 
@@ -150,7 +208,7 @@
 
             /* position: relative;
             margin-top: -100px; negative value of footer height */
-            height: 80px;
+            height: var(--footer-height);
             clear:both;
 
             position: absolute;
@@ -159,7 +217,9 @@
         }
 
         .b-agent-demo_powered_by a {
-            display: inline-block;
+            display: inline-flex;
+            align-items: center;
+            gap: 10px;
             margin-top: 30px;
             margin-bottom: 30px;
             text-decoration: none;
@@ -173,8 +233,7 @@
         }
         .b-agent-demo_powered_by img {
             display: inline-block;
-            height: 24px;
-            /* margin-left: 20px; */
+            height: 40px;
         }
         
 
@@ -230,7 +289,9 @@
         
         window.Tiledesk('onBeforeInit', function(event_data) {
             console.log("onBeforeInit Tiledesk FN", event_data);
-            
+
+            var brandSrc = event_data.detail.appConfigs.brandSrc? getBrandResources(event_data.detail.appConfigs.brandSrc) : null;
+
             setTimeout(() => {
                 if(event_data && event_data.detail && event_data.detail.appConfigs){
                     
@@ -274,7 +335,6 @@
         }
         
 
-
         var currentUrl = window.location.href
         var baseUrl = window.location.origin
         function shareOnFacebook() {
@@ -337,6 +397,32 @@
                 '_blank' 
             );
         }
+
+        function getBrandResources(url) {
+            var xhr = new XMLHttpRequest();
+            xhr.onreadystatechange = function () {
+                if (xhr.readyState === 4) {
+                    var brandJson = JSON.parse(xhr.response)
+                    if(brandJson){
+                        /** TITLE AND FAVICON **/
+                        brandJson['WIDGET'].META_TITLE? document.body.title = brandJson['WIDGET'].META_TITLE : null;
+                        brandJson['WIDGET'].FAVICON_URL?  document.querySelector("link[rel~='icon']").setAttribute('href', brandJson['WIDGET'].FAVICON_URL) : null;
+                        /** FOOTER-LOGO **/    
+                        brandJson['COMMON'].COMPANY_LOGO? document.getElementById('footer-logo').src = brandJson['COMMON'].COMPANY_LOGO : null;
+                        brandJson['COMMON'].COMPANY_SITE_NAME? document.getElementById('footer-logo').alt = brandJson['COMMON'].COMPANY_SITE_NAME : null;
+                        brandJson['COMMON'].COMPANY_SITE_URL? document.getElementById('footer-link').href = brandJson['COMMON'].COMPANY_SITE_URL : null;
+                        /** HEADER-LOGO **/  
+                        brandJson['COMMON'].BASE_LOGO_WHITE? document.getElementById('header-logo').src = brandJson['COMMON'].BASE_LOGO_WHITE : null;
+                        /** HEADER-DOCS RESOURCES **/   
+                        document.getElementsByClassName('docs')[0].style.display = 'none'
+                    }
+                    
+                }
+            }
+            xhr.open('GET', url, true);
+            xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+            xhr.send();
+        }
                         
         var url = new URL(currentUrl);
         var tiledesk_projectid = url.searchParams.get("tiledesk_projectid");
@@ -383,8 +469,12 @@
 </head>
 
 <body class="website white" >
-    <div id="preloader">
+    <!-- <div id="preloader">
         <div class="logo"></div>
+    </div> -->
+
+    <div id="preloader">
+        <div class="loader"></div>
     </div>
 
     <div id="wrapper">
@@ -399,11 +489,11 @@
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
                         </button>
-                        <a class="navbar-brand" href="https://console.tiledesk.com/"></a>
+                        <img src="tiledesk_widget_files/logo.png" id="header-logo">
                     </div>
 
                     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                        <ul class="nav navbar-nav">
+                        <ul class="nav navbar-nav docs">
                             <li><a href="https://developer.tiledesk.com/widget/web-sdk" target="_blank">WEB SDK &amp; Docs<span></span></a></li>
                             <li><a href="https://www.tiledesk.com/pricing-cloud/" target="_blank">Pricing<span></span></a></li>
                             <li><a href="https://www.tiledesk.com/blog/" target="_blank">Blog<span></span></a></li>
@@ -422,16 +512,12 @@
         </header>
 
         <div id="main" class="container">
-            <div class="row">
-                <div class="col-md-6">
-                    <h1 id="project_name" style="min-height: 39px;"></h1>
-                    <h2></h2>
-                    <div class="b_integrations_agent_links">
-                        <a href="" data-toggle="modal" data-target="#embedModal" id="enbed" style="display: none;"><em class="fa-code fa"></em>Embed</a>
-                        <a href="" data-toggle="modal" data-target="#shareModal"><em class="fa-reply fa"></em>Share</a>
-                    </div>
-                </div>
-                <div class="col-md-6">
+            <div class="row" style="width: 100%;">
+                <h1 id="project_name" style="min-height: 39px;"></h1>
+                <h2></h2>
+                <div class="b_integrations_agent_links">
+                    <a href="" data-toggle="modal" data-target="#embedModal" id="enbed" style="display: none;"><em class="fa-code fa"></em>Embed</a>
+                    <a href="" data-toggle="modal" data-target="#shareModal"><em class="fa-reply fa"></em>Share</a>
                 </div>
             </div>
 
@@ -512,9 +598,9 @@
 
     <footer id="footer">
         <div class="b-agent-demo_powered_by">
-            <a href="https://console.tiledesk.com/" target="_blank" style="cursor: pointer;text-decoration: none;">
+            <a href="https://tiledesk.com/" target="_blank" style="cursor: pointer;text-decoration: none;" id="footer-link">
                 <span style="position: relative; top: 2px;">Powered by</span>
-                <img src="./tiledesk_widget_files/logo@2x-black.png" alt="Tiledesk">
+                <img src="./tiledesk_widget_files/logo@2x-black.png" alt="Tiledesk" id="footer-logo">
             </a>
         </div>
     </footer>

package/src/chat21-core/models/upload.ts

@@ -5,7 +5,6 @@ export class UploadModel {
   url: string;
   progress: number;
   createdAt: Date = new Date();
-  
   constructor(file: File) {
     this.file = file;
   }

package/src/chat21-core/providers/abstract/upload.service.ts

@@ -29,4 +29,7 @@ export abstract class UploadService {
   // functions
   abstract initialize(): void;
   abstract upload(userId: string, upload: UploadModel): Promise<any>;
+  abstract uploadProfile(userId: string, upload: UploadModel): Promise<any>;
+  abstract delete(userId: string, path: string): Promise<any>;
+  abstract deleteProfile(userId: string, path: string): Promise<any>
 }

package/src/chat21-core/providers/firebase/firebase-auth-service.ts

@@ -131,8 +131,8 @@ export class FirebaseAuthService extends MessagingAuthService {
         break;
       }
     }
-    return this.firebase.auth().setPersistence(firebasePersistence).then(async () => {
-      return this.firebase.auth().signInWithCustomToken(token).then(async () => {
+    return that.firebase.auth().setPersistence(firebasePersistence).then(async () => {
+      return that.firebase.auth().signInWithCustomToken(token).then(async () => {
         // that.firebaseSignInWithCustomToken.next(response);
       }).catch((error) => {
         that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
@@ -181,7 +181,7 @@ export class FirebaseAuthService extends MessagingAuthService {
    */
   private signOut(): Promise<boolean> {
     const that = this;
-    return new Promise((resolve, reject)=> {this.firebase.auth().signOut().then(() => {
+    return new Promise((resolve, reject)=> {that.firebase.auth().signOut().then(() => {
       that.logger.debug('[FIREBASEAuthSERVICE] firebase-sign-out');
         // cancello token
         // this.appStorage.removeItem('tiledeskToken');

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

@@ -1,5 +1,3 @@
-import { LIVE_PAGE, MEMBER_LEFT_GROUP, TOUCHING_OPERATOR } from './../../utils/constants';
-
 import { Inject, Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -17,14 +15,10 @@ import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO, LEAD_UPDATED } from '../../utils/constants';
-import {
-  compareValues,
-  searchIndexInArrayForUid,
-  conversationMessagesRef  
-} from '../../utils/utils';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
-import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender } from '../../utils/utils-message';
+import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
 
 // @Injectable({ providedIn: 'root' })
 @Injectable()
@@ -377,10 +371,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         const INFO_SUPPORT_LIVE_PAGE = this.translationMap.get('INFO_SUPPORT_LIVE_PAGE');
 
-        if (message.attributes.messagelabel
-            && message.attributes.messagelabel.parameters
-            && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
-        ) {
+        if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP && message.attributes.messagelabel.parameters) {
             let subject: string;
             let verb: string;
             let complement: string;
@@ -403,18 +394,18 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 }
             }
             message.text = subject + ' ' + verb + ' ' + complement;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_REOPENED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_REOPENED ) {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_CLOSED ) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
-        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+        } else if ((infoMessageType(message) === INFO_MESSAGE_TYPE.TOUCHING_OPERATOR) && message.sender === "system") {
             const textAfterColon = message.text.split(":")[1]
             if (textAfterColon !== undefined) {
                 message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
             }
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.LEAD_UPDATED) {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP) {
             let subject: string = '';
             if (message.attributes.messagelabel.parameters.fullname) {
                 subject = message.attributes.messagelabel.parameters.fullname;
@@ -422,7 +413,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 subject = message.attributes.messagelabel.parameters.member_id;
             }
             message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
-        } else if(message.attributes.messagelabel && message.attributes.messagelabel.key === LIVE_PAGE){
+        } else if(infoMessageType(message) === INFO_MESSAGE_TYPE.LIVE_PAGE){
             let sourceUrl: string = '';
             if(message.attributes && message.attributes.sourcePage){
                 sourceUrl = message.attributes.sourcePage 
@@ -447,7 +438,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         if (msg.status < MSG_STATUS_RECEIVED ) { // && !msg.attributes.commands
             //get message uid from attributes.parentUid if msg is a splitted one, from msg.uid otherwize
             let uid = msg.uid
-            msg.attributes.commands? uid = msg.attributes.parentUid: null 
+            msg.attributes && msg.attributes.commands? uid = msg.attributes.parentUid: null 
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
                 const urlNodeMessagesUpdate  = this.urlNodeFirebase + '/' + uid;
                 this.logger.debug('[FIREBASEConversationHandlerSERVICE] update message status', urlNodeMessagesUpdate);

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

@@ -230,6 +230,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     archiveConversation(conversationId: string) {
         const that = this
         this.setClosingConversation(conversationId, true);
+        this.setConversationRead(conversationId)
         const index = searchIndexInArrayForUid(this.conversations, conversationId);
         // if (index > -1) {
         //     this.conversations.splice(index, 1);
@@ -478,7 +479,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     private changed(childSnapshot: any) {
         const oldConversation = this.conversations[searchIndexInArrayForUid(this.conversations, childSnapshot.key)]
         //skip info message updates
-        if(messageType(MESSAGE_TYPE_INFO, oldConversation) ){
+        if(messageType(MESSAGE_TYPE_INFO, childSnapshot.val()) ){
             return;
         }
         if (this.conversationGenerate(childSnapshot)) {

package/src/chat21-core/providers/firebase/firebase-upload.service.ts

@@ -39,6 +39,14 @@ export class FirebaseUploadService extends UploadService {
     this.firebase = firebase
 
   }
+
+  private createGuid() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      // tslint:disable-next-line:no-bitwise
+      const r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
+      return v.toString(16);
+    });
+  }
   
   public upload(userId: string, upload: UploadModel): Promise<any> {
     const that = this;
@@ -97,12 +105,126 @@ export class FirebaseUploadService extends UploadService {
 
   }
 
-  private createGuid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-      // tslint:disable-next-line:no-bitwise
-      const r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
+  public uploadProfile(userId: string, upload: UploadModel): Promise<any>  {
+    const that = this;
+    const urlImagesNodeFirebase = '/profiles/' + userId + '/photo.jpg'
+    this.logger.debug('[FIREBASEUploadSERVICE] uploadProfile ', urlImagesNodeFirebase, upload.file);
+
+    // Create a root reference
+    const storageRef = this.firebase.storage().ref();
+    this.logger.debug('[FIREBASEUploadSERVICE] storageRef', storageRef);
+
+    // Create a reference to 'mountains.jpg'
+    const mountainsRef = storageRef.child(urlImagesNodeFirebase);
+    this.logger.debug('[FIREBASEUploadSERVICE] mountainsRef ', mountainsRef);
+
+    // const metadata = {};
+    const metadata = { name: upload.file.name, contentType: upload.file.type, contentDisposition: 'attachment; filename=' + upload.file.name };
+
+    let uploadTask = mountainsRef.put(upload.file, metadata);
+
+    return new Promise((resolve, reject) => {
+      uploadTask.on('state_changed', function progress(snapshot) {
+        // Observe state change events such as progress, pause, and resume
+        // Get task progress, including the number of bytes uploaded and the total number of bytes to be uploaded
+        var progress = (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
+        that.logger.debug('[FIREBASEUploadSERVICE] Upload is ' + progress + '% done');
+        
+        // ----------------------------------------------------------------------------------------------------------------------------------------------
+        // BehaviorSubject publish the upload progress state - the subscriber is in ion-conversastion-detail.component.ts > listenToUploadFileProgress()
+        // ----------------------------------------------------------------------------------------------------------------------------------------------
+      
+        that.BSStateUpload.next({ upload: progress, type: upload.file.type });
+        
+        switch (snapshot.state) {
+          case that.firebase.storage.TaskState.PAUSED: // or 'paused'
+            that.logger.debug('[FIREBASEUploadSERVICE] Upload is paused');
+            
+            break;
+          case that.firebase.storage.TaskState.RUNNING: // or 'running'
+            that.logger.debug('[FIREBASEUploadSERVICE] Upload is running');
+            
+            break;
+        }
+      }, function error(error) {
+        // Handle unsuccessful uploads
+        reject(error)
+      }, function complete() {
+        // Handle successful uploads on complete
+        that.logger.debug('[FIREBASEUploadSERVICE] Upload is complete', upload);
+       
+        resolve(uploadTask.snapshot.ref.getDownloadURL())
+        // that.BSStateUpload.next({upload: upload});
+
+      });
+    })
+
+  }
+
+  public async delete(userId: string, path: string): Promise<any>{
+    const that = this;
+    const file_name_photo = 'photo.jpg';
+    const file_name_thumb_photo = 'thumb_photo.jpg';
+
+    that.logger.debug('[FIREBASEUploadSERVICE] delete image for USER', userId, path);
+
+    let uid = path.split(userId)[1].split('%2F')[1]; // get the UID of the image
+    let imageName = path.split(uid + '%2F')[1].split('?')[0];
+
+    // Create a root reference
+    const storageRef = this.firebase.storage().ref();
+    const ref = storageRef.child('public/images/' + userId + '/'+ uid + '/')
+    let arrayPromise = []
+    await ref.listAll().then((dir => {
+      dir.items.forEach(fileRef => arrayPromise.push(this.deleteFile(ref.fullPath, fileRef.name)));
+    })).catch(error => {
+      that.logger.error('[FIREBASEUploadSERVICE] delete: listAll error', error)
+    })
+
+    //AWAIT to return ALL the promise delete()
+    return new Promise((resolve, reject)=> {
+      Promise.all(arrayPromise).then(()=>{
+        resolve(true)
+      }).catch((error)=>{
+        reject(error)
+      })
+    })
+  }
+
+  public async deleteProfile(userId: string, path: string): Promise<any>{
+    const that = this;
+    const file_name_photo = 'photo.jpg';
+    const file_name_thumb_photo = 'thumb_photo.jpg';
+
+    that.logger.debug('[FIREBASEUploadSERVICE] delete image for USER', userId, path);
+
+    // Create a root reference
+    const storageRef = this.firebase.storage().ref();
+    const ref = storageRef.child('profiles/' + userId + '/')
+    let arrayPromise = []
+    await ref.listAll().then((dir => {
+      dir.items.forEach(fileRef => arrayPromise.push(this.deleteFile(ref.fullPath, fileRef.name)));
+    })).catch(error => {
+      that.logger.error('[FIREBASEUploadSERVICE] delete: listAll error', error)
+    })
+
+    //AWAIT to return ALL the promise delete()
+    return new Promise((resolve, reject)=> {
+      Promise.all(arrayPromise).then(()=>{
+        resolve(true)
+      }).catch((error)=>{
+        reject(error)
+      })
+    })
+  }
+
+  // // ------------------------------------
+  // // Delete the file photo
+  // // ------------------------------------
+  private deleteFile(pathToFile, fileName){
+    const ref = this.firebase.storage().ref(pathToFile);
+    const childRef = ref.child(fileName);
+    return childRef.delete()
   }
 
 }

package/src/chat21-core/providers/mqtt/mqtt-auth-service.ts

@@ -263,7 +263,7 @@ z
     this.logger.debug('[MQTTAuthService] connectMQTT: **** credentials:', credentials);
     const userid = credentials.userid;
     this.chat21Service.chatClient.connect(userid, credentials.token, () => {
-      this.logger.debug('[MQTTAuthService] connectMQTT: Chat connected.');
+      this.logger.debug('[MQTTAuthService] connectMQTT: Chat connected');
       this.BSAuthStateChanged.next('online');
     });
   }

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

@@ -1,5 +1,3 @@
-import { async } from '@angular/core/testing';
-import { LIVE_PAGE, TOUCHING_OPERATOR } from './../../utils/constants';
 import { Inject, Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -17,15 +15,10 @@ import { UserModel } from '../../models/user';
 import { ConversationHandlerService } from '../abstract/conversation-handler.service';
 
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO, LEAD_UPDATED, MEMBER_LEFT_GROUP } from '../../utils/constants';
-import {
-  htmlEntities,
-  compareValues,
-  searchIndexInArrayForUid,
-  conversationMessagesRef
-} from '../../utils/utils';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { compareValues, searchIndexInArrayForUid } from '../../utils/utils';
+import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
 import { v4 as uuidv4 } from 'uuid';
-import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender } from '../../utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -373,10 +366,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
         const INFO_SUPPORT_LIVE_PAGE = this.translationMap.get('INFO_SUPPORT_LIVE_PAGE');
         
-        if (message.attributes.messagelabel
-            && message.attributes.messagelabel.parameters
-            && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
-        ) {
+        if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_JOINED_GROUP && message.attributes.messagelabel.parameters ) {
             let subject: string;
             let verb: string;
             let complement: string;
@@ -398,20 +388,20 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 }
             }
             message.text = subject + ' ' + verb + ' ' + complement;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_REOPENED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.CHAT_REOPENED) {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
+        } else if (infoMessageType(message) ===  INFO_MESSAGE_TYPE.CHAT_CLOSED) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
-        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+        } else if ((infoMessageType(message) ===INFO_MESSAGE_TYPE.TOUCHING_OPERATOR) && message.sender === "system") {
             // console.log('FIREBASEConversationHandlerSERVICE message text', message.text)
             const textAfterColon = message.text.split(":")[1]
             // console.log('FIREBASEConversationHandlerSERVICE message text - textAfterColon', textAfterColon)
             if (textAfterColon !== undefined) {
                 message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
             }
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.LEAD_UPDATED) {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
-        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+        } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP) {
            let subject: string;
            if (message.attributes.messagelabel.parameters.fullname) {
                subject = message.attributes.messagelabel.parameters.fullname;
@@ -419,7 +409,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                subject = message.attributes.messagelabel.parameters.member_id;
            }
            message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
-        } else if(message.attributes.messagelabel && message.attributes.messagelabel.key === LIVE_PAGE){
+        } else if(infoMessageType(message) === INFO_MESSAGE_TYPE.LIVE_PAGE){
             let sourceUrl: string = '';
             if(message.attributes && message.attributes.sourcePage){
                 sourceUrl = message.attributes.sourcePage 
@@ -444,7 +434,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         if (msg['status'] < MSG_STATUS_RECEIVED && msg['status'] > 0) {
             this.logger.log('[MQTTConversationHandlerSERVICE] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
             let uid = msg.uid
-            msg.attributes.commands? uid = msg.attributes.parentUid: null 
+            msg.attributes && msg.attributes.commands? uid = msg.attributes.parentUid: null 
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
                 this.logger.log('[MQTTConversationHandlerSERVICE] updating message with status received');
                 this.chat21Service.chatClient.updateMessageStatus(uid, this.conversationWith, MSG_STATUS_RECEIVED, null);