@chat21/chat21-ionic 3.0.54-RC2 → 3.0.55-RC6

package/src/app/app.module.ts

@@ -92,7 +92,8 @@ import { ConversationInfoModule } from 'src/app/components/conversation-info/con
 // Directives
 import { TooltipModule } from 'ng2-tooltip-directive';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-
+import { Network } from '@ionic-native/network/ngx';
+import { ConnectionService } from 'ng-connection-service';
 
 
 // FACTORIES
@@ -101,7 +102,7 @@ export function createTranslateLoader(http: HttpClient) {
 
 }
 
-export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService) {
+export function authenticationFactory(http: HttpClient, appConfig: AppConfigProvider, chat21Service: Chat21Service, appSorage: AppStorageService, network: Network, connectionService:ConnectionService) {
   const config = appConfig.getConfig()
   if (config.chatEngine === CHAT_ENGINE_MQTT) {
 
@@ -111,12 +112,15 @@ export function authenticationFactory(http: HttpClient, appConfig: AppConfigProv
     const auth = new MQTTAuthService(http, chat21Service, appSorage);
 
     auth.setBaseUrl(appConfig.getConfig().apiUrl)
+    
     return auth
   } else {
 
     FirebaseInitService.initFirebase(config.firebaseConfig)
-    const auth = new FirebaseAuthService(http);
+    console.log('[APP-MOD] FirebaseInitService config ', config)
+    const auth = new FirebaseAuthService(http, network, connectionService);
     auth.setBaseUrl(config.apiUrl)
+  
     return auth
   }
 }
@@ -283,7 +287,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     {
       provide: MessagingAuthService,
       useFactory: authenticationFactory,
-      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService]
+      deps: [HttpClient, AppConfigProvider, Chat21Service, AppStorageService, Network, ConnectionService]
     },
     {
       provide: PresenceService,
@@ -343,6 +347,7 @@ const appInitializerFn = (appConfig: AppConfigProvider, logger: NGXLogger) => {
     StatusBar,
     SplashScreen,
     Keyboard,
+    Network,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     EventsService,
     Chooser,

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss

@@ -1,9 +1,13 @@
 :host .base_sent .msg_sent ::ng-deep div > div > div > tiledeskwidget-text > p > p > a {
     color: lightblue;
+ 
 }
 
 :host .base_sent .msg_sent ::ng-deep div > div > div > tiledeskwidget-text > p > p  {
     margin-top:12px !important;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 :host .base_sent .msg_sent ::ng-deep > div > div > tiledeskwidget-image > div  {

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html

@@ -1,7 +1,8 @@
 <!-- [ngClass]="{'button-in-msg' : message.metadata && message.metadata.button}" -->
-<div  [ngStyle]="{'padding': (isImage(message) || isFrame(message))?'0px':'0 8px'}" class="messages primary-color"  [class.emoticon]="message?.emoticon">
-  
-    
+<div [ngStyle]="{'padding': (isImage(message) || isFrame(message))?'0px':'0 8px'}" class="messages primary-color"
+  [class.emoticon]="message?.emoticon">
+
+
   <div>
     <!-- message type:: image -->
     <!-- <div *ngIf="message.type == 'image' && message.metadata"  [ngStyle] = "{ 'max-width': getSizeImg(message).width, 'max-height': getSizeImg(message).height }">
@@ -12,16 +13,16 @@
     [src]="message.metadata.src" [width]="getSizeImg(message).width"
     [height]="getSizeImg(message).height" /> -->
 
-    <tiledeskwidget-image *ngIf="isImage(message)"
+    <tiledeskwidget-image *ngIf="isImage(message)" 
       [metadata]="message.metadata"
-      [width]="getMetadataSize(message.metadata).width"
+      [width]="getMetadataSize(message.metadata).width" 
       [height]="getMetadataSize(message.metadata).height"
       (onImageRendered)="onImageRenderedFN($event)">
     </tiledeskwidget-image>
 
-    <tiledeskwidget-frame *ngIf="isFrame(message)"
+    <tiledeskwidget-frame *ngIf="isFrame(message)" 
       [metadata]="message.metadata"
-      [width]="getMetadataSize(message.metadata).width"
+      [width]="getMetadataSize(message.metadata).width" 
       [height]="getMetadataSize(message.metadata).height">
     </tiledeskwidget-frame>
 
@@ -30,22 +31,24 @@
       [width]="message.metadata.width"
       [height]="message.metadata.height">
     </tiledeskwidget-frame> -->
-  
-    <!-- message type:: text -->
-    <!-- <div *ngIf="message.type == 'text'">  -->     
-    <div *ngIf="message?.text" [tooltip]="timeTooltipLeft" [options]="tooltipOptions" placement="left" content-type="template" (click)="handleTooltipEvents($event)"> 
-        <ng-template #timeTooltipLeft>
-            <span>{{message.timestamp | amTimeAgo}}</span>
-        </ng-template>
 
-        <tiledeskwidget-text
-          [text]="message?.text"
-          [color]="textColor"
-          (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
-          (onAfterMessageRender)="returnOnAfterMessageRender($event)">
-        </tiledeskwidget-text>
-        <!-- <p #messageEl class="message_innerhtml marked" [innerHTML]="printMessage(message, messageEl, this) | marked"></p> -->
-        <!-- <div *ngIf="isPopupUrl(message.text); then contentPopup else contentNewTab">here
+    <!-- message type:: text -->
+    <!-- <div *ngIf="message.type == 'text'">  -->
+    <div *ngIf="message?.text" [tooltip]="timeTooltipLeft" [options]="tooltipOptions" placement="left"
+      content-type="template" (click)="handleTooltipEvents($event)">
+      <ng-template #timeTooltipLeft>
+        <span>{{message.timestamp | amTimeAgo}}</span>
+      </ng-template>
+
+      <tiledeskwidget-text 
+        [text]="message?.text" 
+        [color]="textColor" 
+       [message]="message"
+        (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
+        (onAfterMessageRender)="returnOnAfterMessageRender($event)">
+      </tiledeskwidget-text>
+      <!-- <p #messageEl class="message_innerhtml marked" [innerHTML]="printMessage(message, messageEl, this) | marked"></p> -->
+      <!-- <div *ngIf="isPopupUrl(message.text); then contentPopup else contentNewTab">here
             is ignored</div>
         <ng-template #contentPopup>
             <p style="text-decoration: underline; padding:8px; cursor: pointer;"
@@ -54,13 +57,7 @@
         <ng-template #contentNewTab>
             <p #messageEl [innerHTML]="printMessage(message, messageEl, this) | linky"></p>
         </ng-template> -->
-      </div>
+    </div>
   </div>
 
-</div>
-
-
-  
-
-
-
+</div>

package/src/app/chatlib/conversation-detail/message/text/text.component.html

@@ -1,4 +1,4 @@
-<p  #messageEl class="message_innerhtml marked" 
+<p [ngStyle] = "{ 'width': media_width +'px'  }" #messageEl class="message_innerhtml marked" 
     [innerHTML]="printMessage(text, messageEl, this) | htmlEntiesEncode  | marked"
     [ngStyle]="{'color': '$'+ color }">
 </p>

package/src/app/chatlib/conversation-detail/message/text/text.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, Sanitizer } from '@angular/core';
-
+import { MAX_WIDTH_IMAGES } from 'src/chat21-core/utils/constants';
 @Component({
   selector: 'tiledeskwidget-text',
   templateUrl: './text.component.html',
@@ -11,7 +11,12 @@ export class TextComponent implements OnInit {
   @Input() color: string;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
-  
+
+  @Input() message: any;
+
+  public media_width: number;
+  public media_height: number;
+
   constructor() { }
 
   ngOnInit() {
@@ -19,7 +24,7 @@ export class TextComponent implements OnInit {
 
 
   printMessage(text, messageEl, component) {
-    const messageOBJ = { messageEl: messageEl, component: component}
+    const messageOBJ = { messageEl: messageEl, component: component }
     this.onBeforeMessageRender.emit(messageOBJ)
     const messageText = text;
     this.onAfterMessageRender.emit(messageOBJ)
@@ -29,4 +34,23 @@ export class TextComponent implements OnInit {
     return messageText;
   }
 
+  ngOnChanges() {
+    if (this.message.type === 'image') {
+      console.log('TextComponent message ', this.message)
+      if (this.message.metadata.width && this.message.metadata.width > MAX_WIDTH_IMAGES) {
+
+        const ratio = (this.message.metadata['width'] / this.message.metadata['height']);
+
+        this.media_width = MAX_WIDTH_IMAGES;
+        this.media_height = MAX_WIDTH_IMAGES / ratio;
+
+        console.log('TextComponent media_width ', this.media_width, ' media_height' ,  this.media_height)
+      } else {
+        this.media_width = this.message.metadata.width;
+        this.media_height = this.message.metadata.height;
+        console.log('TextComponent media_width ', this.media_width, ' media_height' ,  this.media_height)
+      }
+    }
+  }
+
 }

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -40,13 +40,13 @@
 
       </div>
 
-      <!-- <div *ngIf="conversationAvatar" class="tile-info-with" (click)="onOpenCloseInfoConversation()">        
+      <div *ngIf="conversationAvatar" class="tile-info-with" (click)="onOpenCloseInfoConversation()">        
         <span class="tile-username">{{ conversationAvatar.conversation_with_fullname }} </span>
-      </div> -->
+      </div>
 
-      <div *ngIf="conversationWithFullname" class="tile-info-with" (click)="onOpenCloseInfoConversation()">        
+      <!-- <div *ngIf="conversationWithFullname" class="tile-info-with" (click)="onOpenCloseInfoConversation()">        
         <span class="tile-username">{{ conversationWithFullname }} </span>
-      </div>
+      </div> -->
 
     </ion-title>
     <!-- openInfoConversation  {{openInfoConversation}} -->

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -39,13 +39,13 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
     public imageRepoService: ImageRepoService,
     private route: ActivatedRoute,
   ) { 
-    this.route.paramMap.subscribe(params => {
+    // this.route.paramMap.subscribe(params => {
       
      
-      this.conversationWithFullname = params.get('FullNameConv');
-      this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params: ', params);
-      this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params > : ',  this.conversationWithFullname);
-    });
+    //   this.conversationWithFullname = params.get('FullNameConv');
+    //   this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params: ', params);
+    //   this.logger.log('[CONVS-DETAIL][HEADER]- initialize -> params > : ',  this.conversationWithFullname);
+    // });
   }
 
   // ----------------------------------------------------

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -78,8 +78,15 @@ export class InfoContentComponent implements OnInit {
       this.logger.log('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith: ', this.conversationWith);
       this.conversationWithFullname = params.get('FullNameConv');
       this.conv_type = params.get('Convtype');
-
+     
       const conversationWith_segments = this.conversationWith.split('-');
+
+      // Removes the last element of the array if is = to the separator 
+      if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+        conversationWith_segments.pop();
+     }
+      
+
       this.logger.log('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith_segments: ', conversationWith_segments);
 
       if (this.conversationWith.startsWith("support-group")) {

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -490,31 +490,35 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   //   this.logger.log('[CONVS-DETAIL] - setHeaderContent conversationWith', this.conversationWith)
   //   this.logger.log('[CONVS-DETAIL] - setHeaderContent conversationsHandlerService', this.conversationsHandlerService)
   //   this.logger.log('[CONVS-DETAIL] - setHeaderContent conv_type', this.conv_type)
-  //  if (this.conversationWith && this.conversationsHandlerService && this.conv_type === 'active') {
-  //   this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail CALLING')
-  //     this.conversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
-  //       this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (active)', this.conversationWith, conv)
-  //       this.conversationAvatar = setConversationAvatar(
-  //         conv.conversation_with,
-  //         conv.conversation_with_fullname,
-  //         conv.channel_type
-  //       );
-  //       this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar);
-  //     })
-  //   }
-  //   else { //get conversation from 'conversations' firebase node
-  //     this.archivedConversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
-  //       this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (archived)', this.conversationWith, conv)
-
-  //     })
-  //   }
-
-    this.conversationAvatar = setConversationAvatar(
-      this.conversationWith,
-      this.conversationWithFullname,
-      this.channelType
-    );
-    this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar);
+   if (this.conversationWith && this.conversationsHandlerService && this.conv_type === 'active') {
+    this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail CALLING')
+      this.conversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
+        this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (active)', this.conversationWith, conv)
+        this.conversationAvatar = setConversationAvatar(
+          conv.conversation_with,
+          conv.conversation_with_fullname,
+          conv.channel_type
+        );
+        this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar);
+      })
+    }
+    else { //get conversation from 'conversations' firebase node
+      this.archivedConversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {
+        this.logger.log('[CONVS-DETAIL] - setHeaderContent getConversationDetail (archived)', this.conversationWith, conv)
+        this.conversationAvatar = setConversationAvatar(
+          conv.conversation_with,
+          conv.conversation_with_fullname,
+          conv.channel_type
+        );
+      })
+    }
+
+    // this.conversationAvatar = setConversationAvatar(
+    //   this.conversationWith,
+    //   this.conversationWithFullname,
+    //   this.channelType
+    // );
+    // this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar);
   }
 
   returnSendMessage(e: any) {
@@ -844,6 +848,10 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.logger.log("[CONVS-DETAIL] - loadTagsCanned conversationWith ", conversationWith);
 
     const conversationWith_segments = conversationWith.split('-');
+      // Removes the last element of the array if is = to the separator 
+      if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+        conversationWith_segments.pop();
+     }
     this.logger.log("[CONVS-DETAIL] - loadTagsCanned conversationWith_segments ", conversationWith_segments);
     let projectId = ""
 

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

@@ -2,8 +2,9 @@
     "chatEngine": "firebase",
     "uploadEngine": "firebase",
     "pushEngine": "firebase",
-    "logLevel": "info",
+    "logLevel": "debug",
     "fileUploadAccept":"*/*",
+    "authPersistence": "LOCAL",
     "firebaseConfig": {
         "tenant": "tilechat",
         "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",

package/src/chat21-core/providers/abstract/messagingAuth.service.ts

@@ -16,7 +16,7 @@ export abstract class MessagingAuthService {
   abstract BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // params
-  public DEFAULT_PERSISTENCE: string = 'none';
+  public DEFAULT_PERSISTENCE: string = 'NONE';
   public DEFAULT_URL: string = 'https://api.tiledesk.com/v2/auth/';
 
   private persistence;

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

@@ -189,7 +189,8 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
             firebaseMessages.on('value', (childSnapshot) => {
                 const childData: ConversationModel = childSnapshot.val();
                 this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] childData *****', childData)
-                if (childSnapshot && childSnapshot.key && childData.uid) {
+                // if (childSnapshot && childSnapshot.key && childData.uid) {
+                if (childSnapshot && childSnapshot.key) {
                     childData.uid = childSnapshot.key;
                     const conversation = this.completeConversation(childData);
                     if (conversation) {
@@ -392,7 +393,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
         // conv.last_message_text = htmlEntities(conv.last_message_text)
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
+        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp); // evaluate if is used
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         conv.archived = true;

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

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
 import { BehaviorSubject } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
-
+import { ConnectionService } from 'ng-connection-service';
 // firebase
 // import * as firebase from 'firebase/app';
 import firebase from "firebase/app";
@@ -30,6 +30,9 @@ import { LoggerInstance } from '../logger/loggerInstance';
 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 {
@@ -53,9 +56,15 @@ export class FirebaseAuthService extends MessagingAuthService {
   // private imageRepo: ImageRepoService = new FirebaseImageRepoService();
 
   private firebaseToken: string;
-  private logger:LoggerService = LoggerInstance.getInstance()
+  private logger: LoggerService = LoggerInstance.getInstance()
+
+  status = 'ONLINE';
+  isConnected = true;
+
   constructor(
-    public http: HttpClient
+    public http: HttpClient,
+    private network: Network,
+    private connectionService: ConnectionService
   ) {
     super();
   }
@@ -64,7 +73,7 @@ export class FirebaseAuthService extends MessagingAuthService {
    *
    */
   initialize() {
-   
+
     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)
@@ -72,9 +81,66 @@ export class FirebaseAuthService extends MessagingAuthService {
     // 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();
   }
 
+  checkInternetConnection () {
+    this.logger.log('[FIREBASEAuthSERVICE] - checkInternetConnection');
+    // let connectSubscription = this.network.onConnect().subscribe(() => {
+    //   this.logger.log('[FIREBASEAuthSERVICE] - network connected!');
+    //   // We just got a connection but we need to wait briefly
+    //    // before we determine the connection type. Might need to wait.
+    //   // prior to doing any api requests as well.
+    //   setTimeout(() => {
+    //     if (this.network.type === 'wifi') {
+    //       this.logger.log('[FIREBASEAuthSERVICE] - we got a wifi connection, woohoo!');
+    //     }
+    //   }, 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)
+          })
+        }
+      })
+    
+  
+  }
+
+  // createOnline$() {
+  //   return merge<boolean>(
+  //     fromEvent(window, 'offline').pipe(map(() => false)),
+  //     fromEvent(window, 'online').pipe(map(() => true)),
+  //     new Observable((sub: Observer<boolean>) => {
+  //       sub.next(navigator.onLine);
+  //       sub.complete();
+  //     }));
+  // }
+
   /**
    * checkIsAuth
    */
@@ -113,12 +179,12 @@ export class FirebaseAuthService extends MessagingAuthService {
   onAuthStateChanged() {
     const that = this;
     firebase.auth().onAuthStateChanged(user => {
-      this.logger.debug('[FIREBASEAuthSERVICE] onAuthStateChanged', user)
+      this.logger.log('[FIREBASEAuthSERVICE] onAuthStateChanged', user)
       if (!user) {
-        this.logger.debug('[FIREBASEAuthSERVICE] 1 - PASSO OFFLINE AL CHAT MANAGER')
+        this.logger.log('[FIREBASEAuthSERVICE] 1 - PASSO OFFLINE AL CHAT MANAGER')
         that.BSAuthStateChanged.next('offline');
       } else {
-        this.logger.debug('[FIREBASEAuthSERVICE] 2 - PASSO ONLINE AL CHAT MANAGER')
+        this.logger.log('[FIREBASEAuthSERVICE] 2 - PASSO ONLINE AL CHAT MANAGER')
         that.BSAuthStateChanged.next('online');
       }
     });
@@ -131,6 +197,7 @@ export class FirebaseAuthService extends MessagingAuthService {
   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;
@@ -149,13 +216,13 @@ export class FirebaseAuthService extends MessagingAuthService {
         break;
       }
     }
-    return firebase.auth().setPersistence(firebasePersistence).then( async () => {
-      return firebase.auth().signInWithCustomToken(token).then( async () => {
-                // that.firebaseSignInWithCustomToken.next(response);
-              }).catch((error) => {
-                that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
-                  // that.firebaseSignInWithCustomToken.next(null);
-              });
+    return firebase.auth().setPersistence(firebasePersistence).then(async () => {
+      return firebase.auth().signInWithCustomToken(token).then(async () => {
+        // that.firebaseSignInWithCustomToken.next(response);
+      }).catch((error) => {
+        that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
+        // that.firebaseSignInWithCustomToken.next(null);
+      });
     }).catch((error) => {
       that.logger.error('[FIREBASEAuthSERVICE] signInFirebaseWithCustomToken Error: ', error);
     });
@@ -200,7 +267,7 @@ export class FirebaseAuthService extends MessagingAuthService {
   private signOut() {
     const that = this;
     firebase.auth().signOut().then(() => {
-      that.logger.debug('[FIREBASEAuthSERVICE] firebase-sign-out');
+      that.logger.log('[FIREBASEAuthSERVICE] signOut firebase-sign-out');
       // cancello token
       // this.appStorage.removeItem('tiledeskToken');
       //localStorage.removeItem('firebaseToken');
@@ -244,12 +311,12 @@ export class FirebaseAuthService extends MessagingAuthService {
       //localStorage.setItem('firebaseToken', that.firebaseToken);
       that.signInFirebaseWithCustomToken(data)
     }, error => {
-      that.logger.error('[FIREBASEAuthSERVICE] createFirebaseCustomToken ERR ', error) 
+      that.logger.error('[FIREBASEAuthSERVICE] createFirebaseCustomToken ERR ', error)
     });
   }
 
   logout() {
-    this.logger.debug('[FIREBASEAuthSERVICE] logout');
+    this.logger.log('[FIREBASEAuthSERVICE] logout');
     // cancello token firebase dal local storage e da firebase
     // dovrebbe scattare l'evento authchangeStat
     this.signOut();

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

@@ -279,9 +279,11 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
             const firebaseMessages = firebase.database().ref(urlNodeFirebase);
             firebaseMessages.on('value', (childSnapshot) => {
                 const childData: ConversationModel = childSnapshot.val();
-                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot.val())
-                // if (childSnapshot && childSnapshot.key && childData.uid) {
-                if (childData) {
+                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot.val() *****', childSnapshot.val());
+                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot)
+                // && childData.uid
+                if (childSnapshot && childSnapshot.key) {
+                // if (childData) {
                     childData.uid = childSnapshot.key;
                     const conversation = this.completeConversation(childData);
                     if (conversation) {
@@ -485,7 +487,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);
-        conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
+        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp); // evaluate if is used
         conv.avatar = avatarPlaceholder(conversation_with_fullname);
         conv.color = getColorBck(conversation_with_fullname);
         //conv.image = this.imageRepo.getImagePhotoUrl(conversation_with);

package/src/chat21-core/providers/localSessionStorage.ts

@@ -17,6 +17,7 @@ export class LocalSessionStorage extends AppStorageService{
       this.storagePrefix = storagePrefix;
       this.projectID = projectID;
       this.persistence = persistence;
+      // this.persistence = 'LOCAL';
       this.logger.info('[LocalSessionStorage] - initialize ', this.storagePrefix, this.persistence, this.projectID)
   }
 
@@ -30,7 +31,7 @@ export class LocalSessionStorage extends AppStorageService{
           // prefix = prefix + sv;
           prefix = this.storagePrefix + '_';
       } catch (e) {
-          this.logger.error('[LocalSessionStorage] getItem >Error :' + e);
+          this.logger.error('[LocalSessionStorage] getItem - Error :' + e);
       }
       const newKey = prefix + this.projectID + '_' + key;
       return this.getValueForKey(newKey);