@chat21/chat21-ionic 3.0.55-RC18 → 3.0.55-RC20

package/CHANGELOG.md

@@ -1,7 +1,14 @@
 # chat21-ionic ver 3.0
 
+### 3.0.55-RC20
+- Improve the method that solves the bug: if the chat is open on more than one tab, the previous ones disconnect
+- Displays the message "sent an image" when the sender sends an image
+- Removes the "setTimeout" set on the onStorageChanged event
+
+### 3.0.55-RC19
+- Fixes the bug: opening the "conversations info" side panel for support type conversations causes the chat to log out
+
 ### 3.0.55-RC18
-- Fixes the bug: check if exist the user before to remove the notification instance to avoid the error "Permission denied"
 - Fixes the bug: if the chat is open on more than one tab, the previous ones logging out
 
 ### 3.0.55-RC16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.55-RC18",
+    "version": "3.0.55-RC20",
     "author": "Tiledesk SRL",
     "homepage": "https://ionicframework.com/",
     "scripts": {

package/src/app/app.component.ts

@@ -692,7 +692,7 @@ export class AppComponent implements OnInit {
             that.removePresenceAndLogout();
           } else {
             that.removePresenceAndLogout();
-            that.presentToast();
+            // that.presentToast();
           }
         })
       }
@@ -858,48 +858,48 @@ export class AppComponent implements OnInit {
   onStorageChanged(event: any) {
     // console.log('[APP-COMP] - onStorageChanged event', event)
     // console.log('[APP-COMP] - onStorageChanged tiledeskToken', this.appStorageService.getItem('tiledeskToken'))
-    const storage = event.storageArea;
+    // const storage = event.storageArea;
     // console.log('[APP-COMP] - onStorageChanged event storage', storage)
 
-    setTimeout(() => {
-      if (storage && storage['chat_sv5__tiledeskToken'] === undefined) {
-        this.logger.log('[APP-COMP] - onStorageChanged event storage chat_sv5__tiledeskToken', storage['chat_sv5__tiledeskToken'])
-        this.tiledeskAuthService.logOut()
-        this.messagingAuthService.logout();
-        // this.events.publish('profileInfoButtonClick:logout', true);
-        this.conversationsHandlerService.conversations = [];
-      } else if (storage && storage['chat_sv5__tiledeskToken']) {
+    // setTimeout(() => {
+    //   if (storage && storage['chat_sv5__tiledeskToken'] === undefined) {
+    //     this.logger.log('[APP-COMP] - onStorageChanged event storage chat_sv5__tiledeskToken', storage['chat_sv5__tiledeskToken'])
+    //     this.tiledeskAuthService.logOut()
+    //     this.messagingAuthService.logout();
+    //     // this.events.publish('profileInfoButtonClick:logout', true);
+    //     this.conversationsHandlerService.conversations = [];
+    //   } else if (storage && storage['chat_sv5__tiledeskToken']) {
 
-        this.logger.log('[APP-COMP] - onStorageChanged event storage chat_sv5__tiledeskToken * IS DEFINED *')
-        const currentUser = this.tiledeskAuthService.getCurrentUser();
+    //     this.logger.log('[APP-COMP] - onStorageChanged event storage chat_sv5__tiledeskToken * IS DEFINED *')
+    //     const currentUser = this.tiledeskAuthService.getCurrentUser();
 
-        if (!currentUser) {
-          window.location.reload();
-        }
+    //     if (!currentUser) {
+    //       window.location.reload();
+    //     }
 
-      }
-    }, 1000);
+    //   }
+    // }, 1000);
 
     // else {
     //   console.log('[APP-COMP] - onStorageChanged event storage chat_sv5__tiledeskToken', storage['chat_sv5__tiledeskToken'])
     // }
 
+    // setTimeout(() => {
+      if (this.appStorageService.getItem('tiledeskToken') === null) {
+        this.tiledeskAuthService.logOut()
+        this.messagingAuthService.logout();
+      }
+      else {
 
-    // if (this.appStorageService.getItem('tiledeskToken') === null) {
-    //   this.tiledeskAuthService.logOut()
-    //   this.messagingAuthService.logout();
-    // }
-    // else {
-    //   setTimeout(() => {
-    //     const currentUser = this.tiledeskAuthService.getCurrentUser();
-    //     if (currentUser) {
-    //       console.log('[APP-COMP] - onStorageChanged currentUser', currentUser)
-    //     } else {
-    //       this.initializeApp()
-    //     }
-    //   }, 1000);
-
-    // }
+        const currentUser = this.tiledeskAuthService.getCurrentUser();
+        if (currentUser) {
+          console.log('[APP-COMP] - onStorageChanged currentUser', currentUser)
+        } else {
+          // this.initializeApp();
+          window.location.reload();
+        }
+      }
+    // }, 1000);
   }
 
 }

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

