@chat21/chat21-ionic 3.0.101 → 3.0.103-rc.2

package/src/app/shared/shared.module.ts

@@ -56,83 +56,106 @@ import { AudioComponent } from '../chatlib/conversation-detail/message/audio/aud
 
 @NgModule({
   declarations: [
-    // MessageTextAreaComponent,
-    AvatarProfileComponent,
-    HeaderConversationsList,
-    UserPresenceComponent,
-    UserTypingComponent,
-    ListConversationsComponent,
-    IonListConversationsComponent,
-    ImageViewerComponent,
+     //CONVERSATION_LIST
+    //  ListConversationsComponent,
+    //  IonListConversationsComponent,
+    //  HeaderConversationsList,
+    //  HeaderConversationsListArchived,
+    //  HeaderConversationsListUnassigned,
+    //  ProjectItemComponent,
+     //CONVERSATION_DETAIL
+    //  IonConversationDetailComponent,
+    //  ConversationContentComponent,
+    //  UserTypingComponent,
+    //  MessageAttachmentComponent,
+    //  TextButtonComponent,
+    //  LinkButtonComponent,
+    //  ActionButtonComponent,
+    //  InfoMessageComponent,
+    //  AvatarComponent,
+    //  BubbleMessageComponent,
+    //  FrameComponent,
+    //  ImageComponent,
+    //  AudioComponent,
+    //  ReturnReceiptComponent,
+    //  TextComponent,
+    //  OptionsComponent,
+    //  HtmlComponent,
+
+     //CONVERSATION_DETAIL_INFO
+    //  InfoContentComponent,
+    //  InfoSupportGroupComponent,
+    //  InfoDirectComponent,
+    //  InfoGroupComponent,
+    //  AdvancedInfoAccordionComponent,
+ 
+     //NAVBAR - SIDEBAR
+     NavbarComponent,
+     SidebarComponent,
+     SidebarUserDetailsComponent,
+    
+     //DIRECTIVES
+     AutofocusDirective,
+     TooltipDirective,
+     MarkedPipe,
+     HtmlEntitiesEncodePipe,
+     SafeHtmlPipe,
+ 
+
+
+     AvatarProfileComponent,
+     UserPresenceComponent,
+     ImageViewerComponent,
+     NetworkOfflineComponent
+  ],
+  exports: [
+    //CONVERSATION_LIST
+    // ListConversationsComponent,
+    // IonListConversationsComponent,
+    // HeaderConversationsList,
+    // HeaderConversationsListArchived,
+    // HeaderConversationsListUnassigned,
+    // ProjectItemComponent,
+    //CONVERSATION_DETAIL
+    // IonConversationDetailComponent,
+    // ConversationContentComponent,
+    // UserTypingComponent,
+    // TextButtonComponent,
+    // LinkButtonComponent,
+    // ActionButtonComponent,
+    // InfoMessageComponent,
+    // AvatarComponent,
+    // BubbleMessageComponent,
+    // MessageAttachmentComponent,
+    // FrameComponent,
+    // ImageComponent,
+    // AudioComponent,
+    // ReturnReceiptComponent,
+    // TextComponent,
+    // OptionsComponent,
+    //CONVERSATION_DETAIL_INFO
+    // InfoContentComponent,
+    // InfoSupportGroupComponent,
+    // InfoDirectComponent,
+    // InfoGroupComponent,
+    
+    //NAVBAR - SIDEBAR
     NavbarComponent,
     SidebarComponent,
     SidebarUserDetailsComponent,
-    ProjectItemComponent,
-    IonConversationDetailComponent,
-    ConversationContentComponent,
-    AvatarComponent,
-    BubbleMessageComponent,
-    MessageAttachmentComponent,
-    TextButtonComponent,
-    LinkButtonComponent,
-    ActionButtonComponent,
-    FrameComponent,
-    ImageComponent,
-    AudioComponent,
-    InfoMessageComponent,
-    ReturnReceiptComponent,
-    TextComponent,
-    OptionsComponent,
-    HtmlComponent,
-    InfoContentComponent,
-    InfoSupportGroupComponent,
-    InfoDirectComponent,
-    InfoGroupComponent,
-    AdvancedInfoAccordionComponent,
-    MarkedPipe,
+    
+
+   //DIRECTIVES
     AutofocusDirective,
+    TooltipDirective,
+    MarkedPipe,
     HtmlEntitiesEncodePipe,
     SafeHtmlPipe,
-    TooltipDirective,
-    HeaderConversationsListArchived,
-    HeaderConversationsListUnassigned,
-    NetworkOfflineComponent
-  ],
-  exports: [
-    // MessageTextAreaComponent,
-    AutofocusDirective,
-    TooltipDirective,
+
+    //COMMON COMPONENTS
     AvatarProfileComponent,
-    HeaderConversationsList,
-    ImageViewerComponent,
-    NavbarComponent,
-    SidebarComponent,
-    SidebarUserDetailsComponent,
-    ProjectItemComponent,
     UserPresenceComponent,
-    UserTypingComponent,
-    ListConversationsComponent,
-    IonListConversationsComponent,
-    IonConversationDetailComponent,
-    ConversationContentComponent,
-    AvatarComponent,
-    BubbleMessageComponent,
-    TextButtonComponent,
-    LinkButtonComponent,
-    ActionButtonComponent,
-    FrameComponent,
-    ImageComponent,
-    AudioComponent,
-    InfoMessageComponent,
-    ReturnReceiptComponent,
-    TextComponent,
-    OptionsComponent,
-    InfoContentComponent,
-    InfoSupportGroupComponent,
-    InfoDirectComponent,
-    InfoGroupComponent,
-    HeaderConversationsListArchived,
-    HeaderConversationsListUnassigned,
+    ImageViewerComponent,
     NetworkOfflineComponent
 
   ],

package/src/assets/i18n/en.json

@@ -4,9 +4,9 @@
   "LABEL_MSG_START_CHAT": "Start chatting",
   "LABEL_AVAILABLE": "available",
   "LABEL_NOT_AVAILABLE": "not available",
-  "LABEL_INACTIVE":"inactive",
-  "LABEL_ONLINE":"online",
-  "LABEL_OFFLINE":"offline",
+  "LABEL_INACTIVE": "inactive",
+  "LABEL_ONLINE": "online",
+  "LABEL_OFFLINE": "offline",
   "LABEL_NO_MSG_HERE": "Still no message here...",
   "LABEL_TODAY": "today",
   "LABEL_TOMORROW": "yesterday",
@@ -22,7 +22,7 @@
     "Sunday"
   ],
   "LABEL_SEND": "Send",
-  "LABEL_CHAT":"Chat",
+  "LABEL_CHAT": "Chat",
   "ID_CONVERSATION": "Id conversation",
   "LABEL_CREATED_THE": "group created on",
   "LABEL_INFO_ATTRIBUTE": "Attributes",
@@ -47,7 +47,7 @@
   "LABEL_VIDEO_CHAT": "Video call",
   "LABEL_LEAVE_GROUP": "Leave the group",
   "LABEL_CLOSE_GROUP": "Close",
-  "LABEL_OPEN_INFO_CONVERSATION":"Open conversation details",
+  "LABEL_OPEN_INFO_CONVERSATION": "Open conversation details",
   "ALERT_TITLE": "Attention!",
   "CLOSE_ALERT_CONFIRM_LABEL": "OK",
   "CLOSE_ALERT_CANCEL_LABEL": "CANCEL",
@@ -69,11 +69,11 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Chat reopened",
   "INFO_SUPPORT_CHAT_CLOSED": "Chat closed",
-  "INFO_SUPPORT_LEAD_UPDATED":"Lead updated",
-  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"removed from group",
-  "INFO_SUPPORT_MEMBER_ABANDONED_GROUP":"has left the conversation",
+  "INFO_SUPPORT_LEAD_UPDATED": "Lead updated",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP": "removed from group",
+  "INFO_SUPPORT_MEMBER_ABANDONED_GROUP": "has left the conversation",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "A new support request has been assigned to you",
-  "INFO_SUPPORT_LIVE_PAGE":"Moved to",
+  "INFO_SUPPORT_LIVE_PAGE": "Moved to",
   "LABEL_PROFILE": "Profile",
   "LABEL_CLOSE": "Closed",
   "LABEL_DISCONNECT": "Disconnect",
@@ -104,7 +104,7 @@
   "LABEL_CLOSED": "Closed",
   "LABEL_INFO": "Informations",
   "ALERT_NOTIFICATION": "Warning: sending notifications is disabled, changes the browser settings to allow sending notifications.",
-  "ALERT_NO_CONNECTION":"Our apologies. There was some trouble connecting to network",
+  "ALERT_NO_CONNECTION": "Our apologies. There was some trouble connecting to network",
   "LABEL_EXTERNAL_ID": "External Id",
   "LABEL_IAT": "Iat",
   "LABEL_REQUEST_DETAIL": "Request detail",
@@ -168,8 +168,8 @@
   "WAITING_TIME_FOUND": "The team typically replies in $reply_time",
   "WAITING_TIME_NOT_FOUND": "The team will reply as soon as possible",
   "CLOSED": "CLOSED",
-  "DIRECT_CHAT":"Direct chat",
-  "GROUP_CHAT":"Group chat",
+  "DIRECT_CHAT": "Direct chat",
+  "GROUP_CHAT": "Group chat",
   "PleaseSelectChatToStartMessaging": "Please select a chat to start messaging",
   "FromThisAreNew": "------------------",
   "Preview": "Preview",
@@ -218,35 +218,35 @@
   "PaydPlanNamePro": "Pro Plan",
   "PaydPlanNameEnterprise": "Enterprise plan",
   "ProPlanTrial": "Pro Plan (trial)",
-  "FreePlan":"Free Plan",
+  "FreePlan": "Free Plan",
   "SubscriptionPaymentProblem": "Subscription payment problem",
   "ThePlanHasExpired": "The plan has expired",
   "owner": "Owner",
   "admin": "Administrator",
   "agent": "Agent",
   "Conversations": "Conversations",
-  "Apps":"Apps",
-  "Analytics":"Analytics",
+  "Apps": "Apps",
+  "Analytics": "Analytics",
   "Activities": "Activities",
   "History": "History",
   "Settings": "Settings",
   "Resolve": "Resolve",
   "Archive": "Archive",
-  "JOIN_CONVERSATION":"Join conversation",
-  "COPY":"Copy",
-  "COPY_MESSAGE_TOAST":"<b> Copied to clipboard!</b> Paste it wherever you like.",
-  "ActionNotAllowed":"Action not allowed",
-  "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"You are no longer among the teammates managing this conversation",
-  "TicketSuccessfullyCreated":"Ticket successfully created",
-  "Continue":"Continue",
-  "ViewArchivedConversations":"Archived conversations",
-  "ViewContactsList":"Contacts list",
-  "ViewedPage":"Viewed Page",
-  "AddAsCannedResponse":"Add as canned response",
-  "AddNewCannedResponse":"Add a new canned response",
-  "TitleIsRequired":"Title is required",
-  "MessageIsRequired":"Message is required",
-  "Already_present_in_the_dashboard_json":"........",
+  "JOIN_CONVERSATION": "Join conversation",
+  "COPY": "Copy",
+  "COPY_MESSAGE_TOAST": "<b> Copied to clipboard!</b> Paste it wherever you like.",
+  "ActionNotAllowed": "Action not allowed",
+  "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "You are no longer among the teammates managing this conversation",
+  "TicketSuccessfullyCreated": "Ticket successfully created",
+  "Continue": "Continue",
+  "ViewArchivedConversations": "Archived conversations",
+  "ViewContactsList": "Contacts list",
+  "ViewedPage": "Viewed Page",
+  "AddAsCannedResponse": "Add as canned response",
+  "AddNewCannedResponse": "Add a new canned response",
+  "TitleIsRequired": "Title is required",
+  "MessageIsRequired": "Message is required",
+  "Already_present_in_the_dashboard_json": "........",
   "CreateTicket": "Create ticket",
   "Requester": "Requester",
   "ViewRequesterDetails": "View requester details",

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.12.5
+    v0.1.12.6
 
     @Author Andrea Sponziello
     @Member Gabriele Panico
@@ -24,6 +24,7 @@ class Chat21Client {
         this.reconnections = 0 // just to check how many reconnections
         this.client_id = this.uuidv4();
         this.log = options.log ? true : false;
+    
         if (options && options.MQTTendpoint) {
             if (options.MQTTendpoint.startsWith('/')) {
                 if (this.log) {
@@ -99,7 +100,7 @@ class Chat21Client {
     }
 
     sendMessage(text, type, recipient_id, recipient_fullname, sender_fullname, attributes, metadata, channel_type, callback) {
-        // console.log("sendMessage:",text, recipient_id)
+        // console.log("sendMessage sattributes:", attributes);
         let dest_topic = `apps/${this.appid}/outgoing/users/${this.user_id}/messages/${recipient_id}/outgoing`
         // console.log("dest_topic:", dest_topic)
         let outgoing_message = {
@@ -549,6 +550,7 @@ class Chat21Client {
         }
         this.subscribeToMyConversations(() => {
             // no more than one "on_message" handler, thanks.
+            // console.log("Subscribed to MyConversations.");
             this.on_message_handler = this.client.on('message', (topic, message) => {
                 if (this.log) {
                     console.log("topic:" + topic + "\nmessage payload:" + message)
@@ -628,6 +630,7 @@ class Chat21Client {
                     if (topic.includes("/messages/") && topic.endsWith(_CLIENTADDED)) {
                         if (this.onMessageAddedCallbacks) {
                             this.onMessageAddedCallbacks.forEach((callback, handler, map) => {
+                                // console.log("DEBUG: MESSAGE:", message)
                                 callback(JSON.parse(message.toString()), _topic)
                             });
                         }
@@ -922,6 +925,7 @@ class Chat21Client {
                 })
               .then(function (response) {
                 if (log) {console.log("response.status:", response.status);}
+                // if (log) {console.log("response.data:", response.data);}
                 if (callback) {
                     callback(null, response.headers, response.data);
                 }
@@ -990,6 +994,7 @@ class Chat21Client {
         }
         if (this.log) {console.log("starting mqtt connection with LWT on:", this.presence_topic, this.endpoint)}
         // client = mqtt.connect('mqtt://127.0.0.1:15675/ws',options)
+        //console.log("starting mqtt connection with LWT on:", this.presence_topic, this.endpoint)
         this.client = mqtt.connect(this.endpoint,options)
         
         this.client.on('connect', // TODO if token is wrong it must reply with an error!
@@ -998,8 +1003,9 @@ class Chat21Client {
                 if (!this.connected) {
                     if (this.log) {console.log("Chat client first connection for:" + user_id)}
                     this.connected = true
+                    callback();
                     this.start( () => {
-                        callback();
+                        // callback();
                     });
                 }
                 this.client.publish(

package/src/chat21-core/models/projects.ts

@@ -13,15 +13,15 @@ export interface Project {
     user_available?: boolean;
     profile_name?: any;
     profile_agents?: any;
-    trial_expired?: any;
-    trial_days_left?: number;
-    trial_days?: number;
-    profile_type?: string;
-    subscription_is_active?: any;
+    trialExpired?: any;
+    trialDaysLeft?: number;
+    trialDays?: number;
+    // profile_type?: string;
+    isActiveSubscription?: boolean;
     profile?: any;
-    subscription_end_date?: any;
-    subscription_id?: any;
-    subscription_creation_date?: any;
-    subscription_start_date?: any;
+    // subscription_end_date?: any;
+    // subscription_id?: any;
+    // subscription_creation_date?: any;
+    // subscription_start_date?: any;
     __v?: any;
 }

package/src/chat21-core/providers/abstract/conversations-handler.service.ts

@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 // models
-import { ImageRepoService } from './image-repo.service';
 import { ConversationModel } from './../../models/conversation';
 // import { ImageRepoService } from './image-repo.service';
 

package/src/chat21-core/providers/abstract/groups-handler.service.ts

@@ -1,7 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import { AppConfigProvider } from 'src/app/services/app-config';
 import { GroupModel } from 'src/chat21-core/models/group';
 import { UserModel } from 'src/chat21-core/models/user';
 

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

@@ -19,7 +19,7 @@ export abstract class NotificationsService {
     } 
   }
 
-  abstract initialize(tenant: string, vapidKey: string): void;
+  abstract initialize(tenant: string, vapidKey: string, platform: string): void;
   abstract getNotificationPermissionAndSaveToken(currentUserUid: string): void;
   abstract removeNotificationsInstance(callback: (string) => void): void;
 

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

@@ -1,3 +1,4 @@
+import { Platform } from '@ionic/angular';
 import { Injectable } from '@angular/core';
 // services
 import { NotificationsService } from '../abstract/notifications.service';
@@ -8,6 +9,7 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import firebase from "firebase/app";
 import 'firebase/messaging';
 import 'firebase/auth';
+import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 @Injectable({ providedIn: 'root' })
 
@@ -17,16 +19,17 @@ export class FirebaseNotifications extends NotificationsService {
     private userId: string;
     private tenant: string;
     private vapidkey: string;
+    private platform: string;
     private logger: LoggerService = LoggerInstance.getInstance();
-    constructor() {
+    constructor(private fcm: FCM) {
         super();
     }
 
-    initialize(tenant: string, vapId: string): void {
+    initialize(tenant: string, vapId: string, platform: string): void {
         this.tenant = tenant
         this.vapidkey = vapId
-        this.logger.log('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
-
+        platform === 'desktop'? this.platform = 'ionic' : this.platform = platform
+        this.logger.log('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant, this.platform)
 
         if (!('serviceWorker' in navigator)) {
             // , disable or hide UI.
@@ -73,16 +76,6 @@ export class FirebaseNotifications extends NotificationsService {
         this.logger.log('initialize FROM [APP-COMP] - [FIREBASE-NOTIFICATIONS] calling requestPermission - tenant ', this.tenant, ' currentUserUid ', currentUserUid)
         // this.logger.log('[FIREBASE-NOTIFICATIONS] calling requestPermission - currentUserUid ', currentUserUid)
         this.userId = currentUserUid;
-        // Service Worker explicit registration to explicitly define sw location at a path,
-        // const swRegistration = async () => {
-        //     try {
-        //         await navigator.serviceWorker.register('http://localhost:8101/firebase-messaging-sw.js');
-        //     } catch (error) {
-        //         console.error(error);
-        //     }
-        // }
-
-
 
         if (firebase.messaging.isSupported()) {
             const messaging = firebase.messaging();
@@ -103,6 +96,28 @@ export class FirebaseNotifications extends NotificationsService {
             });
         } else {
             this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
+
+            if(this.platform == 'android' || this.platform === 'ios'){
+                this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING: use FCM plugin')
+                this.fcm.onTokenRefresh().subscribe(FCMtoken => {
+                  // Register your new token in your back-end if you want
+                  // backend.registerToken(token);
+                  this.FCMcurrentToken = FCMtoken;
+                  console.log("[MQTTNotificationService] FCM: onTokenRefresh --->", FCMtoken);
+                  this.updateToken(FCMtoken, currentUserUid)
+                });
+                this.fcm.requestPushPermission().then((permission) => {
+                  console.log("[MQTTNotificationService] FCM: requestPushPermission --->", permission);
+                  if(permission === true){
+                    this.fcm.getToken().then(FCMtoken => {
+                      console.log("[MQTTNotificationService] FCM: getToken --->", FCMtoken);
+                      this.FCMcurrentToken = FCMtoken;
+                      this.updateToken(FCMtoken, currentUserUid)
+                    });
+                  }
+                });
+                
+              }
         }
     }
 
@@ -229,7 +244,7 @@ export class FirebaseNotifications extends NotificationsService {
         const device_model = {
             device_model: navigator.userAgent,
             language: navigator.language,
-            platform: 'ionic',
+            platform: this.platform,
             platform_version: this.BUILD_VERSION
         }
 

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

@@ -99,7 +99,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
-                this.logger.log('[MQTTConversationHandlerSERVICE] message lastMessages:', messages);
                 messages.sort(compareValues('timestamp', 'asc'));
                 messages.forEach(message => {
                     const msg: MessageModel = message;        

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

@@ -254,11 +254,11 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             conversation.conversation_with = conversation.conversWith // conversWith comes from remote
         }
 
-        //skip info message updates
-        if(messageType(MESSAGE_TYPE_INFO, conversation) ){
+         //skip info message updates
+         if(messageType(MESSAGE_TYPE_INFO, conversation) ){
             return;
         }
-        
+
 
         const index = searchIndexInArrayForUid(this.conversations, conversation.conversation_with);
         const oldConversation = this.conversations[index]

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

@@ -1,9 +1,9 @@
-
 import { Injectable } from '@angular/core';
 // services
 import { NotificationsService } from '../abstract/notifications.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 // firebase
 import firebase from "firebase/app";
 import 'firebase/messaging';
@@ -21,22 +21,26 @@ export class MQTTNotifications extends NotificationsService {
   private userId: string;
   private tenant: string;
   private vapidkey: string;
+  private platform: string;
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
-    public chat21Service: Chat21Service
+    public chat21Service: Chat21Service,
+    private fcm: FCM
   ) {
     super();
   }
 
-  initialize(tenant: string, vapId: string): void {
+  initialize(tenant: string, vapId: string, platform: string): void {
     this.tenant = tenant;
     this.vapidkey = vapId;
+    platform === 'desktop'? this.platform = 'ionic' : this.platform = platform
+    this.logger.log('[MQTTNotificationService] initialize - tenant ', this.tenant, this.platform)
     return;
   }
     
   getNotificationPermissionAndSaveToken(currentUserUid) {
-    this.logger.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid );
+    this.logger.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid);
     this.userId = currentUserUid;
     if (firebase.messaging.isSupported()) {
       this.logger.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
@@ -58,6 +62,28 @@ export class MQTTNotifications extends NotificationsService {
       });
     } else {
       this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING IS NOT SUPPORTED')
+
+      if(this.platform == 'android' || this.platform === 'ios'){
+        this.logger.log('[MQTTNotificationService] >>>> FIREBASE MESSAGING: use FCM plugin')
+        this.fcm.onTokenRefresh().subscribe(FCMtoken => {
+          // Register your new token in your back-end if you want
+          // backend.registerToken(token);
+          this.FCMcurrentToken = FCMtoken;
+          console.log("[MQTTNotificationService] FCM: onTokenRefresh --->", FCMtoken);
+          this.saveToken(FCMtoken, currentUserUid)
+        });
+        this.fcm.requestPushPermission().then((permission) => {
+          console.log("[MQTTNotificationService] FCM: requestPushPermission --->", permission);
+          if(permission === true){
+            this.fcm.getToken().then(FCMtoken => {
+              console.log("[MQTTNotificationService] FCM: getToken --->", FCMtoken);
+              this.FCMcurrentToken = FCMtoken;
+              this.saveToken(FCMtoken, currentUserUid)
+            });
+          }
+        });
+        
+      }
     }
   }
 
@@ -104,7 +130,7 @@ export class MQTTNotifications extends NotificationsService {
     const device_model = {
       device_model: navigator.userAgent,
       language: navigator.language,
-      platform: 'ionic',
+      platform: this.platform,
       platform_version: this.BUILD_VERSION
     }
     this.chat21Service.chatClient.saveInstance(FCMcurrentToken,device_model,(err, response) => {

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

@@ -132,8 +132,6 @@ 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) 

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

@@ -129,6 +129,12 @@ export const LogLevel = {
     'DEBUG': 3
 }
 
+export enum PLAN_NAME {
+    A = 'Growth',
+    B = 'Scale',
+    C = 'Plus',
+}
+
 export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk', 'sv', 'az', 'kk', 'uz']
 
 

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

@@ -2,7 +2,7 @@ import { TYPE_DIRECT, TYPE_SUPPORT_GROUP } from 'src/chat21-core/utils/constants
 import { ConversationModel } from 'src/chat21-core/models/conversation';
 import { Inject, Injectable, OnInit } from '@angular/core';
 import { avatarPlaceholder, getColorBck } from './utils-user';
-import moment from 'moment';
+import * as moment from 'moment';
 
 @Injectable()
 export class ConvertRequestToConversation {

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

@@ -27,10 +27,10 @@ export function isFrame(message: any) {
 
 /** */
 export function isFile(message: any) {
-    if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && !message.metadata.type.includes('audio')) {
-      return true;
-    }
-    return false;
+  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && !message.metadata.type.includes('audio')) {
+    return true;
+  }
+  return false;
 }
 
 export function isAudio(message: any) {