@chat21/chat21-ionic 3.0.55-RC6 → 3.0.57

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

@@ -33,6 +33,7 @@ import { LoggerService } from '../abstract/logger.service';
 import { Observable, Observer, fromEvent, merge } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Network } from '@ionic-native/network/ngx';
+
 // @Injectable({ providedIn: 'root' })
 @Injectable()
 export class FirebaseAuthService extends MessagingAuthService {
@@ -60,40 +61,58 @@ export class FirebaseAuthService extends MessagingAuthService {
 
   status = 'ONLINE';
   isConnected = true;
-
+  unsubscribe: any;
   constructor(
     public http: HttpClient,
     private network: Network,
     private connectionService: ConnectionService
   ) {
     super();
+    // this.initialize()
   }
 
   /**
    *
    */
   initialize() {
-
+    console.log('initialize FROM [APP-COMP] [FIREBASEAuthSERVICE]')
     this.SERVER_BASE_URL = this.getBaseUrl();
     this.URL_TILEDESK_CREATE_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'chat21/firebase/auth/createCustomToken';
     this.logger.info('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
-    // this.URL_TILEDESK_SIGNIN = this.SERVER_BASE_URL + 'auth/signin';
-    // this.URL_TILEDESK_SIGNIN_ANONYMOUSLY = this.SERVER_BASE_URL + 'auth/signinAnonymously'
-    // this.URL_TILEDESK_SIGNIN_WITH_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'auth/signinWithCustomToken';
-    // this.checkIsAuth();
-
-    // this.createOnline$().subscribe((isOnline) =>{
-    //   console.log('FIREBASEAuthSERVICE] isOnline ', isOnline);
-    //   if (isOnline === true ) {
-    //     this.onAuthStateChanged();
-    //   }
-    // }) 
-    this.checkInternetConnection()
 
-    this.onAuthStateChanged();
+
+    let firebasePersistence;
+    // console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
+    switch (this.getPersistence()) {
+      case 'SESSION': {
+        firebasePersistence = firebase.auth.Auth.Persistence.SESSION;
+        break;
+      }
+      case 'LOCAL': {
+        firebasePersistence = firebase.auth.Auth.Persistence.LOCAL;
+        break;
+      }
+      case 'NONE': {
+        firebasePersistence = firebase.auth.Auth.Persistence.NONE;
+        break;
+      }
+      default: {
+        firebasePersistence = firebase.auth.Auth.Persistence.NONE;
+        break;
+      }
+    }
+    firebase.auth().setPersistence(firebasePersistence).then(async () => {
+      console.log('[FIREBASEAuthSERVICE] firebasePersistence ', firebasePersistence)
+      this.onAuthStateChanged();
+    })
+      .catch((error) => {
+        this.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
+      });
+
+
   }
 
-  checkInternetConnection () {
+  checkInternetConnection() {
     this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection');
     // let connectSubscription = this.network.onConnect().subscribe(() => {
     //   this.logger.log('[FIREBASEAuthSERVICE] - network connected!');
@@ -107,28 +126,28 @@ export class FirebaseAuthService extends MessagingAuthService {
     //   }, 3000);
     // });
 
-   
-      this.connectionService.monitor().subscribe(isConnected => {
-        this.isConnected = isConnected;
-        this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection isConnected', isConnected);
-        if (this.isConnected) {
-          this.status = "ONLINE";
-
-          // this.onAuthStateChanged();
-          firebase.auth().onAuthStateChanged(user => {
-            this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
-          })
-        }
-        else {
-          this.status = "OFFLINE";
-          // this.onAuthStateChanged();
-          firebase.auth().onAuthStateChanged(user => {
-            this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
-          })
-        }
-      })
-    
-  
+
+    // this.connectionService.monitor().subscribe(isConnected => {
+    //   this.isConnected = isConnected;
+    //   this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection isConnected', isConnected);
+    //   if (this.isConnected) {
+    //     this.status = "ONLINE";
+
+    //     // this.onAuthStateChanged();
+    //     firebase.auth().onAuthStateChanged(user => {
+    //       this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
+    //     })
+    //   }
+    //   else {
+    //     this.status = "OFFLINE";
+    //     // this.onAuthStateChanged();
+    //     firebase.auth().onAuthStateChanged(user => {
+    //       this.logger.log('[FIREBASEAuthSERVICE] checkInternetConnection onAuthStateChanged', user)
+    //     })
+    //   }
+    // })
+
+
   }
 
   // createOnline$() {
@@ -178,16 +197,37 @@ export class FirebaseAuthService extends MessagingAuthService {
    */
   onAuthStateChanged() {
     const that = this;
-    firebase.auth().onAuthStateChanged(user => {
-      this.logger.log('[FIREBASEAuthSERVICE] onAuthStateChanged', user)
+
+    // ---------------------------------------------------------------------------------------------------
+    // Protecting from multiple subsciptions due to multiple app initializations (call to initializeApp())
+    // Only one subscriber x application allowed
+    // ---------------------------------------------------------------------------------------------------
+    if (this.unsubscribe) {
+      console.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged ALREADY SUBSCRIBED')
+      return
+    }
+
+    this.unsubscribe = firebase.auth().onAuthStateChanged(user => {
+      console.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged', user)
       if (!user) {
         this.logger.log('[FIREBASEAuthSERVICE] 1 - PASSO OFFLINE AL CHAT MANAGER')
+        // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged user ', user)
+
         that.BSAuthStateChanged.next('offline');
+        // console.log('initialize FROM [APP-COMP] that.BSAuthStateChanged ', that.BSAuthStateChanged)
       } else {
         this.logger.log('[FIREBASEAuthSERVICE] 2 - PASSO ONLINE AL CHAT MANAGER')
+        // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged user ', user)
         that.BSAuthStateChanged.next('online');
       }
+    }, error => {
+      this.logger.error('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged * error * ', error)
+    }, () => {
+      this.logger.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged *** complete *** ');
+
     });
+
+
   }
 
   /**
@@ -195,36 +235,34 @@ export class FirebaseAuthService extends MessagingAuthService {
    * @param token
    */
   signInFirebaseWithCustomToken(token: string): Promise<any> {
-    const that = this;
-    let firebasePersistence;
-    console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
-    switch (this.getPersistence()) {
-      case 'SESSION': {
-        firebasePersistence = firebase.auth.Auth.Persistence.SESSION;
-        break;
-      }
-      case 'LOCAL': {
-        firebasePersistence = firebase.auth.Auth.Persistence.LOCAL;
-        break;
-      }
-      case 'NONE': {
-        firebasePersistence = firebase.auth.Auth.Persistence.NONE;
-        break;
-      }
-      default: {
-        firebasePersistence = firebase.auth.Auth.Persistence.NONE;
-        break;
-      }
-    }
-    return firebase.auth().setPersistence(firebasePersistence).then(async () => {
-      return firebase.auth().signInWithCustomToken(token).then(async () => {
-        // that.firebaseSignInWithCustomToken.next(response);
-      }).catch((error) => {
-        that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
-        // that.firebaseSignInWithCustomToken.next(null);
-      });
+    // const that = this;
+    // let firebasePersistence;
+    // // console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
+    // switch (this.getPersistence()) {
+    //   case 'SESSION': {
+    //     firebasePersistence = firebase.auth.Auth.Persistence.SESSION;
+    //     break;
+    //   }
+    //   case 'LOCAL': {
+    //     firebasePersistence = firebase.auth.Auth.Persistence.LOCAL;
+    //     break;
+    //   }
+    //   case 'NONE': {
+    //     firebasePersistence = firebase.auth.Auth.Persistence.NONE;
+    //     break;
+    //   }
+    //   default: {
+    //     firebasePersistence = firebase.auth.Auth.Persistence.NONE;
+    //     break;
+    //   }
+    // }
+    // return firebase.auth().setPersistence(firebasePersistence).then(async () => {
+    return firebase.auth().signInWithCustomToken(token).then(async (user) => {
+
+      // that.firebaseSignInWithCustomToken.next(response);
     }).catch((error) => {
-      that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
+      this.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
+      // that.firebaseSignInWithCustomToken.next(null);
     });
   }
 
@@ -271,6 +309,8 @@ export class FirebaseAuthService extends MessagingAuthService {
       // cancello token
       // this.appStorage.removeItem('tiledeskToken');
       //localStorage.removeItem('firebaseToken');
+
+
       that.BSSignOut.next(true);
     }).catch((error) => {
       that.logger.error('[FIREBASEAuthSERVICE] signOut error: ', error);
@@ -317,9 +357,12 @@ export class FirebaseAuthService extends MessagingAuthService {
 
   logout() {
     this.logger.log('[FIREBASEAuthSERVICE] logout');
+    this.BSAuthStateChanged.next(null);
+
     // cancello token firebase dal local storage e da firebase
     // dovrebbe scattare l'evento authchangeStat
     this.signOut();
+    // this.unsubscribe();
   }
 
 }

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

@@ -217,7 +217,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
         this.getFirebaseToken((error, idToken) => {
             this.logger.debug('[FIREBASEConversationsHandlerSERVICE] DELETE CONV idToken', idToken)
-            this.logger.error('F[FIREBASEConversationsHandlerSERVICE] DELETE CONV error', error)
+            this.logger.debug('F[FIREBASEConversationsHandlerSERVICE] DELETE CONV error', error)
             if (idToken) {
                 const httpOptions = {
                     headers: new HttpHeaders({
@@ -282,8 +282,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                 this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot.val() *****', childSnapshot.val());
                 this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot)
                 // && childData.uid
-                if (childSnapshot && childSnapshot.key) {
-                // if (childData) {
+                if (childSnapshot && childSnapshot.key && childData) {
                     childData.uid = childSnapshot.key;
                     const conversation = this.completeConversation(childData);
                     if (conversation) {
@@ -291,6 +290,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                     } else {
                         callback(null)
                     }
+
                 }
                 // this.BSConversationDetail.next(conversation);
             });
@@ -400,7 +400,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                 this.conversationAdded.next(conversationAdded);
             }
         } else {
-            this.logger.error('[FIREBASEConversationsHandlerSERVICE]ADDED::conversations with conversationId: ', childSnapshot.key, 'is not valid')
+            this.logger.log('[FIREBASEConversationsHandlerSERVICE]ADDED::conversations with conversationId: ', childSnapshot.key, 'is not valid')
         }
     }
 

package/src/chat21-core/providers/firebase/firebase-image-repo.ts

@@ -27,7 +27,7 @@ export class FirebaseImageRepoService extends ImageRepoService {
     getImagePhotoUrl(uid: string): string {
         this.baseImageURL = this.getImageBaseUrl()
         let sender_id = '';
-        if (uid.includes('bot_')) {
+        if (uid && uid.includes('bot_')) {
             sender_id = uid.slice(4)
         } else {
             sender_id = uid

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

@@ -39,10 +39,10 @@ export class FirebaseNotifications extends NotificationsService {
             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(registrations => {
-
-                        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)
+                    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 {
@@ -63,10 +63,10 @@ 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.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
+        // 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');
@@ -76,8 +76,9 @@ export class FirebaseNotifications extends NotificationsService {
         // }
 
 
-        const messaging = firebase.messaging();
+
         if (firebase.messaging.isSupported()) {
+            const messaging = firebase.messaging();
             // messaging.requestPermission()
             Notification.requestPermission().then((permission) => {
                 if (permission === 'granted') {
@@ -156,39 +157,38 @@ export class FirebaseNotifications extends NotificationsService {
 
     removeNotificationsInstance(callback: (string) => void) {
         var self = 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;
+            connectionsRefURL = connectionsRefinstancesId + self.FCMcurrentToken;
             const connectionsRef = firebase.database().ref().child(connectionsRefURL);
-            this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
-            this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', 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() {

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

@@ -129,6 +129,7 @@ export class FirebasePresenceService extends PresenceService {
    * @param userid
    */
   public setPresence(userid: string): void {
+    this.logger.info('initialize FROM [APP-COMP] - [FIREBASEPresenceSERVICE] - SET PRESENCE userid ', userid) 
     this.onlineConnectionsRef = this.referenceOnlineForUser(userid);
     this.lastOnlineConnectionsRef = this.referenceLastOnlineForUser(userid);
     const connectedRefURL = '/.info/connected';