@@ -60,7 +60,7 @@ export class ConversationListPage implements OnInit {
 
   public conversationType = 'active'
   headerTitle: string;
- 
+
 
   constructor(
     private router: Router,
@@ -423,13 +423,15 @@ export class ConversationListPage implements OnInit {
     this.logger.log('[CONVS-LIST-PAGE] tenant:: ' + this.tenant);
     if (this.route.component['name'] !== "ConversationListPage") {
 
-      const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
-      this.logger.log('[CONVS-LIST-PAGE] conversationWith 2: ', IDConv);
-      if (IDConv) {
-        this.setUidConvSelected(IDConv);
-      } else {
+      if (this.route && this.route.snapshot && this.route.snapshot.firstChild) {
+        const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
+        this.logger.log('[CONVS-LIST-PAGE] conversationWith 2: ', IDConv);
+        if (IDConv) {
+          this.setUidConvSelected(IDConv);
+        } else {
 
-        this.logger.log('[CONVS-LIST-PAGE] conversationWith 2 (else): ', IDConv);
+          this.logger.log('[CONVS-LIST-PAGE] conversationWith 2 (else): ', IDConv);
+        }
       }
     }
   }
@@ -490,7 +492,7 @@ export class ConversationListPage implements OnInit {
   }
 
   onConversationLoaded(conversation: ConversationModel) {
-    // this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded ', conversation)
+    this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded ', conversation)
     const keys = ['YOU', 'SENT_AN_IMAGE', 'SENT_AN_ATTACHMENT'];
     const translationMap = this.translateService.translateLanguage(keys);
     // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
@@ -515,14 +517,41 @@ export class ConversationListPage implements OnInit {
           conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_IMAGE;
 
         } else if (conversation.type === "file") {
-          this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
           const SENT_AN_ATTACHMENT = conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT')
           conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_ATTACHMENT;
         }
-      } 
+      } else {
+        if (conversation.type === "image") {
+
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
+          // this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
+          const SENT_AN_IMAGE = conversation['last_message_text'] = translationMap.get('SENT_AN_IMAGE')
+
+          conversation.last_message_text = SENT_AN_IMAGE;
+
+        } 
+        // else if (conversation.type !== "text" && conversation.type !== "image") {
+        //   // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+        //   const SENT_AN_ATTACHMENT = conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT')
+        //   conversation.last_message_text = SENT_AN_ATTACHMENT;
+
+        // } 
+      }
     }
   }
 
+// isMarkdownLink(last_message_text) {
+//   this.logger.log('[CONVS-LIST-PAGE] isMarkdownLink 1')
+//   var regex = /^(^|[\n\r])\s*1\.\s.*\s+1\.\s$/
+//   let matchRegex = false
+//   if (regex.test(last_message_text)) { 
+//     this.logger.log('[CONVS-LIST-PAGE] isMarkdownLink 2')
+//     matchRegex = true
+//     return matchRegex
+//   }
+// }
+
 
   navigateByUrl(converationType: string, uidConvSelected: string) {
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
@@ -652,11 +681,11 @@ export class ConversationListPage implements OnInit {
 
     }, () => {
       this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *');
-     
+
     });
   }
 
