@chat21/chat21-web-widget 5.0.71-rc.2 → 5.0.71-rc.5

package/.github/workflows/build.yml

@@ -3,8 +3,8 @@ on:
   push:
     branches:
       - master # The default branch
-      - branch-*   # The other branches to be analyzed
-      - features/*
+      - (branch|release)-.*   # The other branches to be analyzed
+      - (features|release)/.*
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # chat21-web-widget ver 5.0
 
+### 5.0.71-rc.5
+- bug-fixed: last-message box is visible also if text is empty
+
+### 5.0.71-rc.4
+- added: uploadProfile method into upload.service files
+- bug-fixed: if hiddenMessage is present and user restart conversation from header menu, flow does not restart from beginning
+- bug-fixed: do not disable url buttons on carousel element
+- bug-fixed: do not sound if convAdded is fired and on reconnect event
+- bug-fixed: init Rules only if widget is closed
+- removed: 'Powereb By Tiledesk' on conversation and home components only for cahtbot-panel.html page
+
+### 5.0.71-rc.3
+- added: delete method for firebase-upload service
+- added: size attribute to metadata object while uploading file 
+- bug-fixed: cannot read property of undefined while reading auth() in onOpenCloseWidget method with singleConversation mode active
+
 ### 5.0.71-rc.2
 - added: hiddenMessage tiledesk property to start a conversation with an hidden info message
 - added: ability to listen from parent message and start a new Conversation with an hidden intentName info message

package/Dockerfile

@@ -15,7 +15,7 @@ COPY . .
 
 ## Build the angular app in production mode and store the artifacts in dist folder
 
-RUN npm run ng build -- --configuration="prod" --output-path=dist --base-href="./" --output-hashing=none --build-optimizer=false --vendor-chunk
+RUN npm run ng build --configuration="prod" --output-path=dist --base-href="./" --output-hashing=none --build-optimizer=false --vendor-chunk
 
 
 ### STAGE 2: Setup ###

package/deploy_amazon_beta.sh

@@ -2,7 +2,12 @@
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 
-ng build --configuration="pre" --aot=true --base-href --output-hashing none --build-optimizer=true
+ng build --configuration="pre" --aot=true --base-href --build-optimizer=true
+
+### SET HASHING : START ###
+cp ./src/launch_template.js ./dist/launch.js
+node ./src/build_launch.js
+### SET HASHING : END ###
 
 # ########## --->>>> NATIVE-MQTT folder START <<<<<------ ########## #
 
@@ -23,11 +28,13 @@ ng build --configuration="pre" --aot=true --base-href --output-hashing none --bu
 
 # ########## --->>>> FIREBASE folder START <<<<<------ ########## #
 cd dist
-aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control max-age=300
-aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control max-age=300
+aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control max-age=300 --exclude='launch.js' #7days
+aws s3 sync . s3://tiledesk-widget-pre/v5/$version/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
+aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control max-age=300 --exclude='launch.js' #7days
+aws s3 sync . s3://tiledesk-widget-pre/v5/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
 cd ..
 
-#aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"
+aws  cloudfront create-invalidation --distribution-id E2V5O0YPR61V8P --paths "/*"
 # echo new version deployed $NEW_VER/$NEW_BUILD/ on s3://tiledesk-widget-pre/v2
 echo new version deployed $version/ on s3://tiledesk-widget-pre/v5 and s3://tiledesk-widget-pre/v5/$version/
 echo available on https://s3.eu-west-1.amazonaws.com/tiledesk-widget-pre/v5/index.html

package/deploy_amazon_prod.sh

@@ -3,7 +3,13 @@ version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 
 # --build-optimizer=false if localstorage is disabled (webview) appears https://github.com/firebase/angularfire/issues/970
-ng build --configuration="prod" --aot=true --base-href --output-hashing none --build-optimizer=true --vendor-chunk=true
+ng build --configuration="prod" --aot=true   --build-optimizer=true --vendor-chunk=true
+##--base-href='./v5/' --output-hashing none
+
+### SET HASHING : START ###
+cp ./src/launch_template.js ./dist/launch.js
+node ./src/build_launch.js
+### SET HASHING : END ###
 
 #### FIREBASE #####
 # cd dist
@@ -12,12 +18,13 @@ ng build --configuration="prod" --aot=true --base-href --output-hashing none --b
 # aws s3 sync . s3://tiledesk-widget/v5/ --cache-control max-age=300
 # cd ..
 
-
 # #### MQTT #####
 cd dist
 # aws s3 sync . s3://tiledesk-widget/v5/latest/
-aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control max-age=300
-aws s3 sync . s3://tiledesk-widget/v6/ --cache-control max-age=300
+aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control max-age=86400 --exclude='launch.js' #8days
+aws s3 sync . s3://tiledesk-widget/v6/$version/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
+aws s3 sync . s3://tiledesk-widget/v6/ --cache-control max-age=86400 --exclude='launch.js' #8days
+aws s3 sync . s3://tiledesk-widget/v6/ --cache-control "no-store,no-cache,private" --exclude='*' --include='launch.js'
 cd ..
 
 aws  cloudfront create-invalidation --distribution-id E3EJDWEHY08CZZ --paths "/*"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.71-rc.2",
+  "version": "5.0.71-rc.5",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/app.component.ts

@@ -140,7 +140,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
             const that = this;
             const subChangedConversation = this.conversationsHandlerService.conversationChanged.subscribe((conversation) => {
                 // that.ngZone.run(() => {
-                if (conversation) {
+               if (conversation) {
                     this.onImageLoaded(conversation)
                     this.onConversationLoaded(conversation)
 
@@ -148,9 +148,9 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                         that.disposeWidget();
                         return;
                     }
-    
+
                     if(conversation.is_new && conversation.sender !== this.g.senderId && !isInfo(conversation)){
-                        that.manageTabNotification();
+                        that.manageTabNotification(conversation.sound);
                     }
 
                     if (that.g.isOpen === true) {
@@ -196,7 +196,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                         return;
                     }
                     if (conversation.is_new) {
-                        that.manageTabNotification()
+                        that.manageTabNotification(false)
                         // this.soundMessage(); 
                     }
                     if(this.g.isOpen === false){
@@ -421,7 +421,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                     that.showWidget();
                 }
 
-                if(this.g.botsRules){
+                if(this.g.botsRules && !this.g.isOpen){
                     const rules = new Rules(that.tiledeskRequestsService, that.appStorageService,that.g)
                     rules.initRules(that.g.windowContext, that.g.tiledeskToken, user, that.generateNewUidConversation(), that.g.botsRules)
                 }
@@ -714,6 +714,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
         this.isConversationArchived = false;
         
         /** allow to start conversation with an hidden message (without publishing 'new_conversation' event) */
