@chat21/chat21-ionic 3.0.104 → 3.0.105

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # chat21-ionic ver 3.0
 
+### 3.0.105 in PROD
+
+### 3.0.105.rc.1
+- added: get tiledeskToken from tiledesk_token key in favour of appStorageService.getItem('tiledeskToken')
+
+### 3.0.104.1 in PROD
+- minor bug fixing
+
 ### 3.0.104 in PROD
 - bug-fixed: messages are lost after chrome close all websocket connections due to inactivity and mqtt not reconnected automatically
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.104",
+    "version": "3.0.105",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -281,11 +281,11 @@ export class AppComponent implements OnInit {
       this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN token get with getParameterByName  ', token)
       // save token in local storage then 
 
-      const storedToken = this.appStorageService.getItem('tiledeskToken');
+      const storedToken = localStorage.getItem('tiledesk_token')
       this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN storedToken ', storedToken)
       this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN SAVE THE PARAMS TOKEN ', token)
       if (storedToken !== token) {
-        this.appStorageService.setItem('tiledeskToken', token);
+        localStorage.setItem('tiledesk_token', token)
       } else {
         this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN the current user already exist DON\'T SAVE ')
       }
@@ -506,7 +506,7 @@ export class AppComponent implements OnInit {
     this.deeplinks.route({'/conversation-detail': ConversationListPage}).subscribe(match => {
       this.logger.log('[APP-COMP] deeplinks match route', JSON.stringify(match.$args))
       if(match.$args && match.$args.jwt){
-        this.appStorageService.setItem('tiledeskToken', decodeURIComponent(match.$args.jwt))
+        localStorage.setItem('tiledesk_token', decodeURIComponent(match.$args.jwt))
         this.initAuthentication()
       }
     }, (nomatch)=> {
@@ -697,7 +697,7 @@ export class AppComponent implements OnInit {
   /***************************************************+*/
   /**------- AUTHENTICATION FUNCTIONS --> START <--- +*/
   private initAuthentication() {
-    const tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+    const tiledeskToken = localStorage.getItem('tiledesk_token')
 
     this.logger.log('[APP-COMP] >>> INIT-AUTHENTICATION !!! ')
     this.logger.log('[APP-COMP] >>> initAuthentication tiledeskToken ', tiledeskToken)
@@ -1381,10 +1381,13 @@ export class AppComponent implements OnInit {
   }
 
   private segmentSignIn(){
+    const that = this
     let user = this.tiledeskAuthService.getCurrentUser()
     if(window['analytics']){
       try {
-        window['analytics'].page("Chat Auth Page, Signin", {});
+        window['analytics'].page("Chat Auth Page, Signin", {
+          version: that.version
+        });
       } catch (err) {
         this.logger.error('Event:Signed In [page] error', err);
       }

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html

@@ -160,13 +160,13 @@
   </ion-note>
 
   <ion-buttons slot="end">
-    <ion-button *ngIf="!conversation.archived" tooltip="{{ translationsMap?.get('Resolve')}}" placement="bottom"
+    <ion-button *ngIf="!conversation.archived" placement="bottom"
       [ngClass]="{'hide': !isApp, 'button-on-desktop': !isApp, 'button-on-mobile': isApp  }"
       id="{{ 'close_conversation_button' + conversation.uid }}" class="close-conversation-button" ion-button clear
       item-end (click)="closeConversation(conversation);$event.stopPropagation();" padding>
       <ion-icon slot="icon-only" style="display:block;" id="{{ 'close_button_icon' + conversation.uid }}" name="archive-outline" item-end></ion-icon>
-      <div *ngIf="conversation?.recipient.startsWith('support-group')" tooltip="{{ translationsMap?.get('Resolve')}}"></div>
-      <div *ngIf="conversation?.recipient.startsWith('support-group')" tooltip="{{ translationsMap?.get('Archive')}}"></div>
+      <!-- <div *ngIf="conversation?.recipient.startsWith('support-group')" tooltip="{{ translationsMap?.get('Resolve')}}"></div>
+      <div *ngIf="conversation?.recipient.startsWith('support-group')" tooltip="{{ translationsMap?.get('Archive')}}"></div> -->
     </ion-button>
 
     <!-- <ion-button *ngIf="conversation?.recipient.startsWith('support-group') && !conversation.archived" [tooltip]="joinTooltip"  [options]="tooltip_options" placement="bottom"  content-type="template"

package/src/app/components/authentication/login/login.component.ts

@@ -137,7 +137,7 @@ export class LoginComponent implements OnInit {
   signInWithGoogle(){
     // const url = this.SERVER_BASE_PATH + "auth/google"
     const url = "https://eu.rtmv3.tiledesk.com/api/auth/google" + '?forced_redirect_url=chat://conversation-detail?from=google'
-    this.iab.create(url, '_system', 'locaation=yes')
+    this.iab.create(url, '_system', 'location=yes')
   }
 
   /** */

package/src/app/modals/loader-preview/loader-preview.page.ts

@@ -338,6 +338,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
     const file4Load = new Image()
     const nameImg = file.name
     const typeFile = file.type
+    const size = file.size
 
     file4Load.src = this.fileSelected
     file4Load.title = nameImg
@@ -349,6 +350,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
       height: file4Load.height,
       type: typeFile,
       uid: uid,
+      size: size
     }
     this.viewCtrl.dismiss({
       fileSelected: file,

package/src/app/pages/authentication/login/login.page.ts

@@ -124,6 +124,7 @@ export class LoginPage implements OnInit {
     this.tiledeskAuthService.signInWithEmailAndPassword(auth.email, auth.password)
       .then(tiledeskToken => {
         this.messagingAuthService.createCustomToken(tiledeskToken) 
+        localStorage.setItem('tiledesk_token', tiledeskToken)
         // Here edit stored current user
         // this.updateStoredCurrentUser()
       })

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -325,10 +325,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
       if (conv && this.loggedUser && conv.sender !== this.loggedUser.uid) {
-        this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange data sender ', conv.sender)
+        this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange ', conv)
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange this.loggedUser.uid ', this.loggedUser.uid)
-        this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange is_new ', conv.is_new)
-        this.logger.log('[CONVS-DETAIL] subscribe to  BSConversationsChange showButtonToBottom ', this.showButtonToBottom)
         // UPDATE THE CONVERSATION TO 'READ' IF IT IS ME WHO WRITES THE LAST MESSAGE OF THE CONVERSATION
         // AND IF THE POSITION OF THE SCROLL IS AT THE END
         // if (!this.showButtonToBottom && conv.is_new) {
@@ -748,15 +746,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     //               .set('buttonHoverBackgroundColor', 'var(--buttonHoverBackgroundColor)')
     //               .set('buttonHoverTextColor', 'var(--buttonHoverTextColor)')
     this.styleMap.set('themeColor', '#2a69c1')
-      .set('bubbleReceivedBackground', '#f0f2f7')
-      .set('bubbleReceivedTextColor', '#06132b')
-      .set('bubbleSentBackground', '#2a6ac1')
-      .set('bubbleSentTextColor', '#ffffff')
-      .set('buttonFontSize', '15px')
-      .set('buttonBackgroundColor', '#ffffff')
-      .set('buttonTextColor', '#2a6ac1')
-      .set('buttonHoverBackgroundColor', '#2a6ac1')
-      .set('buttonHoverTextColor', ' #ffffff')
+                  .set('bubbleReceivedBackground', '#f0f2f7')
+                  .set('bubbleReceivedTextColor', '#06132b')
+                  .set('bubbleSentBackground', '#2a6ac1')
+                  .set('bubbleSentTextColor', '#ffffff')
+                  .set('buttonFontSize', '15px')
+                  .set('buttonBackgroundColor', '#ffffff')
+                  .set('buttonTextColor', '#2a6ac1')
+                  .set('buttonHoverBackgroundColor', '#2a6ac1')
+                  .set('buttonHoverTextColor', ' #ffffff')
 
   }
   // -------------------------------------------------------------------------------------
@@ -1116,14 +1114,17 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
 
     const emailSectionMsg = (attributes && attributes['offline_channel'] === TYPE_MSG_EMAIL)
-    const channelIsNotEmailOrFormOrWhatsapp = (attributes && attributes['request_channel'] && (attributes['request_channel'] === TYPE_MSG_EMAIL || attributes['request_channel'] === TYPE_MSG_FORM || attributes['request_channel'] === CHANNEL_TYPE_WHATSAPP))
+    const channelIsNotEmailOrFormOrWhatsappOrTelegram = (attributes && attributes['request_channel'] && (attributes['request_channel'] === TYPE_MSG_EMAIL || 
+                                                                                                attributes['request_channel'] === TYPE_MSG_FORM || 
+                                                                                                attributes['request_channel'] === CHANNEL_TYPE_WHATSAPP || 
+                                                                                                attributes['request_channel'] === CHANNEL_TYPE_TELEGRAM))
 
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 
 
       if (this.isEmailEnabled &&
         this.leadInfo && this.leadInfo.presence && this.leadInfo.presence['status'] === 'offline' &&
-        this.leadInfo.email && !emailSectionMsg && !channelIsNotEmailOrFormOrWhatsapp) {
+        this.leadInfo.email && !emailSectionMsg && !channelIsNotEmailOrFormOrWhatsappOrTelegram) {
         this.logger.log('[CONVS-DETAIL] - SEND MESSAGE --> SENDING EMAIL', msg, this.leadInfo.email)
         let msgText = this.createEmailText(msg)
         this.sendEmail(msgText).subscribe(status => {

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -583,7 +583,7 @@ export class ConversationListPage implements OnInit {
         if (conversation) {
           this.onImageLoaded(conversation)
           this.onConversationLoaded(conversation)
-          conversation.is_new && this.isInitialized? this.segmentNewConversationAdded(conversation) : null;
+          // conversation.is_new && this.isInitialized? this.segmentNewConversationAdded(conversation) : null;
         }
     })
 
@@ -852,9 +852,6 @@ export class ConversationListPage implements OnInit {
         conversation.attributes.project_name = project['name']
       }
     }
-    // if(conversation.conversation_with_fullname === 'Guest '){
-    //   conversation.conversation_with_fullname = 'guest' + '#' + this.getUUidConversation(conversation.uid)
-    // }
 
   }
 
@@ -1142,103 +1139,4 @@ export class ConversationListPage implements OnInit {
     }
   }
 
-  // ------------------------------------------------------------------
-  // !!! Not used methods !!!
-  // ------------------------------------------------------------------
-
-  // /**
-  //  * ::: openArchivedConversationsPage :::
-  //  * Open the archived conversations page
-  //  * (metodo richiamato da html)
-  //  */
-  // openArchivedConversationsPage() {
-  //   this.logger.log('[CONVS-LIST-PAGE] openArchivedConversationsPage');
-  // }
-
-  // // info page
-  // returnCloseInfoPage() {
-  //   this.logger.log('[CONVS-LIST-PAGE] returnCloseInfoPage');
-  //   // this.isShowMenuPage = false;
-  //   this.initialize();
-
-  // }
-
-  // private navigatePage() {
-  //   this.logger.log('[CONVS-LIST-PAGE] navigatePage:: >>>> conversationSelected ', this.conversationSelected);
-  //   let urlPage = 'detail/';
-  //   if (this.conversationSelected) {
-  //     // urlPage = 'conversation-detail/' + this.uidConvSelected;
-  //     urlPage = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname;
-  //     // this.openDetailsWithState(this.conversationSelected);
-  //   }
-  //   // else {
-  //   //   this.router.navigateByUrl('detail');
-  //   // }
-
-  //   const navigationExtras: NavigationExtras = {
-  //     state: {
-  //       conversationSelected: this.conversationSelected
-  //     }
-  //   };
-  //   this.navService.openPage(urlPage, ConversationDetailPage, navigationExtras);
-  // }
-
-  // openDetailsWithState(conversationSelected) {
-  //   console.log('openDetailsWithState:: >>>> conversationSelected ', conversationSelected);
-  //   let navigationExtras: NavigationExtras = {
-  //     state: {
-  //       conversationSelected: conversationSelected
-  //     }
-  //   };
-  //   this.router.navigate(['conversation-detail/' + this.uidConvSelected], navigationExtras);
-  // }
-
-  // /**
-  //  * ::: subscribeLoggedUserLogin :::
-  //  * effettuato il login:
-  //  * 1 - imposto loggedUser
-  //  * 2 - dismetto modale
-  //  * 3 - inizializzo elenco conversazioni
-  //  */
-  // subscribeLoggedUserLogin = (user: any) => {
-  //   console.log('3 ************** subscribeLoggedUserLogin', user);
-  //   this.loggedUser = user;
-  //   try {
-  //     closeModal(this.modalController);
-  //   } catch (err) {
-  //     console.error('-> error:', err);
-  //   }
-  //   this.initialize();
-  // }
-
-  /**
-   * ::: conversationsChanged :::
-   * evento richiamato su add, change, remove dell'elenco delle conversazioni
-   * 1 - aggiorno elenco conversazioni
-   * 2 - aggiorno il conto delle nuove conversazioni
-   * 4 - se esiste un uidReciverFromUrl (passato nell'url)
-   *    e se esiste una conversazione con lo stesso id di uidReciverFromUrl
-   *    imposto questa come conversazione attiva (operazione da fare una sola volta al caricamento delle conversazioni)
-   *    e la carico nella pagina di dettaglio e azzero la variabile uidReciverFromUrl!!!
-   * 5 - altrimenti se esiste una conversazione con lo stesso id della conversazione attiva
-   *    e la pagina di dettaglio è vuota (placeholder), carico la conversazione attiva (uidConvSelected) nella pagina di dettaglio
-   *    (operazione da fare una sola volta al caricamento delle conversazioni)
-   */
-
-  // ------------------------------------------------------------------------------------
-  // ::: readAllMessages :::  ??????????? SEEMS NOT USED ?????????????????
-  // when all chat messages are displayed,
-  // that is when in the conversation detail I go to the bottom of the page,
-  // the readAllMessages event is triggered and is intercepted in the conversation list
-  // and modify the current conversation by bringing is_new to false
-  // ------------------------------------------------------------------------------------
-  // readAllMessages = (uid: string) => {
-  //   this.logger.log('[CONVS-LIST-PAGE] readAllMessages', uid);
-  //   const conversationSelected = this.conversations.find(item => item.uid === this.uidConvSelected);
-  //   if (conversationSelected) {
-  //     conversationSelected.is_new = false;
-  //     conversationSelected.status = '0';
-  //     conversationSelected.selected = true;
-  //   }
-  // }
 }

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

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

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

@@ -103,4 +103,43 @@ export class FirebaseUploadService extends UploadService {
 
   }
 
+  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 = 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)
+      })
+    })
+  }
+
+  // // ------------------------------------
+  // // Delete the file photo
+  // // ------------------------------------
+  private deleteFile(pathToFile, fileName){
+    const ref = firebase.storage().ref(pathToFile);
+    const childRef = ref.child(fileName);
+    return childRef.delete()
+  }
+
 }

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

@@ -323,6 +323,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,26 @@ export class NativeUploadService extends UploadService {
         }
         
     }
+
+    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
+        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)
+            });
+        });
+    }
 }