@chat21/chat21-ionic 3.0.55 → 3.0.59-rc10

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() {
-
+    this.logger.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.logger.log('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
+
+
+    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 () => {
+      this.logger.log('[FIREBASEAuthSERVICE] firebasePersistence ', firebasePersistence)
+      // this.onAuthStateChanged(); // commented for new-login
+    })
+      .catch((error) => {
+        this.logger.error('[FIREBASEAuthSERVICE]  Error: ', error);
+      });
+
 
-    this.onAuthStateChanged();
   }
 
-  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,60 +197,42 @@ export class FirebaseAuthService extends MessagingAuthService {
    */
   onAuthStateChanged() {
     const that = this;
-    firebase.auth().onAuthStateChanged(user => {
+
+    // ---------------------------------------------------------------------------------------------------
+    // Protecting from multiple subsciptions due to multiple app initializations (call to initializeApp())
+    // Only one subscriber x application allowed
+    // ---------------------------------------------------------------------------------------------------
+    if (this.unsubscribe) {
+      this.logger.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged ALREADY SUBSCRIBED')
+      return
+    }
+
+    this.unsubscribe = firebase.auth().onAuthStateChanged(user => {
       this.logger.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 *** ');
 
-  /**
-   * FIREBASE: signInWithCustomToken
-   * @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 (user) => {
-        
-        // that.firebaseSignInWithCustomToken.next(response);
-      }).catch((error) => {
-        that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
-        // that.firebaseSignInWithCustomToken.next(null);
-      });
-    }).catch((error) => {
-      that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
     });
+
+
   }
 
+
   /**
    * FIREBASE: createUserWithEmailAndPassword
    * @param email
@@ -275,6 +276,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);
@@ -319,12 +322,55 @@ export class FirebaseAuthService extends MessagingAuthService {
     });
   }
 
+
+  /**
+   * FIREBASE: signInWithCustomToken
+   * @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 (user) => {
+      this.logger.log('[FIREBASEAuthSERVICE] signInWithCustomToken user: ', user);
+      if (user) {
+        this.BSAuthStateChanged.next('online');
+      }
+      // that.firebaseSignInWithCustomToken.next(response);
+    }).catch((error) => {
+      this.logger.error('[FIREBASEAuthSERVICE] signInWithCustomToken Error: ', error);
+      // that.firebaseSignInWithCustomToken.next(null);
+    });
+  }
+
   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.BSAuthStateChanged.next('offline');
     this.signOut();
+    // this.unsubscribe();
   }
 
 }

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

@@ -65,7 +65,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
      * inizializzo conversation handler
      */
     initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,tenant: string,translationMap: Map<string, string>) {
-        this.logger.info('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
+        this.logger.log('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
         this.recipientId = recipientId;
         this.recipientFullname = recipientFullName;
         this.loggedUser = loggedUser;

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

@@ -26,7 +26,7 @@ export class FirebaseNotifications extends NotificationsService {
     initialize(tenant: string, vapId: string): void {
         this.tenant = tenant
         this.vapidkey = vapId
-        this.logger.info('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
+        this.logger.log('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
 
 
         if (!('serviceWorker' in navigator)) {
@@ -157,21 +157,16 @@ export class FirebaseNotifications extends NotificationsService {
 
     removeNotificationsInstance(callback: (string) => void) {
         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)
-            }
-        });
-
+        // 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);
@@ -194,7 +189,6 @@ export class FirebaseNotifications extends NotificationsService {
                 })
         }
 
-
     }
 
     // removeNotificationsInstance() {

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

@@ -49,7 +49,7 @@ export class FirebasePresenceService extends PresenceService {
   public initialize(tenant: string) {
     // this.tenant = this.getTenant();
     this.tenant = tenant;
-    this.logger.info('[FIREBASEPresenceSERVICE] initialize this.tenant', this.tenant);
+    this.logger.log('[FIREBASEPresenceSERVICE] initialize this.tenant', this.tenant);
     this.urlNodePresence = '/apps/' + this.tenant + '/presence/';
   }
 
@@ -129,7 +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.logger.log('initialize FROM [APP-COMP] - [FIREBASEPresenceSERVICE] - SET PRESENCE userid ', userid) 
     this.onlineConnectionsRef = this.referenceOnlineForUser(userid);
     this.lastOnlineConnectionsRef = this.referenceLastOnlineForUser(userid);
     const connectedRefURL = '/.info/connected';

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

@@ -52,7 +52,7 @@ export class FirebaseTypingService extends TypingService {
   public initialize(tenant: string) {
     // this.tenant = this.getTenant();
     this.tenant = tenant;
-    this.logger.info('[FIREBASETypingSERVICE] initialize - tenant ', this.tenant)
+    this.logger.log('[FIREBASETypingSERVICE] initialize - tenant ', this.tenant)
     this.urlNodeTypings = '/apps/' + this.tenant + '/typings/';
   }
 

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

@@ -43,7 +43,7 @@ export class FirebaseUploadService extends UploadService {
   }
 
   public initialize() {
-    this.logger.info('[FIREBASEUploadSERVICE] initialize');
+    this.logger.log('[FIREBASEUploadSERVICE] initialize');
   }
   
   public upload(userId: string, upload: UploadModel): Promise<any> {