@chat21/chat21-ionic 3.0.55-RC12 → 3.0.55-RC20

package/src/app/services/network-service/network.service.spec.ts

@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NetworkService } from './network.service';
+
+describe('NetworkService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: NetworkService = TestBed.get(NetworkService);
+    expect(service).toBeTruthy();
+  });
+});

package/src/app/services/network-service/network.service.ts

@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { Observable, Observer, fromEvent, merge, of } from 'rxjs';
+import { mapTo } from 'rxjs/operators';
+import { Platform } from '@ionic/angular';
+import { Network } from '@ionic-native/network/ngx';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NetworkService {
+
+  public appIsOnline$: Observable<boolean> = undefined;
+  checkInternet: boolean;
+
+  constructor(
+    private platform: Platform,
+    private network: Network
+  ) { }
+
+
+
+  checkInternetFunc() {
+    if (!window || !navigator || !('onLine' in navigator)) return;
+
+    this.appIsOnline$ = Observable.create(observer => {
+      observer.next(true);
+    }).pipe(mapTo(true));
+
+    if (this.platform.is('cordova')) {
+      // on Device - when platform is cordova
+      this.appIsOnline$ = merge(
+        this.network.onConnect().pipe(mapTo(true)),
+        this.network.onDisconnect().pipe(mapTo(false))
+      );
+    } else {
+      // on Browser - when platform is Browser
+      this.appIsOnline$ = merge(
+        of(navigator.onLine),
+        fromEvent(window, 'online').pipe(mapTo(true)),
+        fromEvent(window, 'offline').pipe(mapTo(false))
+      );
+    }
+    return this.appIsOnline$
+  }
+
+}

package/src/chat-config-pre-test.json

@@ -2,7 +2,7 @@
     "chatEngine": "firebase",
     "uploadEngine": "firebase",
     "pushEngine": "firebase",
-    "logLevel": "debug",
+    "logLevel": "info",
     "fileUploadAccept":"*/*",
     "authPersistence": "LOCAL",
     "firebaseConfig": {

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

@@ -88,7 +88,7 @@ export class FirebaseAuthService extends MessagingAuthService {
     //     this.onAuthStateChanged();
     //   }
     // }) 
-    this.checkInternetConnection()
+    // this.checkInternetConnection()
 
     this.onAuthStateChanged();
   }
@@ -197,7 +197,7 @@ export class FirebaseAuthService extends MessagingAuthService {
   signInFirebaseWithCustomToken(token: string): Promise<any> {
     const that = this;
     let firebasePersistence;
-    console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
+    // console.log('FB-AUTH firebasePersistence', this.getPersistence()) 
     switch (this.getPersistence()) {
       case 'SESSION': {
         firebasePersistence = firebase.auth.Auth.Persistence.SESSION;

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

@@ -158,38 +158,43 @@ 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)
+                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 user is signed in. ', user)
+                self.logger.debug('[FIREBASE-NOTIFICATIONS] - No FB 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);
+        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/tiledesk/tiledesk-auth.service.ts

@@ -22,9 +22,9 @@ export class TiledeskAuthService {
   private tiledeskToken: string;
   private currentUser: UserModel;
   private logger: LoggerService = LoggerInstance.getInstance()
-  
+
   constructor(public http: HttpClient,
-              public appStorage: AppStorageService) { }
+    public appStorage: AppStorageService) { }
 
 
   initialize(serverBaseUrl: string) {
@@ -57,7 +57,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -86,7 +87,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -111,7 +113,9 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(this.currentUser)
         }
       }, (error) => {
@@ -120,10 +124,11 @@ export class TiledeskAuthService {
     });
   }
 
-  logOut(){
+  logOut() {
     this.logger.debug('[TILEDESK-AUTH] logOut()')
     this.appStorage.removeItem('tiledeskToken')
     this.appStorage.removeItem('currentUser')
+    this.setCurrentUser(null);
   }
 
 
@@ -149,13 +154,28 @@ export class TiledeskAuthService {
       member.fullname = fullname;
       member.avatar = avatar;
       member.color = color;
-      this.currentUser = member; 
-      this.logger.debug('[TILEDESK-AUTH] - createCompleteUser member ', member)
+      this.currentUser = member;
+      this.logger.debug('[TILEDESK-AUTH] - createCompleteUser member ', member);
       this.appStorage.setItem('currentUser', JSON.stringify(this.currentUser));
     } catch (err) {
-      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err) 
+      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err)
+    }
+  }
+
+
+  private checkAndSetInStorageTiledeskToken(tiledeskToken) {
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken tiledeskToken from request', tiledeskToken)
+    const storedTiledeskToken = this.appStorage.getItem('tiledeskToken');
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken storedTiledeskToken ', storedTiledeskToken)
+    if (!storedTiledeskToken) {
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken TOKEN DOES NOT EXIST - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken !== tiledeskToken) {
+      console.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST BUT IS != FROM TOKEN - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken){
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
-    
   }
 
 

package/src/index.html

@@ -27,7 +27,7 @@
   <!-- <script src="./assets/js/watchToConnectionAtStartUp.js"></script> -->
 
   <script>
-    console.log("index.html Hey script watchToConnectionAtStartUp! ");
+    // console.log("index.html Hey script watchToConnectionAtStartUp! ");
     // // ononline version
     window.ononline = (event) => {
       console.log("index.html You are now connected to the network.");
@@ -37,7 +37,7 @@
     window.onoffline = (event) => {
       console.log("The network connection has been lost.");
     };
-    console.log('index.html window.navigator.onLine is ' + window.navigator.onLine);
+    // console.log('index.html window.navigator.onLine is ' + window.navigator.onLine);
 
     // || window.navigator.onLine === true
     if (window.navigator.onLine === false ) {