-  archiveSupportGroupConv(tiledeskToken, project_id,conversationId) {
+  archiveSupportGroupConv(tiledeskToken, project_id, conversationId) {
     this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation projectId: ', project_id)
     this.tiledeskService.closeSupportGroup(tiledeskToken, project_id, conversationId).subscribe(res => {
 

package/src/chat21-core/providers/firebase/firebase-notifications.ts

@@ -165,33 +165,35 @@ export class FirebaseNotifications extends NotificationsService {
                 self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.userId', self.userId);
                 self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > FCMcurrentToken', self.FCMcurrentToken);
                 // this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.tenant', this.tenant);
-                const urlNodeFirebase = '/apps/' + self.tenant
-                const connectionsRefinstancesId = urlNodeFirebase + '/users/' + self.userId + '/instances/'
-                self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRefinstancesId ', connectionsRefinstancesId);
-                let connectionsRefURL = '';
-                if (connectionsRefinstancesId) {
-                    connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
-                    const connectionsRef = firebase.database().ref().child(connectionsRefURL);
-                    self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
-                    self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', connectionsRefURL);
-                    connectionsRef.off()
-                    connectionsRef.remove()
-                        .then(() => {
-                            self.logger.log("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > Remove succeeded.")
-                            callback('success')
-                        }).catch((error) => {
-                            self.logger.error("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance Remove failed: " + error.message)
-                            callback('error')
-                        }).finally(() => {
-                            self.logger.log('[FIREBASE-NOTIFICATIONS] COMPLETED');
-                        })
-                }
+      
 
             } else {
                 self.logger.debug('[FIREBASE-NOTIFICATIONS] - No FB user is signed in. ', user)
             }
         });
 
+        const urlNodeFirebase = '/apps/' + self.tenant
+        const connectionsRefinstancesId = urlNodeFirebase + '/users/' + self.userId + '/instances/'
+        self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRefinstancesId ', connectionsRefinstancesId);
+        let connectionsRefURL = '';
+        if (connectionsRefinstancesId) {
+            connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
+            const connectionsRef = firebase.database().ref().child(connectionsRefURL);
+            self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
+            self.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', connectionsRefURL);
+            connectionsRef.off()
+            connectionsRef.remove()
+                .then(() => {
+                    self.logger.log("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > Remove succeeded.")
+                    callback('success')
+                }).catch((error) => {
+                    self.logger.error("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance Remove failed: " + error.message)
+                    callback('error')
+                }).finally(() => {
+                    self.logger.log('[FIREBASE-NOTIFICATIONS] COMPLETED');
+                })
+        }
+
     
     }
 

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

@@ -22,9 +22,9 @@ export class TiledeskAuthService {
   private tiledeskToken: string;
   private currentUser: UserModel;
   private logger: LoggerService = LoggerInstance.getInstance()
-  
+
   constructor(public http: HttpClient,
-              public appStorage: AppStorageService) { }
+    public appStorage: AppStorageService) { }
 
 
   initialize(serverBaseUrl: string) {
@@ -57,7 +57,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -86,7 +87,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -111,7 +113,9 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(this.currentUser)
         }
       }, (error) => {
@@ -120,7 +124,7 @@ export class TiledeskAuthService {
     });
   }
 
-  logOut(){
+  logOut() {
     this.logger.debug('[TILEDESK-AUTH] logOut()')
     this.appStorage.removeItem('tiledeskToken')
     this.appStorage.removeItem('currentUser')
@@ -150,13 +154,28 @@ export class TiledeskAuthService {
       member.fullname = fullname;
       member.avatar = avatar;
       member.color = color;
-      this.currentUser = member; 
-      this.logger.debug('[TILEDESK-AUTH] - createCompleteUser member ', member)
+      this.currentUser = member;
+      this.logger.debug('[TILEDESK-AUTH] - createCompleteUser member ', member);
       this.appStorage.setItem('currentUser', JSON.stringify(this.currentUser));
     } catch (err) {
-      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err) 
+      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err)
+    }
+  }
+
+
+  private checkAndSetInStorageTiledeskToken(tiledeskToken) {
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken tiledeskToken from request', tiledeskToken)
+    const storedTiledeskToken = this.appStorage.getItem('tiledeskToken');
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken storedTiledeskToken ', storedTiledeskToken)
+    if (!storedTiledeskToken) {
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken TOKEN DOES NOT EXIST - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken !== tiledeskToken) {
+      console.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST BUT IS != FROM TOKEN - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken){
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
-    
   }