@chat21/chat21-web-widget 5.0.59-rc.3 → 5.0.59

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-web-widget ver 5.0
 
+### 5.0.59 in PROD
+
+### 5.0.59-rc.4
+- bug-fixed: texarea remains disabled if messages array has the last (non ordered) timestamp message set with 'disabledTextArea' set to true
+
 ### 5.0.59-rc.3
 - bug-fixed: if mobileMarginX or MobileMarginY is set, widget do not fit on fullscreen once is opened
 

package/package.json

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

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

@@ -17,7 +17,7 @@ export abstract class NotificationsService {
     } 
   }
 
-  abstract initialize(tenant: string, vapidKey: string): void;
+  abstract initialize(tenant: string, vapidKey: string, platform: string): void;
   abstract getNotificationPermissionAndSaveToken(currentUserUid: string): void;
   abstract removeNotificationsInstance(callback: (string) => void): void;
 

package/src/chat21-core/providers/chat-manager.ts

@@ -184,7 +184,7 @@ export class ChatManager {
   getConversationHandlerByConversationId(conversationId): any {
     let handler = null;
     this.handlers.forEach(conv => {
-      // this.logger.('[CHAT MANAGER]forEach ***', conversationId, this.handlers, conv);
+      this.logger.log('[CHAT MANAGER]forEach ***', conversationId, this.handlers, conv);
       if (conv.conversationWith === conversationId) {
         handler = conv;
         return;

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

@@ -1,79 +1,82 @@
-import { LoggerInstance } from './../logger/loggerInstance';
 import { Injectable } from '@angular/core';
 // services
 import { NotificationsService } from '../abstract/notifications.service';
-
+import { LoggerInstance } from '../logger/loggerInstance';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 // firebase
-// import firebase from 'firebase/app';
+// import * as firebase from 'firebase/app';
+import firebase from "firebase/app";
+import 'firebase/messaging';
+import 'firebase/auth';
 
-import { LoggerService } from '../abstract/logger.service';
+@Injectable({ providedIn: 'root' })
 
-// @Injectable({ providedIn: 'root' })
-@Injectable()
 export class FirebaseNotifications extends NotificationsService {
-    
-    // public BUILD_VERSION: string;
+
     private FCMcurrentToken: string;
     private userId: string;
     private tenant: string;
     private vapidkey: string;
-    private firebase: any;
-
+    private platform: string;
     private logger: LoggerService = LoggerInstance.getInstance();
     constructor() {
         super();
     }
 
-    async initialize(tenant: string, vapId: string) {
+    initialize(tenant: string, vapId: string, platform: string): void {
         this.tenant = tenant
         this.vapidkey = vapId
-        this.logger.debug('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
-
-        const { default: firebase} = await import("firebase/app");
-        this.firebase = firebase
+        platform === 'desktop'? this.platform = 'ionic' : this.platform = platform
+        this.logger.log('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant, this.platform)
 
         if (!('serviceWorker' in navigator)) {
             // , disable or hide UI.
             this.logger.error("[FIREBASE-NOTIFICATIONS] initialize - Service Worker isn't supported on this browser", navigator)
             return;
         }
-        if (('serviceWorker' in navigator)) {
-            // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser ", navigator)
-            navigator.serviceWorker.getRegistrations().then((serviceWorkerRegistrations) => {
-                this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser serviceWorkerRegistrations", serviceWorkerRegistrations)
-                if (serviceWorkerRegistrations.length > 0) {
-                    serviceWorkerRegistrations.forEach(registration => {
-                        this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registration ", registration)
-                        // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations scriptURL", registrations.active.scriptURL)
-                        // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations state", registrations.active.state)
-
-                    });
-                } else {
-                    this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser - !not registered",)
+        // if (('serviceWorker' in navigator)) {
+        //     navigator.serviceWorker.register('firebase-messaging-sw.js')
+        //         .then(function (registration) {
+        //             console.log('[FIREBASE-NOTIFICATIONS] initialize serviceWorker Registration successful, scope is:', registration.scope);
 
-                }
-            });
-        }
+
+        //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser ", navigator)
+        //             // navigator.serviceWorker.getRegistrations().then((serviceWorkerRegistrations) => {
+        //             //     this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser serviceWorkerRegistrations", serviceWorkerRegistrations)
+        //             //     if (serviceWorkerRegistrations.length > 0) {
+        //             //         serviceWorkerRegistrations.forEach(registration => {
+        //             //             this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registration ", registration)
+        //             //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations scriptURL", registrations.active.scriptURL)
+        //             //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations state", registrations.active.state)
+
+        //             //         });
+        //             //     } else {
+        //             //         this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser - !not registered",)
+        //             //         // navigator.serviceWorker.register('http://localhost:8101/firebase-messaging-sw.js')
+        //             //         //     .then(function (registration) {
+        //             //         //         console.log('Service worker successfully registered.');
+        //             //         //         return registration;
+        //             //         //     }).catch(function (err) {
+        //             //         //         console.error('Unable to register service worker.', err);
+        //             //         //     });
+        //             //     }
+        //             // });
+        //         }).catch(function (err) {
+        //             console.log('Service worker registration failed, error:', err);
+        //         });
+        // }
     }
 
+
+
     getNotificationPermissionAndSaveToken(currentUserUid) {
         // this.tenant = this.getTenant();
-        this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - tenant ', this.tenant)
-        this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - currentUserUid ', currentUserUid)
+        this.logger.log('initialize FROM [APP-COMP] - [FIREBASE-NOTIFICATIONS] calling requestPermission - tenant ', this.tenant, ' currentUserUid ', currentUserUid)
+        // this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - currentUserUid ', currentUserUid)
         this.userId = currentUserUid;
-        // Service Worker explicit registration to explicitly define sw location at a path
-        // const swRegistration = async () => {
-        //     try {
-        //         await navigator.serviceWorker.register('http://localhost:8101/firebase-messaging-sw.js');
-        //     } catch (error) {
-        //         console.error(error);
-        //     }
-        // }
-
 
-      
-        if (this.firebase.messaging.isSupported()) {
-            const messaging = this.firebase.messaging(); 
+        if (firebase.messaging.isSupported()) {
+            const messaging = firebase.messaging();
             // messaging.requestPermission()
             Notification.requestPermission().then((permission) => {
                 if (permission === 'granted') {
@@ -91,46 +94,136 @@ export class FirebaseNotifications extends NotificationsService {
             });
         } else {
             this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
+
+            // if(this.platform == 'android' || this.platform === 'ios'){
+            //     this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING: use FCM plugin')
+            //     this.fcm.onTokenRefresh().subscribe(FCMtoken => {
+            //       // Register your new token in your back-end if you want
+            //       // backend.registerToken(token);
+            //       this.FCMcurrentToken = FCMtoken;
+            //       console.log("[MQTTNotificationService] FCM: onTokenRefresh --->", FCMtoken);
+            //       this.updateToken(FCMtoken, currentUserUid)
+            //     });
+            //     this.fcm.requestPushPermission().then((permission) => {
+            //       console.log("[MQTTNotificationService] FCM: requestPushPermission --->", permission);
+            //       if(permission === true){
+            //         this.fcm.getToken().then(FCMtoken => {
+            //           console.log("[MQTTNotificationService] FCM: getToken --->", FCMtoken);
+            //           this.FCMcurrentToken = FCMtoken;
+            //           this.updateToken(FCMtoken, currentUserUid)
+            //         });
+            //       }
+            //     });
+                
+            // }
         }
     }
 
+
+    // getNotificationPermissionAndSaveToken(currentUserUid) {
+    //     // this.tenant = this.getTenant();
+    //     this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - tenant ', this.tenant)
+    //     this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - currentUserUid ', currentUserUid)
+    //     this.userId = currentUserUid;
+    //     const messaging = firebase.messaging();
+    //     if (firebase.messaging.isSupported()) {
+    //         // messaging.requestPermission()
+    //         Notification.requestPermission().then((permission) => {
+    //             if (permission === 'granted') {
+    //                 this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> requestPermission Notification permission granted.');
+    //                 messaging.getToken({ vapidKey: 'BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c'}).then((currentToken) => {
+    //                     if (currentToken) {
+    //                         this.sendTokenToServer(currentToken);
+    //     // updateUIForPushEnabled(currentToken);
+
+    //                     } else {
+    //                       // Show permission request UI
+    //                       console.log('No registration token available. Request permission to generate one.');
+    //                       // ...
+    //                     }
+    //                   }).catch((err) => {
+    //                     console.log('An error occurred while retrieving token. ', err);
+    //                     // ...
+    //                   });
+
+    //                 resetUI()
+
+    //             } else {
+    //                 this.logger.error('Unable to get permission to notify.');
+    //             }
+    //         })
+
+    //     }
+    // }
+
+    //  sendTokenToServer(currentToken) {
+    //     if (!this.isTokenSentToServer()) {
+    //       console.log('Sending token to server...');
+    //       // TODO(developer): Send the current token to your server.
+    //       this.setTokenSentToServer(true);
+    //     } else {
+    //       console.log('Token already sent to server so won\'t send it again ' +
+    //           'unless it changes');
+    //     }
+    //   }
+
+    //   isTokenSentToServer() {
+    //     return window.localStorage.getItem('sentToServer') === '1';
+    //   }
+
+    //   setTokenSentToServer(sent) {
+    //     window.localStorage.setItem('sentToServer', sent ? '1' : '0');
+    //   }
+
     removeNotificationsInstance(callback: (string) => void) {
         var self = this;
-        this.firebase.auth().onAuthStateChanged(function (user) {
-            if (user) {
-                self.logger.debug('[FIREBASE-NOTIFICATIONS] - User is signed in. ', user)
-
-            } else {
-                self.logger.debug('[FIREBASE-NOTIFICATIONS] - No user is signed in. ', user)
-            }
-        });
-
-        this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.userId', this.userId);
-        this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > FCMcurrentToken', this.FCMcurrentToken);
-        // this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > this.tenant', this.tenant);
-        const urlNodeFirebase = '/apps/' + this.tenant
-        const connectionsRefinstancesId = urlNodeFirebase + '/users/' + this.userId + '/instances/'
-        this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRefinstancesId ', connectionsRefinstancesId);
+        // firebase.auth().onAuthStateChanged(function (user) {
+        //     if (user) {
+        //         self.logger.debug('[FIREBASE-NOTIFICATIONS] - FB User is signed in. ', user)
+        //         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);
+        //     } 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 + this.FCMcurrentToken;
-            const connectionsRef = this.firebase.database().ref().child(connectionsRefURL);
-            this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
-            this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', connectionsRefURL);
+            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(() => {
-                    this.logger.log("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > Remove succeeded.")
+                    self.logger.log("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance > Remove succeeded.")
                     callback('success')
                 }).catch((error) => {
-                    this.logger.error("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance Remove failed: " + error.message)
+                    self.logger.error("[FIREBASE-NOTIFICATIONS] >>>> removeNotificationsInstance Remove failed: " + error.message)
                     callback('error')
                 }).finally(() => {
-                    this.logger.log('[FIREBASE-NOTIFICATIONS] COMPLETED');
+                    self.logger.log('[FIREBASE-NOTIFICATIONS] COMPLETED');
                 })
         }
+
     }
 
+    // removeNotificationsInstance() {
+    //     let promise = new Promise((resolve, reject) => {
+    //         this.appStoreService.getInstallation(this.projectId).then((res) => {
+    //             console.log("Get Installation Response: ", res);
+    //             resolve(res);
+    //         }).catch((err) => {
+    //             console.error("Error getting installation: ", err);
+    //             reject(err);
+    //         })
+    //     })
+    //     return promise;
+    // }
+
 
     // ********** PRIVATE METHOD - START ****************//
     private updateToken(FCMcurrentToken, currentUserUid) {
@@ -149,14 +242,14 @@ export class FirebaseNotifications extends NotificationsService {
         const device_model = {
             device_model: navigator.userAgent,
             language: navigator.language,
-            platform: 'ionic',
+            platform: this.platform,
             platform_version: this.BUILD_VERSION
         }
 
         updates[connectionsRefinstancesId + connection] = device_model;
 
         this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> getPermission > updateToken in DB', updates);
-        this.firebase.database().ref().update(updates)
+        firebase.database().ref().update(updates)
     }
     // ********** PRIVATE METHOD - END ****************//
 

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

@@ -102,6 +102,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
                 this.logger.log('[MQTTConversationHandlerSERVICE] message lastMessages:', messages);
+                messages.sort(compareValues('timestamp', 'asc'));
                 messages.forEach(message => {
                     // this.addedMessage(msg);
                     const msg: MessageModel = message;        

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

@@ -1,49 +1,48 @@
-
 import { Injectable } from '@angular/core';
 // services
 import { NotificationsService } from '../abstract/notifications.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-
 // firebase
-// import firebase from "firebase/app";
-
+import firebase from "firebase/app";
+import 'firebase/messaging';
+import 'firebase/auth';
 // chat21
 import { Chat21Service } from './chat-service';
 
-// @Injectable({ providedIn: 'root' })
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+  })
 export class MQTTNotifications extends NotificationsService {
-  
+    
   // public BUILD_VERSION: string;
   private FCMcurrentToken: string;
   private userId: string;
   private tenant: string;
   private vapidkey: string;
-  private firebase: any;
-
+  private platform: string;
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
-    public chat21Service: Chat21Service
+    public chat21Service: Chat21Service,
   ) {
     super();
   }
 
-  async initialize(tenant: string, vapId: string) {
+  initialize(tenant: string, vapId: string, platform: string): void {
     this.tenant = tenant;
     this.vapidkey = vapId;
-
-    const { default: firebase} = await import("firebase/app");
-    this.firebase = firebase
-
+    platform === 'desktop'? this.platform = 'ionic' : this.platform = platform
+    this.logger.log('[MQTTNotificationService] initialize - tenant ', this.tenant, this.platform)
     return;
   }
     
   getNotificationPermissionAndSaveToken(currentUserUid) {
+    console.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid);
     this.userId = currentUserUid;
-    if (this.firebase.messaging.isSupported()) {
-      const messaging = this.firebase.messaging();
+    if (firebase.messaging.isSupported()) {
+      console.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
+      const messaging = firebase.messaging();
       // messaging.requestPermission()
       Notification.requestPermission().then((permission) => {
         if (permission === 'granted') {
@@ -61,6 +60,28 @@ export class MQTTNotifications extends NotificationsService {
       });
     } else {
       this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
+
+      // if(this.platform == 'android' || this.platform === 'ios'){
+      //   this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING: use FCM plugin')
+      //   this.fcm.onTokenRefresh().subscribe(FCMtoken => {
+      //     // Register your new token in your back-end if you want
+      //     // backend.registerToken(token);
+      //     this.FCMcurrentToken = FCMtoken;
+      //     console.log("[MQTTNotificationService] FCM: onTokenRefresh --->", FCMtoken);
+      //     this.saveToken(FCMtoken, currentUserUid)
+      //   });
+      //   this.fcm.requestPushPermission().then((permission) => {
+      //     console.log("[MQTTNotificationService] FCM: requestPushPermission --->", permission);
+      //     if(permission === true){
+      //       this.fcm.getToken().then(FCMtoken => {
+      //         console.log("[MQTTNotificationService] FCM: getToken --->", FCMtoken);
+      //         this.FCMcurrentToken = FCMtoken;
+      //         this.saveToken(FCMtoken, currentUserUid)
+      //       });
+      //     }
+      //   });
+        
+      // }
     }
   }
 
@@ -83,7 +104,7 @@ export class MQTTNotifications extends NotificationsService {
       let connectionsRefURL = '';
       if (connectionsRefinstancesId) {
         connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
-        const connectionsRef = this.firebase.database().ref().child(connectionsRefURL);
+        const connectionsRef = firebase.database().ref().child(connectionsRefURL);
         self.logger.log('[MQTTNotificationService] >>>> connectionsRef ', connectionsRef);
         self.logger.log('[MQTTNotificationService] >>>> connectionsRef url ', connectionsRefURL);
         connectionsRef.off()
@@ -107,7 +128,7 @@ export class MQTTNotifications extends NotificationsService {
     const device_model = {
       device_model: navigator.userAgent,
       language: navigator.language,
-      platform: 'ionic',
+      platform: this.platform,
       platform_version: this.BUILD_VERSION
     }
     this.chat21Service.chatClient.saveInstance(FCMcurrentToken,device_model,(err, response) => {

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

@@ -38,12 +38,20 @@ export const BCK_COLOR_CONVERSATION_UNSELECTED = '#FFFFFF ';
 
 export const TYPE_SUPPORT_GROUP = 'support-group';
 export const CHANNEL_TYPE_GROUP = 'group';
+export const CHANNEL_TYPE_CHAT21 = 'chat21';
+export const CHANNEL_TYPE_EMAIL = 'email';
+export const CHANNEL_TYPE_FORM = 'form';
+export const CHANNEL_TYPE_MESSANGER = 'messanger';
+export const CHANNEL_TYPE_WHATSAPP = 'whatsapp';
+export const CHANNEL_TYPE_TELEGRAM = 'telegram';
 
 // TYPES MESSAGES
 export const TYPE_MSG_TEXT = 'text';
 export const TYPE_MSG_IMAGE = 'image';
 export const TYPE_MSG_FILE = 'file';
 export const TYPE_MSG_BUTTON = 'button';
+export const TYPE_MSG_EMAIL = 'email';
+export const TYPE_MSG_FORM = 'form';
 
 export const MAX_WIDTH_IMAGES = 230;
 export const MIN_WIDTH_IMAGES = 130;