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

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

@@ -48,13 +48,7 @@ export class FirebaseNotifications extends NotificationsService {
                     });
                 } 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);
-                    //     });
+
                 }
             });
         }
@@ -98,61 +92,6 @@ export class FirebaseNotifications extends NotificationsService {
         }
     }
 
-    // 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;
         firebase.auth().onAuthStateChanged(function (user) {
@@ -190,19 +129,6 @@ export class FirebaseNotifications extends NotificationsService {
         }
     }
 
-    // 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) {

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

@@ -34,10 +34,8 @@ export class Chat21Service {
     }
     if (!this.chatClient) {
       this.chatClient = new Chat21Client(this._config);
-    }
-    else {
+    } else {
       console.log("Did you try again to create a Chat21Client istance?");
     }
-    // console.log("chatClient init. ID:", this.chatClient.client_id)
   }
 }

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

@@ -63,7 +63,6 @@ export class MQTTArchivedConversationsHandler extends ArchivedConversationsHandl
         const conversation = this.archivedConversations.find(conv => conv.conversation_with === conversationWith);
         this.logger.log('[MQTTArchivedConversationsHandler] getConversationDetail found locally? *****: ', conversation);
         if (conversation) {
-            console.log('found!');
             callback(conversation);
         } else {
             this.logger.log('[MQTTArchivedConversationsHandler] getConversationDetail Not found locally, remote.getConversationDetail *****: ', conversation);

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

@@ -195,7 +195,8 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             this.logger.debug('[MQTTConversationsHandler] getLastConversation ', conversations, 'err', err);
             if (!err) {
                 if(conversations && conversations.length > 0){
-                    callback(conversations[0], null)
+                    let conversation = this.completeConversation(conversations[0]);
+                    callback(conversation, null)
                 }else {
                     callback(null, null)
 

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

@@ -35,10 +35,8 @@ export class MQTTNotifications extends NotificationsService {
   }
     
   getNotificationPermissionAndSaveToken(currentUserUid) {
-    console.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid );
     this.userId = currentUserUid;
     if (firebase.messaging.isSupported()) {
-      console.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
       const messaging = firebase.messaging();
       // messaging.requestPermission()
       Notification.requestPermission().then((permission) => {

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

@@ -43,19 +43,6 @@ export class MQTTPresenceService extends PresenceService {
   }
 
   userIsOnline(userid: string): Observable<any> {
-    // console.log('userIsOnline', userid);
-    // const that = this;
-    // const urlNodeConnections = this.urlNodePresence + userid + '/connections';
-    // console.log('userIsOnline: ', urlNodeConnections);
-    // const connectionsRef = firebase.database().ref().child(urlNodeConnections);
-    // connectionsRef.on('value', (child) => {
-    //   console.log('is-online-' + userid);
-    //   if (child.val()) {
-    //     that.events.publish('is-online-' + userid, userid, true);
-    //   } else {
-    //     that.events.publish('is-online-' + userid, userid, false);
-    //   }
-    // });
     return this.BSIsOnline
   }