+        this.logger.debug('[APP-COMP] AppComponent::startNewConversation hiddenMessage',this.g.hiddenMessage );
         if(this.g.hiddenMessage){
             this.onNewConversationWithMessage(this.g.hiddenMessage)
             return;
@@ -910,7 +911,6 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
             }).then((res)=> { this.showWidget() });
             return;
         }
-
         this.conversationsHandlerService.getLastConversation((conv, error)=> {
             this.logger.debug('[APP-COMP] getConverationRESTApi: conversation from rest API --> ', conv)
             if(error){
@@ -1473,7 +1473,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
         }
     }
 
-    private manageTabNotification() {
+    private manageTabNotification(canSound: boolean) {
         if (!this.isTabVisible) {
             // TAB IS HIDDEN --> manage title and SOUND 
             // this.g.windowContext.parent.title = "HIDDEN"
@@ -1493,7 +1493,8 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                 }
             }, 1000);
         }
-        this.soundMessage()
+        if(canSound)
+            this.soundMessage()
     }
 
 
@@ -1552,7 +1553,8 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                 if(this.g.singleConversation){
                     this.isOpenHome = false;
                     this.g.setParameter('isOpenPrechatForm', false)
-                    this.manageWidgetSingleConversation()
+                    this.initConversationsHandler(this.g.tenant, this.g.senderId)
+                    // this.manageWidgetSingleConversation()
                 } else if (this.g.startFromHome) {
                     this.isOpenHome = true;
                     this.isOpenConversation = false;
@@ -1842,6 +1844,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
      */
     onNewConversationButtonClicked(event){
         this.logger.debug('[APP-COMP] onNewConversationButtonClicked');
+        this.g.setParameter('hiddenMessage', null)
         
         this.isOpenConversation = false;
         this.g.singleConversation? this.isOpenHome = false: null;

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

@@ -16,7 +16,6 @@ import {
 import { MessageModel } from 'src/chat21-core/models/message';
 
 // utils
-import { isPopupUrl } from 'src/app/utils/utils';
 import { v4 as uuidv4 } from 'uuid';
 
 
@@ -41,7 +40,7 @@ import { CustomTranslateService } from 'src/chat21-core/providers/custom-transla
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { TiledeskRequestsService } from 'src/chat21-core/providers/tiledesk/tiledesk-requests.service';
 import { LIVE_PAGE } from 'src/chat21-core/utils/constants';
-import { getDateDifference, popupUrl } from 'src/chat21-core/utils/utils';
+import { getDateDifference } from 'src/chat21-core/utils/utils';
 import { isJustRecived, isUserBanned } from 'src/chat21-core/utils/utils-message';
 import { AppComponent } from '../../../app.component';
 import { ConversationContentComponent } from '../conversation-content/conversation-content.component';
@@ -113,11 +112,6 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   isOpenAttachmentPreview: Boolean = false;
   attachments: Array<{ file: Array<any>, metadata: {}}>
 
-  
-  
-  isPopupUrl = isPopupUrl;
-  popupUrl = popupUrl;
-
   // availableAgentsStatus = false; // indica quando è impostato lo stato degli agenti nel subscribe
   messages: Array<MessageModel> = [];
 

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

@@ -5,7 +5,6 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { MESSAGE_TYPE_INFO, MESSAGE_TYPE_MINE, MESSAGE_TYPE_OTHERS } from 'src/chat21-core/utils/constants';
-import { isPopupUrl, popupUrl } from 'src/chat21-core/utils/utils';
 import { isCarousel, isEmojii, isFirstMessage, isFrame, isImage, isInfo, isLastMessage, isMine, isSameSender, messageType } from 'src/chat21-core/utils/utils-message';
 
 @Component({
@@ -43,8 +42,6 @@ export class ConversationContentComponent implements OnInit {
   // ========= end:: gestione scroll view messaggi ======= //
 
   // ========= begin:: dichiarazione funzioni ======= //
-  isPopupUrl = isPopupUrl;
-  popupUrl = popupUrl;
   isCarousel = isCarousel;
   // ========= end:: dichiarazione funzioni ======= //
 

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

@@ -131,6 +131,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
         if (event.target.files && event.target.files[0]) {
             const nameFile = event.target.files[0].name;
             const typeFile = event.target.files[0].type;
+            const size = event.target.files[0].size
             const reader = new FileReader();
               that.logger.debug('[CONV-FOOTER] OK preload: ', nameFile, typeFile, reader);
               reader.addEventListener('load', function () {
@@ -146,7 +147,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
                     that.logger.debug('[CONV-FOOTER] onload image');
                     // that.arrayFilesLoad.push(imageXLoad);
                     const uid = (new Date().getTime()).toString(36); // imageXLoad.src.substring(imageXLoad.src.length - 16);
-                    that.arrayFilesLoad[0] = { uid: uid, file: imageXLoad, type: typeFile };
+                    that.arrayFilesLoad[0] = { uid: uid, file: imageXLoad, type: typeFile, size: size };
                     that.logger.debug('[CONV-FOOTER] OK: ', that.arrayFilesLoad[0]);
                     // SEND MESSAGE
                     that.loadFile();
@@ -159,7 +160,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
                   };
                   // that.arrayFilesLoad.push(imageXLoad);
                   const uid = (new Date().getTime()).toString(36); // imageXLoad.src.substring(imageXLoad.src.length - 16);
-                  that.arrayFilesLoad[0] = { uid: uid, file: fileXLoad, type: typeFile };
+                  that.arrayFilesLoad[0] = { uid: uid, file: fileXLoad, type: typeFile, size: size };
                   that.logger.debug('[CONV-FOOTER] OK: ', that.arrayFilesLoad[0]);
                   // SEND MESSAGE
                   that.loadFile();
@@ -182,6 +183,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
             const fileXLoad = this.arrayFilesLoad[0].file;
             const uid = this.arrayFilesLoad[0].uid;
             const type = this.arrayFilesLoad[0].type;
+            const size = this.arrayFilesLoad[0].size
             this.logger.debug('[CONV-FOOTER] that.fileXLoad: ', type);
             let metadata;
             if (type.startsWith('image') && !type.includes('svg')) {
@@ -191,14 +193,16 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
                     'width': fileXLoad.width,
                     'height': fileXLoad.height,
                     'type': type,
-                    'uid': uid
+                    'uid': uid,
+                    'size': size
                 };
             } else {
                 metadata = {
                     'name': fileXLoad.title,
                     'src': fileXLoad.src,
                     'type': type,
-                    'uid': uid
+                    'uid': uid,
+                    'size': size
                 };
             }
             this.logger.debug('[CONV-FOOTER] metadata -------> ', metadata);

package/src/app/component/last-message/last-message.component.scss

@@ -110,7 +110,7 @@
     margin-left: 45px;
     margin-right: 16px;
     border-radius: 12px 12px 12px 12px;
-    padding: 5px;
+    padding: 0px 5px;
 }
 
 .previewNewMessagge.no-background{

package/src/app/component/message/carousel/carousel.component.html

@@ -22,7 +22,7 @@
                 <div class="buttons" *ngIf="card?.buttons && card?.buttons.length > 0">
                     <div *ngFor="let button of card?.buttons" 
                         class="single-button action"
-                        [ngClass]="{'disabled': (isConversationArchived || !isLastMessage), 'active': button?.active}"
+                        [ngClass]="{'disabled': (isConversationArchived || button.type !== TYPE_BUTTON.URL), 'active': button?.active}"
                         (click)="actionButtonClick($event, button, i)" >
                         {{button.value}}
                     </div>

package/src/app/component/message/carousel/carousel.component.ts

@@ -1,5 +1,6 @@
 import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SimpleChange, SimpleChanges, ViewChildren } from '@angular/core';
 import { MessageModel } from 'src/chat21-core/models/message';
+import { TYPE_BUTTON } from 'src/chat21-core/utils/constants';
 import { isCarousel } from 'src/chat21-core/utils/utils-message';
 
 @Component({
@@ -31,7 +32,7 @@ export class CarouselComponent implements OnInit{
   hoverTextColor: string;
   type: string;
   button: any;
-
+  TYPE_BUTTON = TYPE_BUTTON;
   constructor(private elementRef: ElementRef) { }
 
   ngOnInit() {

package/src/app/component/message/image/image.component.ts

@@ -1,6 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { saveAs } from 'file-saver';
-import { popupUrl } from 'src/chat21-core/utils/utils';
 
 @Component({
   selector: 'chat-image',
@@ -16,9 +15,7 @@ export class ImageComponent implements OnInit {
 
   loading: boolean = true
   tooltipMessage: string;
-  
 
-  popupUrl = popupUrl;
   
   constructor() { }
 

package/src/app/utils/constants.ts

@@ -65,8 +65,6 @@ export const FIREBASESTORAGE_BASE_URL_IMAGE = 'https://firebasestorage.googleapi
 export const IMG_PROFILE_BOT = '/assets/images/avatar_bot_tiledesk.svg';
 export const IMG_PROFILE_DEFAULT = '/assets/images/avatar_male_tiledesk.svg';
 
-// localstorage
-export const STORAGE_PREFIX = 'widget_';
 
 // start conversation bot (proxy)
 export const PROXY_MSG_START = '__start';

package/src/app/utils/globals.ts

@@ -123,7 +123,6 @@ export class Globals {
   LABEL_PREVIEW: string;
 
   // ============ BEGIN: EXTERNAL PARAMETERS ==============//
-   globalsParameters: any;
    autoStart: boolean;
    startHidden: boolean;
    isShown: boolean;
@@ -228,7 +227,6 @@ export class Globals {
    * 1: initParameters
    */
   initDefafultParameters() {
-    this.globalsParameters = {};
 
     let wContext: any = window;
     if (window.frameElement && window.frameElement.getAttribute('tiledesk_context') === 'parent') {

package/src/app/utils/rules.ts

@@ -11,7 +11,7 @@ import { Globals } from './globals';
 
 @Injectable({
     providedIn: 'root'
-  })
+})
 export class Rules {
 
     private windowContext:Window = window

package/src/assets/twp/chatbot-panel.html

@@ -368,8 +368,7 @@
         });
         
         window.Tiledesk('onBeforeInit', function(event_data) {
-            console.log("onBeforeInit Tiledesk FN", event_data);
-            
+            // console.log("onBeforeInit Tiledesk FN", event_data);
             setTimeout(() => {
                 document.getElementById("preloader").style.display = "none";
                 if(event_data && event_data.detail && event_data.detail.appConfigs){
@@ -387,7 +386,8 @@
         });
         
         window.Tiledesk('onInit', function(event_data) {
-            console.log("onInit Tiledesk FN", event_data); 
+            // console.log("onInit Tiledesk FN", event_data); 
+            window.Tiledesk('setParameter', {key: 'poweredBy', value: ''})
             // setTimeout(() => {
             //     document.getElementById("preloader").style.display = "none";
             // }, 1000);
@@ -400,7 +400,7 @@
         });
 
         window.Tiledesk('onAuthStateChanged', function(event_data) {
-        	console.log("AUTHENTICATED!", event_data);
+        	// console.log("AUTHENTICATED!", event_data);
        		// if(event_data.detail.isLogged){
             // 	console.log("isLogged!!!!", event_data);
             // 	window.Tiledesk('show')
@@ -408,7 +408,7 @@
         });
 
         window.Tiledesk('onMessageCreated', function(event_data) {
-        	console.log("onMessageCreated!", event_data);
+        	// console.log("onMessageCreated!", event_data);
             window.parent.postMessage(event_data.detail, '*')
        		// if(event_data.detail.isLogged){
             // 	console.log("isLogged!!!!", event_data);

package/src/assets/twp/index-dev.html

@@ -610,7 +610,7 @@
                 TelegramShareUrl,
                 '_blank' 
             );
-         }
+        }
 
         function shareOnWhatsapp() {            
             var WhatsappShareUrl = "whatsapp://send?text=" + currentUrl;
@@ -640,6 +640,7 @@
             }else{
                 window.Tiledesk(event);
             }
+            window.Tiledesk('setParameter', {key: 'poweredBy', value: ''})
         }
 
         function onClickSignInAnonymous(){

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-conversations-handler.ts

@@ -478,7 +478,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-conversations-handler.ts

@@ -334,6 +334,11 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
                 // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
                 conv.type = snap[k];
             }
+            if (k === 'conversation_with_fullname') {
+                // this.logger.debug('[MQTTConversationsHandler] aggiorno key:' + k);
+                conv.conversation_with_fullname = snap[k];
+            }
+            conv = this.completeConversation(conv)
 
         });
     }

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

@@ -77,4 +77,72 @@ export class NativeUploadService extends UploadService {
         }
         
     }
+
+    uploadProfile(userId: string, upload: UploadModel): Promise<any> {
+        this.logger.log('[NATIVE UPLOAD] - upload new photo profile  ... upload', upload)
+        const headers = new HttpHeaders({
+          Authorization: this.tiledeskToken,
+          // 'Content-Type': 'multipart/form-data',
+        });
+        const requestOptions = { headers: headers };
+        const formData = new FormData();
+        formData.append('file', upload.file);
+
+        // USE IMAGE API
+        const that = this;
+        const url = this.URL_TILEDESK_IMAGES + `/users/photo?force=true&user_id=${userId}`
+        return new Promise((resolve, reject) => {
+            that.http.put(url, formData, requestOptions).subscribe(data => {
+                const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['thumbnail'];
+                resolve(downloadURL)
+                // that.BSStateUpload.next({upload: upload});
+            }, (error) => {
+                reject(error)
+            });
+        });
+    }
+
+    delete(userId: string, path: string): Promise<any>{
+        this.logger.log('[NATIVE UPLOAD] - delete image ... upload', userId)
+        const headers = new HttpHeaders({
+            Authorization: this.tiledeskToken,
+            //'Content-Type': 'multipart/form-data',
+        });
+        const requestOptions = { headers: headers };
+
+        //USE IMAGE API
+        const that = this;
+        const url = this.URL_TILEDESK_IMAGES + '/users' + '?path=' + path.split('path=')[1]
+        return new Promise((resolve, reject) => {
+            that.http.delete(url, requestOptions).subscribe(data => {
+                // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
+                resolve(true)
+                // that.BSStateUpload.next({upload: upload});
+            }, (error) => {
+                reject(error)
+            });
+        });
+    }
+
+    deleteProfile(userId: string, path: string): Promise<any>{
+        this.logger.log('[NATIVE UPLOAD] - delete image ... upload', userId)
+        const headers = new HttpHeaders({
+            Authorization: this.tiledeskToken,
+            //'Content-Type': 'multipart/form-data',
+        });
+        const requestOptions = { headers: headers };
+
+        //USE IMAGE API
+        const that = this;
+        const url = this.URL_TILEDESK_IMAGES + '/users' + '?path=' + "uploads/users/"+ userId + "/images/photo.jpg"
+        return new Promise((resolve, reject) => {
+            that.http.delete(url, requestOptions).subscribe(data => {
+                // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
+                resolve(true)
+                // that.BSStateUpload.next({upload: upload});
+            }, (error) => {
+                reject(error)
+            });
+        });
+    }
 }

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

@@ -130,6 +130,7 @@ export class TiledeskAuthService {
     this.logger.debug('[TILEDESK-AUTH] logOut()');
     this.appStorage.removeItem('tiledeskToken');
     this.appStorage.removeItem('currentUser');
+    localStorage.removeItem('tiledesk_token')
     this.setCurrentUser(null);
   }
 
@@ -178,6 +179,8 @@ export class TiledeskAuthService {
     } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken) {
       this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
+
+    localStorage.setItem('tiledesk_token', tiledeskToken)
   }
 
 

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

@@ -114,4 +114,18 @@ export const LogLevel = {
     'WARN' : 1,
     'INFO' : 2,
     'DEBUG' : 3
-}
+}
+
+export enum PLAN_NAME {
+    A = 'Growth',
+    B = 'Scale',
+    C = 'Plus',
+}
+
+export enum TYPE_BUTTON {
+    TEXT = 'text',
+    URL = 'url',
+    ACTION = 'action'
+}
+
+export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk', 'sv', 'az', 'kk', 'uz']

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

@@ -1,6 +1,5 @@
 import { DepartmentModel } from './../../models/department';
 import { Injectable, ElementRef } from '@angular/core';
-import { Globals } from '../../app/utils/globals';
 import { ConversationModel } from '../models/conversation';
 import { LoggerInstance } from '../providers/logger/loggerInstance';
 import { LoggerService } from '../providers/abstract/logger.service';

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

@@ -284,41 +284,6 @@ function convertUrlToTag(url) {
   //// <a href="#" onclick="openPopup(' + url + ')">' + url + '</a>';
 }
 
-
-export function isPopupUrl(url) {
-  try {
-    const TEMP = url.split('popup=')[1];
-    // può essere seguito da & oppure "
-    if (TEMP) {
-      if (TEMP.startsWith('true')) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  } catch (e) {
-    return false;
-  }
-}
-
-export function popupUrl(windowContext, html, title) {
-  const url = stripTags(html);
-  const w = 600;
-  const h = 600; // screen.height - 40;
-  const left = (screen.width / 2) - (w / 2);
-  const top = (screen.height / 2) - (h / 2);
-
-  // tslint:disable-next-line:whitespace
-  // tslint:disable-next-line:max-line-length
-  const newWindow = windowContext.open(url, '_blank', 'fullscreen=1, titlebar=0, toolbar=no, location=0, status=0, menubar=0, scrollbars=0, resizable=0, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left);
-  if (windowContext.focus) {
-    newWindow.focus();
-  }
-}
-
-
 export function encodeHTML(str) {
   return convert(str);
   // return str.replace(/[\u00A0-\u9999<>&](?!#)/gim, function(i) {
@@ -343,10 +308,6 @@ function convert(str) {
   return str;
 }
 
-export function stripTags(html) {
-  return (html.replace(/<.*?>/g, '')).trim();
-}
-
 export function htmlEntities(str) {
   return String(str)
     .replace(/&/g, '&amp;')

package/src/launch.js

@@ -35,7 +35,6 @@ function ready(callbackFunction){
       document.removeEventListener('mousedown', start);
       document.removeEventListener('mousemove', start);
       document.removeEventListener('touchstart', start);
-      document.removeEventListener('scroll', start);
       document.removeEventListener('keydown', start);
     }