@chat21/chat21-ionic 3.0.59-rc10 → 3.0.59-rc19

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -35,7 +35,8 @@ import { Platform } from '@ionic/angular';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { NetworkService } from 'src/app/services/network-service/network.service';
-
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators'
 
 @Component({
   selector: 'app-conversations-list',
@@ -43,7 +44,10 @@ import { NetworkService } from 'src/app/services/network-service/network.service
   styleUrls: ['./conversations-list.page.scss'],
 })
 export class ConversationListPage implements OnInit {
+
   @ViewChild('ioncontentconvlist', { static: false }) ionContentConvList: IonContent;
+
+  private unsubscribe$: Subject<any> = new Subject<any>();
   private subscriptions: Array<string>;
   public tenant: string;
   public loggedUserUid: string;
@@ -72,6 +76,11 @@ export class ConversationListPage implements OnInit {
   public lastProjectId: string;
   public isOnline: boolean = true;
   public checkInternet: boolean;
+
+  public displayNewConvsItem: boolean = true
+
+
+
   constructor(
     private router: Router,
     private route: ActivatedRoute,
@@ -90,12 +99,35 @@ export class ConversationListPage implements OnInit {
     public appConfigProvider: AppConfigProvider,
     public platform: Platform,
     private networkService: NetworkService,
-   
+
   ) {
     this.listenToAppCompConvsLengthOnInitConvs();
     this.listenToLogoutEvent();
+    this.listenGoOnline();
+    this.listenGoOffline();
     this.listenToSwPostMessage();
+    this.listenSupportConvIdHasChanged();
+    this.listenDirectConvIdHasChanged();
+  }
 
+  listenSupportConvIdHasChanged() {
+    this.events.subscribe('supportconvid:haschanged', (convId) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - convId', convId);
+      if (convId) {
+        const conversationSelected = this.conversations.find(item => item.uid === convId);
+        // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - conversationSelected', conversationSelected);
+        this.onConversationSelected(conversationSelected)
+      }
+    });
+  }
+
+  listenDirectConvIdHasChanged() {
+    this.events.subscribe('directconvid:haschanged', (contact_id) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To directconvid:haschanged - contact_id', contact_id);
+      if (contact_id) {
+        this.uidConvSelected = contact_id
+      }
+    });
   }
 
 
@@ -105,8 +137,45 @@ export class ConversationListPage implements OnInit {
   ngOnInit() {
     this.watchToConnectionStatus();
     this.getSupportMode();
+
+    const currentUrl = this.router.url;
+    this.logger.log('[CONVS-LIST-PAGE] current_url ngOnInit ', currentUrl);
+    // this.route.queryParams.subscribe(params => {
+    //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params', params);
+      // if (params && params.convselected) {
+      //   console.log('[CONVS-LIST-PAGE] ngOnInit params convselected:', params.convselected);
+
+      //   const conversationSelected = this.conversations.find(item => item.uid === params.convselected);
+      //   if (conversationSelected) {
+      //     this.conversationSelected = conversationSelected;
+      //     console.log('[CONVS-LIST-PAGE] ngOnInit params convselected - conversationSelected: ', this.conversationSelected);
+      //     this.navigateByUrl('active', params.convselected)
+      //   }
+
+      // } else {
+      //   console.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
+      // if (params && params.contact_id && params.contact_fullname) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params contact_id:', params.contact_id, 'contact_fullname ', params.contact_fullname);
+      //   this.router.navigateByUrl('conversation-detail/' + params.contact_id + '/' + params.contact_fullname + '/new');
+      //   this.uidConvSelected = params.contact_id
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
+
+      // if (params && params.conversation_detail) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params conversation_detail:', params.conversation_detail);
+      //   this.router.navigateByUrl('conversation-detail/');
+
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
+
+    // });
   }
 
+
+
   getSupportMode() {
     this.supportMode = this.appConfigProvider.getConfig().supportMode;
     // console.log('[ION-LIST-CONVS-COMP] - supportMode ', this.supportMode)
@@ -218,12 +287,20 @@ export class ConversationListPage implements OnInit {
 
   private listnerStart() {
     const that = this;
-    this.chatManager.BSStart.subscribe((data: any) => {
-      this.logger.log('[CONVS-LIST-PAGE] ***** BSStart Current user *****', data);
-      if (data) {
-        that.initialize();
-      }
-    });
+    this.chatManager.BSStart
+      .pipe(
+        takeUntil(that.unsubscribe$)
+      )
+      .subscribe((data: any) => {
+        this.logger.log('[CONVS-LIST-PAGE] - BSStart SUBSCR DATA - Current user *****', data);
+        if (data) {
+          that.initialize();
+        }
+      }, error => {
+        this.logger.error('[CONVS-LIST-PAGE] - BSStart SUBSCR - ERROR: ', error);
+      }, () => {
+        this.logger.log('[CONVS-LIST-PAGE] - BSStart SUBSCR * COMPLETE *')
+      });
   }
 
 
@@ -259,7 +336,6 @@ export class ConversationListPage implements OnInit {
     if (!this.archivedConversations || this.archivedConversations.length === 0) {
       this.loadingIsActive = false;
     }
-
   }
 
 
@@ -279,9 +355,32 @@ export class ConversationListPage implements OnInit {
     });
   }
 
+  listenGoOnline() {
+    this.events.subscribe('go:online', (goonline) => {
+      this.logger.info('[CONVS-LIST-PAGE] - listen To go:online - goonline', goonline);
+      // this.events.unsubscribe('profileInfoButtonClick:logout')
+      if (goonline === true) {
+        this.displayNewConvsItem = true
+      }
+    });
+  }
+
+  listenGoOffline() {
+
+    this.events.subscribe('go:offline', (offline) => {
+      this.logger.info('[CONVS-LIST-PAGE] - listen To go:offline - offline', offline);
+      // this.events.unsubscribe('profileInfoButtonClick:logout')
+      if (offline === true) {
+        this.displayNewConvsItem = false
+      }
+    });
+  }
+
   listenToLogoutEvent() {
     this.events.subscribe('profileInfoButtonClick:logout', (hasclickedlogout) => {
       this.logger.info('[CONVS-LIST-PAGE] - listenToLogoutEvent - hasclickedlogout', hasclickedlogout);
+
+
       this.conversations = []
       this.conversationsHandlerService.conversations = [];
       this.uidConvSelected = null;
@@ -392,8 +491,11 @@ export class ConversationListPage implements OnInit {
    * evento richiamato quando si seleziona un utente nell'elenco degli user
    * apro dettaglio conversazione
    */
+  // --------------------------------
+  // !!!!!! IS USED? ?????
+  // ------------------------------
   subscribeChangedConversationSelected = (user: UserModel, type: string) => {
-    this.logger.log('[CONVS-LIST-PAGE]  ************** subscribeUidConvSelectedChanged navigateByUrl', user, type);
+    console.log('[CONVS-LIST-PAGE]  ************** subscribeUidConvSelectedChanged navigateByUrl', user, type);
     this.uidConvSelected = user.uid;
     this.logger.log('[CONVS-LIST-PAGE]  ************** uidConvSelected ', this.uidConvSelected);
     // this.conversationsHandlerService.uidConvSelected = user.uid;
@@ -482,6 +584,7 @@ export class ConversationListPage implements OnInit {
     this.initConversationsHandler();
     this.initVariables();
     this.initSubscriptions();
+
     // this.initHandlerEventEmitter();
   }
 
@@ -536,7 +639,7 @@ export class ConversationListPage implements OnInit {
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected);
-        this.logger.log('[CONVS-LIST-PAGE] la conv ', this.conversationSelected, ' has already been loaded');
+        this.logger.log('[CONVS-LIST-PAGE] the conversation ', this.conversationSelected, ' has already been loaded');
         this.conversationSelected = conversationSelected;
         this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected: ', this.conversationSelected);
       }
@@ -544,7 +647,7 @@ export class ConversationListPage implements OnInit {
   }
 
   onConversationSelected(conversation: ConversationModel) {
-    //console.log('returnSelectedConversation::', conversation)
+    this.logger.log('onConversationSelected conversation', conversation)
     if (conversation.archived) {
       this.navigateByUrl('archived', conversation.uid)
       this.logger.log('[CONVS-LIST-PAGE] onConversationSelected archived conversation.uid ', conversation.uid)
@@ -641,6 +744,7 @@ export class ConversationListPage implements OnInit {
 
 
   navigateByUrl(converationType: string, uidConvSelected: string) {
+    this.logger.log('[CONVS-LIST-PAGE] calling navigateByUrl: ');
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl run  this.setUidConvSelected');
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected);
@@ -648,12 +752,14 @@ export class ConversationListPage implements OnInit {
 
     this.setUidConvSelected(uidConvSelected, converationType);
     if (checkPlatformIsMobile()) {
-      this.logger.log('[CONVS-LIST-PAGE] PLATFORM_MOBILE 1', this.navService);
+      this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile());
+      this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window >= 768)', this.navService);
       let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType;
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
       this.router.navigateByUrl(pageUrl);
     } else {
-      this.logger.log('[CONVS-LIST-PAGE] PLATFORM_DESKTOP 2', this.navService);
+      console.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile());
+      this.logger.log('[CONVS-LIST-PAGE] MOBILE (window < 768) ', this.navService);
       let pageUrl = 'conversation-detail/' + this.uidConvSelected;
       if (this.conversationSelected && this.conversationSelected.conversation_with_fullname) {
         pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType;

package/src/app/services/app-config.ts

@@ -18,18 +18,90 @@ export class AppConfigProvider {
 
   /** */
   loadAppConfig() {
-    const that = this;
-    return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
-        that.appConfig = data;
+    // const that = this;
+    // return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
+    //     that.appConfig = data;
+    //   }).catch(err => {
+    //     console.log('error loadAppConfig' + err);
+    //   });
+
+    // ---- new
+
+
+    return this.http.get(this.appConfig.remoteConfigUrl)
+      .toPromise().then((data: any ) => {
+        // console.log('AppConfigService loadAppConfig data: ', data);
+ 
+        const allconfig = data
+        // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig: ', allconfig);
+
+        if (allconfig.hasOwnProperty('wsUrlRel')) {
+
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel ->: ', allconfig.wsUrlRel);
+          var wsUrlRelIsEmpty = this.isEmpty(allconfig.wsUrlRel)
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel -> wsUrlRelIsEmpty ?', wsUrlRelIsEmpty);
+
+          if (wsUrlRelIsEmpty === false) {
+            // console.log('[APP-CONFIG-SERVICE]- loadAppConfig allconfig !!!! exist - SERVER_BASE_URL', data.apiUrl);
+
+            // if (allconfig.apiUrl.indexOf("http://") !== -1) {
+
+            //   const ws_url = allconfig.apiUrl.replace("http://", "ws://").slice(0, -1) + allconfig.wsUrlRel;
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTP - wsUrl', ws_url);
+
+            //   allconfig.wsUrl = ws_url
+
+            // } else if (allconfig.apiUrl.indexOf("https://") !== -1) {
+
+            //   const ws_url = allconfig.apiUrl.replace("https://", "wss://").slice(0, -1) + allconfig.wsUrlRel;
+
+            //   allconfig.wsUrl = ws_url
+
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
+            // } else {
+            
+            
+              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
+
+              // console.log(window.location)
+
+              if (window.location.protocol === 'http:') {
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
+
+              } else if (window.location.protocol === 'https:') {
+
+                allconfig.wsUrl = 'wss://' + window.location.hostname + allconfig.wsUrlRel
+              } else {
+
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
+              }
+            // }
+
+          } else {
+            // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! exist wsUrlRel but IS EMPTY');
+          }
+
+        } else {
+
+          // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! does not exist wsUrlRel');
+        }
+
+        this.appConfig = allconfig;
+      
+
       }).catch(err => {
-        // console.log('error loadAppConfig' + err);
+        console.error('error loadAppConfig' + err);
       });
   }
 
+  isEmpty(wsUrlRel: string) {
+    return (wsUrlRel === undefined || wsUrlRel == null || wsUrlRel.length <= 0) ? true : false;
+  }
+
   /** */
   getConfig() {
     return this.appConfig;
   }
-  
+
 
 }

package/src/app/services/websocket/websocket-js.ts

@@ -78,10 +78,8 @@ export class WebSocketJs {
     this.callbacks.set(topic, { onCreate: onCreate, onUpdate: onUpdate, onData: onData });
     this.logger.log('[WEBSOCKET-JS] - CALLBACK-SET - callbacks', this.callbacks);
 
-    this.logger.log('[WEBSOCKET-JS] - REF - READY STATE ', this.ws.readyState);
-
     if (this.ws && this.ws.readyState == 1) {
-
+      this.logger.log('[WEBSOCKET-JS] - REF - READY STATE ', this.ws.readyState);
       this.logger.log('[WEBSOCKET-JS] - REF - READY STATE = 1 > SUBSCRIBE TO TOPICS ');
 
       this.subscribe(topic);
@@ -172,11 +170,11 @@ export class WebSocketJs {
     var str = JSON.stringify(message);
     this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE str " + str);
 
-    if (this.ws.readyState == 1) {
+    if (this.ws && this.ws.readyState == 1) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TO TOPIC - STRING TO SEND " + str, " FOR UNSUBSCRIBE TO TOPIC: ", topic);
       this.send(str, `UNSUSCRIBE from ${topic}`);
 
-    } else {
+    } else if (this.ws) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TRY 'SEND' BUT READY STASTE IS : ", this.ws.readyState);
     }
   }
@@ -196,7 +194,7 @@ export class WebSocketJs {
   // -----------------------------------------------------------------------------------------------------
   close() {
     this.topics = [];
-    this.callbacks = []; 
+    this.callbacks = [];
     this.logger.log("[WEBSOCKET-JS] - CALLED CLOSE - TOPICS ", this.topics, ' - CALLLBACKS ', this.callbacks);
 
     if (this.ws) {
@@ -277,13 +275,13 @@ export class WebSocketJs {
 
       // Qui viene inviato un battito cardiaco Dopo averlo ricevuto, viene restituito un messaggio di battito cardiaco.
       // onmessage Ottieni il battito cardiaco restituito per indicare che la connessione è normale
-      if (this.ws.readyState == 1) {
+      if (this.ws && this.ws.readyState == 1) {
 
         // this.logger.log("[WEBSOCKET-JS] - HEART-START - SEND PING-MSG");
 
         this.send(JSON.stringify(this.pingMsg), 'HEART-START')
 
-      } else {
+      } else if (this.ws) {
 
         this.logger.log("[WEBSOCKET-JS] - HEART-START - TRY TO SEND PING-MSG BUT READY STATE IS ", this.ws.readyState);
 
@@ -442,7 +440,7 @@ export class WebSocketJs {
             // @ send PONG
             // -------------------
             // that.logger.log('[WEBSOCKET-JS] -  RECEIVED PING -> SEND PONG MSG');
-         
+
             that.send(JSON.stringify(that.pongMsg), 'ON-MESSAGE')
 
           } else {
@@ -465,15 +463,15 @@ export class WebSocketJs {
         if (json && json.payload && json.payload.message && that.isArray(json.payload.message)) {
 
           json.payload.message.forEach(element => {
-  
+
             //let insUp = that.insertOrUpdate(element);
             let insUp = json.payload.method;
-          
+
             var object = { event: json.payload, data: element };
 
             var callbackObj = that.callbacks.get(object.event.topic);
 
-         
+
             if (insUp == "CREATE") {
               if (that.onCreate) {
                 that.onCreate(element, object);
@@ -499,10 +497,10 @@ export class WebSocketJs {
         } else {
           //let insUp = that.insertOrUpdate(json.payload.message);
           let insUp = json.payload.method;
-         
+
           var object = { event: json.payload, data: json };
           var callbackObj = that.callbacks.get(object.event.topic);
-        
+
 
           if (insUp == "CREATE") {
             if (that.onCreate) {

package/src/chat-config-template.json

@@ -25,5 +25,6 @@
     "baseImageUrl": "${API_BASEIMAGE_URL}",
     "dashboardUrl": "${DASHBOARD_URL}",
     "wsUrl": "${WS_URL}",
+    "wsUrlRel": "${WS_URL_RELATIVE}",
     "supportMode": "${SUPPORT_MODE}"
 }

package/src/chat-config.json

@@ -25,5 +25,6 @@
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
     "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
     "wsUrl": "ws://localhost:3000/",
+    "wsUrlRel": "${WS_URL_RELATIVE}",
     "supportMode": false
 }

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

@@ -31,7 +31,7 @@ export class TiledeskAuthService {
     public http: HttpClient,
     public appStorage: AppStorageService,
     // private events: EventsService,
-    ) { }
+  ) { }
 
 
   initialize(serverBaseUrl: string) {
@@ -134,10 +134,19 @@ export class TiledeskAuthService {
   logOut() {
     this.logger.log('[TILEDESK-AUTH] - LOGOUT')
     this.appStorage.removeItem('tiledeskToken')
+    this.appStorage.removeItem('currentUser')
+
     this.appStorage.removeItem('currentUser')
     this.setCurrentUser(null);
     // this.isOnline$.next(false) 
-    
+    const stored_project = localStorage.getItem('last_project')
+    if (stored_project) {
+      localStorage.removeItem('last_project')
+    }
+    const stored_contacts = localStorage.getItem('contacts')
+    if (stored_contacts) {
+      localStorage.removeItem('contacts')
+    }
   }
 
 
@@ -183,7 +192,7 @@ export class TiledeskAuthService {
     } else if (storedTiledeskToken && storedTiledeskToken !== tiledeskToken) {
       this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST BUT IS != FROM TOKEN - RUN SET ')
       this.appStorage.setItem('tiledeskToken', tiledeskToken);
-    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken){
+    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken) {
       this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
   }

package/src/chat21-core/utils/utils-message.ts

@@ -19,7 +19,7 @@ export function isFirstMessage(i: number) {
         }
         return false;
       } catch (err) {
-        console.log('error: ', err);
+        console.error('error: ', err);
       }
     }
 }
@@ -103,7 +103,7 @@ export function getSizeImg(message: any, maxWidthImage?: number): any {
       }
       return sizeImage;
     } catch (err) {
-      console.log('error: ', err);
+      console.error('error: ', err);
       return;
     }
 }

package/src/firebase-messaging-sw-template.js

@@ -43,7 +43,7 @@ importScripts('https://www.gstatic.com/firebasejs/5.8.6/firebase.js');
 // implement this optional method.
 // [START background_handler]
 messaging.setBackgroundMessageHandler(function(payload) {
-  console.log('[firebase-messaging-sw.js] Received background message ', payload);
+  // console.log('[firebase-messaging-sw.js] Received background message ', payload);
   // Customize notification here
   const notificationTitle = 'Background Message Title';
   const notificationOptions = {