@chat21/chat21-ionic 3.0.55 → 3.0.57

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # chat21-ionic ver 3.0
 
+### 3.0.57
+- Review of the "login" code
+
+### 3.0.56
+- Improves the auto-login method
+
 ### 3.0.55
 - Distributed release in production
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.55",
+    "version": "3.0.57",
     "author": "Tiledesk SRL",
     "homepage": "https://ionicframework.com/",
     "scripts": {

package/src/app/app.component.ts

@@ -58,6 +58,7 @@ import * as PACKAGE from 'package.json';
 
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators'
+
 // import { filter } from 'rxjs/operators';
 
 @Component({
@@ -73,7 +74,7 @@ export class AppComponent implements OnInit {
   // public appIsOnline$: Observable<boolean> = undefined;
   checkInternet: boolean;
 
-  private subscription: Subscription;
+  private BSAuthStateChangedSubscriptionRef: Subscription;
   public sidebarPage: any;
   public notificationsEnabled: boolean;
   public zone: NgZone;
@@ -99,7 +100,7 @@ export class AppComponent implements OnInit {
   public executedInitializeAppByWatchConnection: boolean = false;
   private version: string;
   private unsubscribe$: Subject<any> = new Subject<any>();
-  private isOnline: boolean = false;
+  // private isOnline: boolean = false;
 
   constructor(
     private platform: Platform,
@@ -162,71 +163,31 @@ export class AppComponent implements OnInit {
     this.logger.info('[APP-COMP] ngOnInit this.route.snapshot.params -->', this.route.snapshot.params);
     // this.initializeApp('oninit');
     const token = getParameterByName('jwt')
-    this.logger.info('[APP-COMP] ngOnInit token get from params -->', token);
-   
+    this.logger.info('[APP-COMP] ngOnInit AUTOLOGIN token get with getParameterByName -->', token);
+
     if (token) {
-      this.isOnline = false;
-      this.logger.log('[APP-COMP] AUTLOGIN > RUN SIGNINWITHCUSTOMTOKEN  params ', token)
+      // this.isOnline = false;
+      // this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN token get with this.isOnline  ', this.isOnline)
+      this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN token get with getParameterByName  ', token)
       // save token in local storage then 
-      this.appStorageService.setItem('tiledeskToken', token);
+
+      const storedToken = this.appStorageService.getItem('tiledeskToken');
+      this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN storedToken ', storedToken)
+      this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN SAVE THE PARAMS TOKEN ', token)
+      if (storedToken !== token) {
+        this.appStorageService.setItem('tiledeskToken', token);
+      } else {
+        this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN the current user already exist DON\'T SAVE ')
+      }
     }
     this.initializeApp('oninit');
-    // else {
-    //   this.isOnline = false;
-    //   this.logger.log('[APP-COMP] NO AUTLOGIN > RUN INIZIALIZE APP')
-    //   this.initializeApp('oninit');
-    // }
-
-    // const param = this.param();
-    // const token: string = param.get("jwt");
-    // this.logger.info('[APP-COMP] ngOnInit token geet from params -->', token);
-
-    // this.subscription = this.router.events.subscribe((event) => {
-    //   if (event instanceof NavigationStart) {
-    //    const current_url = event.url
-    //     this.logger.info('[APP-COMP] - NavigationStart event current_url ', current_url);
-    //     if (current_url.includes('jwt')) {
-    //       this.logger.info('[APP-COMP] - NavigationStart event current_url INCLUDES jwt');
-    //       const tokenString =  current_url.slice(current_url.lastIndexOf('=') + 1)
-    //       // const token =  tokenString.substring(1, tokenString.length - 1)
-    //       const token =  tokenString
-    //       this.logger.info('[APP-COMP] - NavigationStart event current_url INCLUDES jwt > token ', token);
-    //       this.signInWithCustomToken("JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI2MDhhZDAyZDNhNGRjMDAwMzQ0YWRlMTciLCJlbWFpbCI6Im51b3ZvcHJlZ2lub0BtYWlsbmEuY28iLCJmaXJzdG5hbWUiOiJOdW92byIsImxhc3RuYW1lIjoiUHJlZ2lubyIsImVtYWlsdmVyaWZpZWQiOnRydWUsImlhdCI6MTYzNDE5OTU1NiwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIiLCJqdGkiOiIwMGQyNTI0MS05MDI4LTRmYTYtYmJhNi0xOGNmZTUwNzdiYTMifQ.4kCuHOyceIMWnlyOiCvQEiDPqDZR8HwYgyQoqMYJxX0")
-    //     } else {
-    //       this.logger.info('[APP-COMP] - NavigationStart event current_url NOT INCLUDES jwt');
-    //     }
-    //   }
-    // });
 
-    // this.route.queryParams.subscribe(params => {
-    //   this.logger.log('[APP-COMP] ROUTE QUERY PARAMS params', params)
-    //   if (params.jwt) {
-    //     this.isOnline = false;
-    //     this.logger.log('[APP-COMP] AUTLOGIN > RUN SIGNINWITHCUSTOMTOKEN  params ', params)
-    //     this.tiledeskAuthService.signInWithCustomToken(params.jwt).then(user => {
-    //       this.logger.log('[APP-COMP] AUTLOGIN > RUN SIGNINWITHCUSTOMTOKEN user', user)
-    //       // if (user) {
-    //         this.logger.log('[APP-COMP] AUTLOGIN > RUN INIZIALIZE APP')
-    //         this.initializeApp('oninit');
-    //       // }
-    //       this.messagingAuthService.createCustomToken(params.jwt)
-    //     }).catch(error => {
-    //       this.logger.error('[APP-COMP] AUTLOGIN > RUN SIGNINWITHCUSTOMTOKE - ERROR', error)
-    //     })
-    //   } 
-    //   else {
-    //     this.isOnline = false;
-    //     this.logger.log('[APP-COMP] NO AUTLOGIN > RUN INIZIALIZE APP')
-    //     this.initializeApp('oninit');
-    //   }
-    // });
   }
 
 
   signInWithCustomToken(token) {
-
-    this.isOnline = false;
-    this.logger.log('[APP-COMP] SIGNINWITHCUSTOMTOKEN AUTLOGIN token', token)
+    // this.isOnline = false;
+    this.logger.log('[APP-COMP] SIGNINWITHCUSTOMTOKEN  token', token)
     this.tiledeskAuthService.signInWithCustomToken(token)
       .then((user: any) => {
         this.logger.log('[APP-COMP] SIGNINWITHCUSTOMTOKEN AUTLOGIN user', user)
@@ -242,8 +203,7 @@ export class AppComponent implements OnInit {
 
   /** */
   initializeApp(calledby: string) {
-    this.logger.info('[APP-COMP] - initializeApp !!! CALLED-BY: ', calledby);
-
+    console.log('[APP-COMP] - X - initializeApp !!! CALLED-BY: ', calledby);
     this.logger.log('[APP-COMP] appconfig platform is cordova: ', this.platform.is('cordova'))
 
     if (!this.platform.is('cordova')) {
@@ -263,10 +223,6 @@ export class AppComponent implements OnInit {
 
     this.tenant = appconfig.firebaseConfig.tenant;
     this.logger.info('[APP-COMP] appconfig firebaseConfig tenant: ', this.tenant);
-
-    
-
-
     this.notificationsEnabled = true;
     this.zone = new NgZone({}); // a cosa serve?
 
@@ -298,35 +254,19 @@ export class AppComponent implements OnInit {
 
       this.initAuthentication();
       this.initSubscriptions();
-      this.initAudio()
+      this.initAudio();
 
       this.logger.debug('[APP-COMP] initializeApp:: ', this.sidebarNav, this.detailNav);
-      // this.listenToLogoutEvent()
+
       this.translateToastMsgs();
 
       // ---------------------------------------
       // Watch to network status
       // ---------------------------------------
       this.watchToConnectionStatus();
-      // this.listenToUserIsSignedIn();
-
-
     });
   }
 
-  // listenToUserIsSignedIn() {
-  //   this.tiledeskAuthService.isOnline$
-  //     .pipe(filter((isOnline) => isOnline !== null))
-  //     .subscribe((isOnline: any) => {
-  //       console.log('[APP-COMP] user isOnline: ', isOnline);
-
-  //       // if (isOnline === false) {
-  //       //   this.events.publish('profileInfoButtonClick:logout', true);
-  //       // }
-  //     });
-  // }
-
-
 
   watchToConnectionStatus() {
     this.networkService.checkInternetFunc().subscribe(isOnline => {
@@ -352,7 +292,7 @@ export class AppComponent implements OnInit {
               if (elemIonNavchildNodes.length === 0) {
                 this.logger.log('[APP-COMP] - watchToConnectionStatus - elemIonNavchildNodes  HERE YES', elemIonNavchildNodes);
 
-                this.initializeApp('checkinternet');
+                // this.initializeApp('checkinternet');
                 this.executedInitializeAppByWatchConnection = true;
               }
             }, 2000);
@@ -366,7 +306,7 @@ export class AppComponent implements OnInit {
               const childElementCount = elemIonRouterOutlet.childElementCount;
               this.logger.log('[APP-COMP] - watchToConnectionStatus - mobile * childElementCount *', childElementCount)
               if (childElementCount === 1) {
-                this.initializeApp('checkinternet');
+                // this.initializeApp('checkinternet');
                 this.executedInitializeAppByWatchConnection = true;
               }
             }, 2000);
@@ -415,19 +355,18 @@ export class AppComponent implements OnInit {
   /**------- AUTHENTICATION FUNCTIONS --> START <--- +*/
   private initAuthentication() {
     const tiledeskToken = this.appStorageService.getItem('tiledeskToken')
-    this.logger.log('[APP-COMP] >>> INIT-AUTHENTICATION !!! ')
+    console.log('[APP-COMP] >>> INIT-AUTHENTICATION !!! ')
     this.logger.log('[APP-COMP] >>> initAuthentication tiledeskToken ', tiledeskToken)
-
-    const currentUser = JSON.parse(this.appStorageService.getItem('currentUser'));
-    this.logger.log('[APP-COMP] >>> initAuthentication currentUser ', currentUser)
+    // const currentUser = JSON.parse(this.appStorageService.getItem('currentUser'));
+    // this.logger.log('[APP-COMP] >>> initAuthentication currentUser ', currentUser)
     if (tiledeskToken) {
       this.logger.log('[APP-COMP] >>> initAuthentication I LOG IN WITH A TOKEN EXISTING IN THE LOCAL STORAGE OR WITH A TOKEN PASSED IN THE URL PARAMETERS <<<')
-
       this.tiledeskAuthService.signInWithCustomToken(tiledeskToken).then(user => {
         this.logger.log('[APP-COMP] >>> initAuthentication user ', user)
         this.messagingAuthService.createCustomToken(tiledeskToken)
-      }).catch(error => { this.logger.error('[APP-COMP] initAuthentication SIGNINWITHCUSTOMTOKEN error::' + error) })
-
+      }).catch(error => {
+        this.logger.error('[APP-COMP] initAuthentication SIGNINWITHCUSTOMTOKEN error::', error)
+      })
     } else {
       this.logger.warn('[APP-COMP] >>> I AM NOT LOGGED IN <<<')
       const that = this;
@@ -439,24 +378,11 @@ export class AppComponent implements OnInit {
         }
       }, 1000);
     }
-
-    // this.route.queryParams.subscribe(params => {
-    //   this.logger.log('[APP-COMP] SIGNINWITHCUSTOMTOKEN AUTLOGIN params 1', params)
-    //   if (params.jwt) {
-    //     this.isOnline = false;
-    //     this.logger.log('[APP-COMP] SIGNINWITHCUSTOMTOKEN AUTLOGIN params 2', params)
-    //     this.tiledeskAuthService.signInWithCustomToken(params.jwt).then(user => {
-    //       this.messagingAuthService.createCustomToken(params.jwt)
-    //     }).catch(error => {
-    //       this.logger.error('[APP-COMP] SIGNINWITHCUSTOMTOKEN error::', error)
-    //     })
-    //   }
-    // });
   }
 
-  authenticate() {
+  checkTokenAndGoOffline() {
     let token = this.appStorageService.getItem('tiledeskToken');
-    this.logger.info('[APP-COMP] ***** authenticate - stored token *****', token);
+    this.logger.info('[APP-COMP] ***** checkTokenAndGoOffline - stored token *****', token);
     if (!token) {
       this.goOffLine()
     }
@@ -470,15 +396,15 @@ export class AppComponent implements OnInit {
    * @param user
    */
   goOnLine = () => {
-    this.isOnline = true;
-    this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - GO ONLINE isOnline ', this.isOnline);
+    // this.isOnline = true;
+    // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - GO-ONLINE isOnline ', this.isOnline);
 
 
     clearTimeout(this.timeModalLogin);
     const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
     const currentUser = this.tiledeskAuthService.getCurrentUser();
     // this.logger.printDebug('APP-COMP - goOnLine****', currentUser);
-    this.logger.log('[APP-COMP] - goOnLine****', currentUser);
+    this.logger.log('[APP-COMP] - GO-ONLINE - currentUser ', currentUser);
     this.chatManager.setTiledeskToken(tiledeskToken);
     this.chatManager.setCurrentUser(currentUser);
     // ----------------------------------------------
@@ -509,8 +435,8 @@ export class AppComponent implements OnInit {
   }
 
   goOffLine = () => {
-    this.logger.log('[APP-COMP] ************** goOffLine:', this.authModal);
-    this.isOnline = false;
+    this.logger.log('[APP-COMP] ************** goOffLine authModal:', this.authModal);
+    // this.isOnline = false;
     // this.conversationsHandlerService.conversations = [];
 
     this.chatManager.setTiledeskToken(null);
@@ -671,20 +597,30 @@ export class AppComponent implements OnInit {
     this.logger.log('initialize FROM [APP-COMP] - initSubscriptions');
 
 
-    this.messagingAuthService.BSAuthStateChanged
-      .pipe(takeUntil(this.unsubscribe$))
+    // ---------------------------------------------------------------------------------------------------
+    // Protecting from multiple subsciptions due to multiple app initializations (call to initializeApp())
+    // Only one subscriber x application allowed
+    // ---------------------------------------------------------------------------------------------------
+    if (this.BSAuthStateChangedSubscriptionRef) {
+      this.logger.log('initialize FROM [APP-COMP] - BSAuthStateChanged ALREADY SUBSCRIBED');
+      return;
+    }
+
+    this.BSAuthStateChangedSubscriptionRef = this.messagingAuthService.BSAuthStateChanged
+      // .pipe(takeUntil(this.unsubscribe$))
       .pipe(filter((state) => state !== null))
       .subscribe((state: any) => {
-        this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged  state', state);
-        this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged  isOnline', this.isOnline);
+        console.log('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged  state', state);
+        // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged  isOnline', this.isOnline);
         if (state && state === AUTH_STATE_ONLINE) {
-          const user = this.tiledeskAuthService.getCurrentUser();
-          if (this.isOnline === false) {
-            this.goOnLine();
-          }
+          // const user = this.tiledeskAuthService.getCurrentUser();
+          // if (this.isOnline === false) {
+          // if (AUTH_STATE_ONLINE) {
+          this.goOnLine();
+          // }
         } else if (state === AUTH_STATE_OFFLINE) {
-          // that.goOffLine();
-          this.authenticate() //se c'è un tiledeskToken salvato, allora aspetta, altrimenti vai offline
+          this.checkTokenAndGoOffline() //se c'è un tiledeskToken salvato, allora aspetta, altrimenti vai offline
+          // this.goOffLine()
         }
       }, error => {
         this.logger.error('initialize FROM [APP-COMP] - [APP-COMP] ***** BSAuthStateChanged * error * ', error)
@@ -922,20 +858,35 @@ export class AppComponent implements OnInit {
     }
 
     if (this.appStorageService.getItem('tiledeskToken') === null) {
-      this.logger.log('[APP-COMP] - onStorageChanged tiledeskToken is null - RUN LOGOUT')
+      console.log('[APP-COMP] - onStorageChanged tiledeskToken is null - RUN LOGOUT')
       this.tiledeskAuthService.logOut()
       this.messagingAuthService.logout();
       this.events.publish('profileInfoButtonClick:logout', true);
-      this.isOnline = false;
+      // this.isOnline = false;
     }
     else {
       const currentUser = this.tiledeskAuthService.getCurrentUser();
+      console.log('[APP-COMP] - X - onStorageChanged currentUser', currentUser)
+
+      const currentToken = this.tiledeskAuthService.getTiledeskToken();
+      console.log('[APP-COMP] - onStorageChanged currentToken', currentToken)
+      if (this.appStorageService.getItem('tiledeskToken') !== null && currentToken !== this.appStorageService.getItem('tiledeskToken')) {
+
+        console.log('[APP-COMP] - onStorageChanged wentOnline 2')
+        // DEALLOCO RISORSE OCCUPATE
+        this.messagingAuthService.logout();
+        this.appStorageService.removeItem('currentUser')
+        this.tiledeskAuthService.setCurrentUser(null);
+        // this.unsubscribe$.next();
+        // this.unsubscribe$.complete();
+        this.initializeApp('onstoragechanged');
 
-      if (!currentUser && this.appStorageService.getItem('tiledeskToken') !== null) {
-        this.logger.log('[APP-COMP] - onStorageChanged currentUser', currentUser)
-        // console.log('[APP-COMP] - onStorageChanged wentOnline 2', this.wentOnline)
+        console.log('[APP-COMP] -  that.BSAuthStateChanged ', this.messagingAuthService.BSAuthStateChanged)
 
-        this.initializeApp('onstoragechanged');
+        // console.log('[APP-COMP]  onAuthStateChanged HERE !!! ')
+        // firebase.auth().onAuthStateChanged(user => {
+        //   console.log('[APP-COMP]  onAuthStateChanged', user)
+        // })
 
       }
     }

package/src/chat21-core/providers/abstract/app-storage.service.ts

@@ -9,8 +9,8 @@ export abstract class AppStorageService {
   abstract initialize(storagePrefix: string, persistence: string, projectID?: string): void;
   abstract getItem(key: string): any;
   abstract setItem(key: string, value: any): void;
-  abstract getItemWithoutProjectID(key: string): any;
-  abstract setItemWithoutProjectID(key: string, value: any): void;
+  // abstract getItemWithoutProjectID(key: string): any; // deprecated !Not tUsed
+  // abstract setItemWithoutProjectID(key: string, value: any): void; // deprecated !Not tUsed
   abstract removeItem(key: string): void;
   abstract clear(): void;
 

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

@@ -64,7 +64,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
      * inizializzo conversations handler
      */
     initialize(tenant: string, userId: string, translationMap: Map<string, string>) {
-        this.logger.info('[initialize FROM [APP-COMP] - FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
+        this.logger.info('initialize FROM [APP-COMP] - FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
         this.tenant = tenant;
         this.loggedUserId = userId;
         this.translationMap = translationMap;

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,19 +197,37 @@ export class FirebaseAuthService extends MessagingAuthService {
    */
   onAuthStateChanged() {
     const that = this;
-    firebase.auth().onAuthStateChanged(user => {
-      this.logger.log('initialize FROM [APP-COMP] - [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 *** ');
+
     });
+
+
   }
 
   /**
@@ -198,37 +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 (user) => {
-        
-        // 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);
     });
   }
 
@@ -275,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);
@@ -322,9 +358,11 @@ 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-notifications.ts

@@ -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/localSessionStorage.ts

@@ -6,35 +6,35 @@ import { LoggerService } from './abstract/logger.service';
 import { LoggerInstance } from './logger/loggerInstance';
 
 @Injectable()
-export class LocalSessionStorage extends AppStorageService{
-    
-    private storagePrefix: string = STORAGE_PREFIX;
-    private projectID: string;
-    private persistence: string;
-    private logger: LoggerService = LoggerInstance.getInstance();
-    
-    initialize(storagePrefix: string, persistence: string, projectID: string): void {
-      this.storagePrefix = storagePrefix;
-      this.projectID = projectID;
-      this.persistence = persistence;
-      // this.persistence = 'LOCAL';
-      // this.logger.info('[LocalSessionStorage] - initialize ', this.storagePrefix, this.persistence, this.projectID)
+export class LocalSessionStorage extends AppStorageService {
+
+  private storagePrefix: string = STORAGE_PREFIX;
+  private projectID: string;
+  private persistence: string;
+  private logger: LoggerService = LoggerInstance.getInstance();
+
+  initialize(storagePrefix: string, persistence: string, projectID: string): void {
+    this.storagePrefix = storagePrefix;
+    this.projectID = projectID;
+    this.persistence = persistence;
+    // this.persistence = 'LOCAL';
+    // this.logger.info('[LocalSessionStorage] - initialize ', this.storagePrefix, this.persistence, this.projectID)
   }
 
   /** GET item in local/session storage from key value
    *  @param key
    */
   getItem(key: string) {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] getItem - Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      return this.getValueForKey(newKey);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] getItem - Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    return this.getValueForKey(newKey);
   }
 
   /** SET new item in local/session storage
@@ -42,173 +42,174 @@ export class LocalSessionStorage extends AppStorageService{
    *  @param value
    */
   setItem(key: string, value: any): void {
-      this.removeItem(key);
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] setItem > Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      this.saveValueForKey(newKey, value);
+    // this.removeItem(key);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] setItem > Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    this.saveValueForKey(newKey, value);
   }
 
   /** GET item in local/session storage from key value without project id SUFFIX
-   *  @param key
+   * @param key
+   * @deprecated
    */
-  getItemWithoutProjectID(key: string) {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] getItemWithoutProjectID > Error :' + e);
-      }
-      const newKey = prefix + key;
-      return this.getValueForKey(newKey);
-  }
+  // getItemWithoutProjectID(key: string) {
+  //     let prefix;
+  //     try {
+  //         // const sv = 'sv' + environment.shemaVersion + '_';
+  //         // prefix = prefix + sv;
+  //         prefix = this.storagePrefix + '_';
+  //     } catch (e) {
+  //         this.logger.error('[LocalSessionStorage] getItemWithoutProjectID > Error :' + e);
+  //     }
+  //     const newKey = prefix + key;
+  //     return this.getValueForKey(newKey);
+  // }
 
   /** SET new item in local/session storage without project id SUFFIX
    *  @param key
    *  @param value
    */
-  setItemWithoutProjectID(key: string, value: any): void {
-      this.removeItem(key);
-      let prefix = STORAGE_PREFIX;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] setItemWithoutProjectID > Error :' + e);
-      }
-      const newKey = prefix + key;
-      this.saveValueForKey(newKey, value);
-  }
+  // setItemWithoutProjectID(key: string, value: any): void {
+  //   this.removeItem(key);
+  //   let prefix = STORAGE_PREFIX;
+  //   try {
+  //     // const sv = 'sv' + environment.shemaVersion + '_';
+  //     // prefix = prefix + sv;
+  //     prefix = this.storagePrefix + '_';
+  //   } catch (e) {
+  //     this.logger.error('[LocalSessionStorage] setItemWithoutProjectID > Error :' + e);
+  //   }
+  //   const newKey = prefix + key;
+  //   this.saveValueForKey(newKey, value);
+  // }
 
   removeItem(key: string): void {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] removeItem > Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      return this.removeItemForKey(newKey);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] removeItem > Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    return this.removeItemForKey(newKey);
   }
 
   clear(): void {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] clear > Error :' + e);
-      }
-      const prefixKey = prefix + this.projectID
-      const arrayKey: Array<string>  = [];
-      for (let i = 0; i < localStorage.length; i++) {
-        const key = localStorage.key(i);
-        if (key.indexOf(prefixKey) !== -1) {
-          arrayKey.push(key);
-        }
-      }
-  
-      for (let i = 0; i < arrayKey.length; i++) {
-        // localStorage.removeItem(arrayKey[i]);
-        this.removeItemForKey(arrayKey[i]);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] clear > Error :' + e);
+    }
+    const prefixKey = prefix + this.projectID
+    const arrayKey: Array<string> = [];
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key.indexOf(prefixKey) !== -1) {
+        arrayKey.push(key);
       }
-  
+    }
+
+    for (let i = 0; i < arrayKey.length; i++) {
+      // localStorage.removeItem(arrayKey[i]);
+      this.removeItemForKey(arrayKey[i]);
+    }
+
   }
 
 
   // ---------- PRIVATE METHODS start --------------- //
 
   private getValueForKey(key) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.getItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.getItem(key);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.getItem(key);
+      } else {
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.getItem(key);
+      } else {
+        this.logger.warn('sessionStorage is not defind. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.getItem(key);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.getItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
       }
+    }
   }
 
   private saveValueForKey(key, value) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.setItem(key, value);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.setItem(key, value);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.setItem(key, value);
+      } else {
+        this.logger.warn('localStorage is not defined. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.setItem(key, value);
+      } else {
+        this.logger.warn('sessionStorage is not defined. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.setItem(key, value);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.setItem(key, value);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defined. Storage disabled');
+        return null;
       }
+    }
   }
 
   private removeItemForKey(key: string) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.removeItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.removeItem(key);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.removeItem(key);
+      } else {
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.removeItem(key);
+      } else {
+        this.logger.warn('sessionStorage is not defind. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.removeItem(key);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.removeItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
       }
+    }
   }
 
 }