@chat21/chat21-ionic 3.0.58 → 3.0.59-rc15

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

@@ -65,7 +65,7 @@ export class MQTTAuthService extends MessagingAuthService {
     // this.URL_TILEDESK_SIGNIN_WITH_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'auth/signinWithCustomToken';
     this.logger.log(' ---------------- login con token url ---------------- ');
     // this.checkIsAuth();
-    this.onAuthStateChanged();
+    // this.onAuthStateChanged();
   }
 
   // logout(callback) {
@@ -103,33 +103,33 @@ z
 
   /**
    */
-  onAuthStateChanged() {
-    this.logger.log('UserService::onAuthStateChanged');
-    // if (this.appStorage.getItem('tiledeskToken') == null) {
-    //   this.currentUser = null;
-    this.BSAuthStateChanged.next('offline');
-    // }
-
-    // this.logger.log("STORAGE CHANGED: added listner")
-    // window.addEventListener('storage', (e) => {
-    //   this.logger.log('STORAGE CHANGED:', e.key);
-    //   if (this.appStorage.getItem('tiledeskToken') == null && this.appStorage.getItem('currentUser') == null) {
-    //     this.logger.log('STORAGE CHANGED: CASO TOKEN NULL');
-    //     this.currentUser = null;
-    //     // that.logout(() => {
-    //     //   that.BSAuthStateChanged.next('offline');
-    //     // });
-    //     this.logout();
-    //   }
-    //   else if (this.currentUser == null && this.appStorage.getItem('tiledeskToken') != null && this.appStorage.getItem('currentUser') != null) {
-    //     this.logger.log('STORAGE CHANGED: CASO LOGGED OUTSIDE');
-    //     this.currentUser = JSON.parse(this.appStorage.getItem('currentUser'));
-    //     const tiledeskToken = this.appStorage.getItem('tiledeskToken');
-    //     this.connectWithCustomToken(tiledeskToken);
-    //   }
-    // }, false);
+  // onAuthStateChanged() {
+  //   this.logger.log('UserService::onAuthStateChanged');
+  //   // if (this.appStorage.getItem('tiledeskToken') == null) {
+  //   //   this.currentUser = null;
+  //   this.BSAuthStateChanged.next('offline');
+  //   // }
+
+  //   // this.logger.log("STORAGE CHANGED: added listner")
+  //   // window.addEventListener('storage', (e) => {
+  //   //   this.logger.log('STORAGE CHANGED:', e.key);
+  //   //   if (this.appStorage.getItem('tiledeskToken') == null && this.appStorage.getItem('currentUser') == null) {
+  //   //     this.logger.log('STORAGE CHANGED: CASO TOKEN NULL');
+  //   //     this.currentUser = null;
+  //   //     // that.logout(() => {
+  //   //     //   that.BSAuthStateChanged.next('offline');
+  //   //     // });
+  //   //     this.logout();
+  //   //   }
+  //   //   else if (this.currentUser == null && this.appStorage.getItem('tiledeskToken') != null && this.appStorage.getItem('currentUser') != null) {
+  //   //     this.logger.log('STORAGE CHANGED: CASO LOGGED OUTSIDE');
+  //   //     this.currentUser = JSON.parse(this.appStorage.getItem('currentUser'));
+  //   //     const tiledeskToken = this.appStorage.getItem('tiledeskToken');
+  //   //     this.connectWithCustomToken(tiledeskToken);
+  //   //   }
+  //   // }, false);
 
-  }
+  // }
 
   createCustomToken(tiledeskToken: any): void {
     this.connectWithCustomToken(tiledeskToken)

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

@@ -59,15 +59,19 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         // 1 search local array
         // 2 search remote
         // callback
-
+        console.log("SEARCHING CONV:", conversationWith);
         const conversation = this.conversations.find(conv => conv.conversation_with === conversationWith);
-        this.logger.debug('[MQTTConversationsHandler] getConversationDetail *****:  found locally?', conversation);
+        console.log('[MQTTConversationsHandler] getConversationDetail *****:  found locally?', conversation);
         if (conversation) {
-            this.logger.debug('[MQTTConversationsHandler] getConversationDetail found!');
+            console.log('[MQTTConversationsHandler] getConversationDetail found LOCALLY!', conversationWith);
             callback(conversation);
         } else {
-            this.logger.debug('[MQTTConversationsHandler] getConversationDetail *****: Not found locally ', conversation);
-            this.chat21Service.chatClient.conversationDetail(conversationWith, (conversation) => {
+            console.log('[MQTTConversationsHandler] getConversationDetail *****: Not found locally, SEARCHING REMOTE ', conversation);
+            this.chat21Service.chatClient.conversationDetail(conversationWith, (err, conversation) => {
+                console.log("--REMOTE CONV IS:" + conversation);
+                console.log("--REMOTE CONV IS OBJ:", conversation);
+                console.log("--REMOTE ERR IS:" + err);
+                
                 if (conversation) {
                     if (callback) {
                         callback(this.completeConversation(conversation));
@@ -381,6 +385,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     }
 
     private completeConversation(conv): ConversationModel {
+        console.log("COMPLETING CONVERSATION:", conv);
         conv.selected = false;
         if (!conv.sender_fullname || conv.sender_fullname === 'undefined' || conv.sender_fullname.trim() === '') {
             conv.sender_fullname = conv.sender;
@@ -413,6 +418,9 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     }
 
     private isGroup(conv: ConversationModel) {
+        console.log("CONVIS: " + JSON.stringify(conv));
+        console.log("CONVIS OBJ:", conv);
+        
         if (conv.recipient.startsWith('group-') || conv.recipient.startsWith('support-group')) {
             return true;
         };

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

@@ -2,6 +2,14 @@
 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/messaging';
+import 'firebase/auth';
+// chat21
+import { Chat21Service } from './chat-service';
 
 @Injectable({
     providedIn: 'root'
@@ -9,24 +17,106 @@ import { NotificationsService } from '../abstract/notifications.service';
   export class MQTTNotifications extends NotificationsService {
     
     public BUILD_VERSION: string;
-    constructor( ) {
-        super();
-    }
+    private FCMcurrentToken: string;
+    private userId: string;
+    private tenant: string;
+    private vapidkey: string;
+    private logger: LoggerService = LoggerInstance.getInstance();
+
+    constructor(
+      public chat21Service: Chat21Service
+  ) {
+      super();
+  }
 
-    initialize(tenant: string): void {
-      console.log('Method not implemented.');
+    initialize(tenant: string, vapId: string): void {
+      this.tenant = tenant;
+      this.vapidkey = vapId;
       return;
     }
     
-    getNotificationPermissionAndSaveToken(currentUser: string) { 
-      console.log('Method not implemented.');
-      return;
+    getNotificationPermissionAndSaveToken(currentUserUid) {
+      console.log("getNotificationPermissionAndSaveToken()",currentUserUid );
+      this.userId = currentUserUid;
+      if (firebase.messaging.isSupported()) {
+        console.log("firebase.messaging.isSupported() YES");
+          const messaging = firebase.messaging();
+          // messaging.requestPermission()
+          Notification.requestPermission().then((permission) => {
+              if (permission === 'granted') {
+                  this.logger.log('[MQTT-FIREBASE-NOTIFICATIONS] >>>> requestPermission Notification permission granted.');
+
+                  return messaging.getToken({ vapidKey: this.vapidkey })
+              }
+          }).then(FCMtoken => {
+              this.logger.log('[MQTT-FIREBASE-NOTIFICATIONS] >>>> requestPermission FCMtoken', FCMtoken)
+              // Save FCM Token in Chat21
+              this.FCMcurrentToken = FCMtoken;
+              this.saveToken(FCMtoken, currentUserUid)
+          }).catch((err) => {
+              this.logger.error('[FIREBASE-NOTIFICATIONS] >>>> requestPermission ERR: Unable to get permission to notify.', err);
+          });
+      } else {
+          this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
+      }
     }
 
 
     removeNotificationsInstance(callback: (string) => void) {
-      console.log('Method not implemented.');
-      return;
+      var self = this;
+        // 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 + 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');
+                })
+        }
+    }
+    
+    private saveToken(FCMcurrentToken, currentUserUid) {
+      this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> getPermission > updateToken ', FCMcurrentToken);
+      if (!currentUserUid || !FCMcurrentToken) {
+          return
+      };
+      const device_model = {
+          device_model: navigator.userAgent,
+          language: navigator.language,
+          platform: 'ionic',
+          platform_version: this.BUILD_VERSION
+      }
+      this.chat21Service.chatClient.saveInstance(
+        FCMcurrentToken,
+        device_model,
+        (err, response) => {
+          if (err) {
+            this.logger.error('Error saving FCMcurrentToken on chat21 App Instance', FCMcurrentToken);
+          }
+        }
+      );
     }
-      
+
   }

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

@@ -31,11 +31,11 @@ export class TiledeskAuthService {
     public http: HttpClient,
     public appStorage: AppStorageService,
     // private events: EventsService,
-    ) { }
+  ) { }
 
 
   initialize(serverBaseUrl: string) {
-    this.logger.info('[TILEDESK-AUTH-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.logger.log('[TILEDESK-AUTH-SERV] - initialize serverBaseUrl', serverBaseUrl);
     this.SERVER_BASE_URL = serverBaseUrl;
     this.URL_TILEDESK_SIGNIN = this.SERVER_BASE_URL + 'auth/signin';
     this.URL_TILEDESK_SIGNIN_ANONYMOUSLY = this.SERVER_BASE_URL + 'auth/signinAnonymously'
@@ -134,10 +134,19 @@ export class TiledeskAuthService {
   logOut() {
     this.logger.log('[TILEDESK-AUTH] - LOGOUT')
     this.appStorage.removeItem('tiledeskToken')
+    this.appStorage.removeItem('currentUser')
+
     this.appStorage.removeItem('currentUser')
     this.setCurrentUser(null);
     // this.isOnline$.next(false) 
-    
+    const stored_project = localStorage.getItem('last_project')
+    if (stored_project) {
+      localStorage.removeItem('last_project')
+    }
+    const stored_contacts = localStorage.getItem('contacts')
+    if (stored_contacts) {
+      localStorage.removeItem('contacts')
+    }
   }
 
 
@@ -183,7 +192,7 @@ export class TiledeskAuthService {
     } else if (storedTiledeskToken && storedTiledeskToken !== tiledeskToken) {
       this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST BUT IS != FROM TOKEN - RUN SET ')
       this.appStorage.setItem('tiledeskToken', tiledeskToken);
-    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken){
+    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken) {
       this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
   }

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

@@ -497,7 +497,7 @@ export function createConfirm(translate, alertCtrl, events, title, message, acti
         text: LABEL_ANNULLA,
         handler: () => {
           events.publish('PopupConfirmation', LABEL_ANNULLA, action);
-          console.log('Disagree clicked');
+          // console.log('Disagree clicked');
         }
       },
       {

package/src/firebase-messaging-sw-template.js

@@ -43,7 +43,7 @@ importScripts('https://www.gstatic.com/firebasejs/5.8.6/firebase.js');
 // implement this optional method.
 // [START background_handler]
 messaging.setBackgroundMessageHandler(function(payload) {
-  console.log('[firebase-messaging-sw.js] Received background message ', payload);
+  // console.log('[firebase-messaging-sw.js] Received background message ', payload);
   // Customize notification here
   const notificationTitle = 'Background Message Title';
   const notificationOptions = {