@chat21/chat21-ionic 3.0.65 → 3.0.68-rc.2

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

@@ -15,16 +15,15 @@ export abstract class ConversationsHandlerService {
 
   // BehaviorSubject
   abstract BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
   abstract conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
   abstract conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+  abstract conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}> = new BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>(null);
   abstract conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
-  abstract loadedConversationsStorage: BehaviorSubject<ConversationModel[]> = new BehaviorSubject<ConversationModel[]>([]);
-
+  // abstract readAllMessages: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+ 
   // params
   abstract conversations: Array<ConversationModel> = [];
   abstract uidConvSelected: string;
-  // abstract imageRepo: ImageRepoService;
 
   // functions
   abstract initialize(tenant: string, userId: string, translationMap: Map<string, string>): void;
@@ -34,6 +33,7 @@ export abstract class ConversationsHandlerService {
   abstract setConversationRead(conversationId: string): void;
   abstract dispose(): void;
   abstract archiveConversation(conversationId: string): void;
+  abstract getLastConversation(callback:(conv: ConversationModel, error: string)=>void): void
   abstract getConversationDetail(conversationId: string, callback:(conv: ConversationModel)=>void): void;
   abstract getClosingConversation(conversationId: string): boolean;
   abstract setClosingConversation(conversationId: string, status: boolean): void;

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

@@ -28,11 +28,10 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
 
     // BehaviorSubject
     BSConversationDetail: BehaviorSubject<ConversationModel>;
+    archivedConversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
     // readAllMessages: BehaviorSubject<string>;
-    archivedConversationAdded: BehaviorSubject<ConversationModel>;
-    archivedConversationChanged: BehaviorSubject<ConversationModel>;
-    archivedConversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
 
     // public params
     archivedConversations: Array<ConversationModel> = [];
@@ -325,7 +324,6 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
      * 7 -  attivo sound se è un msg nuovo
      */
 
-    //TODO-GAB: fare emit singola conversation e non dell'intero array di conversations
     private changed(childSnapshot: any) {
         if (this.conversationGenerate(childSnapshot)) {
             const index = searchIndexInArrayForUid(this.archivedConversations, childSnapshot.key);
@@ -395,7 +393,6 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
             conversation_with_fullname = conv.recipient_fullname;
         }
         // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the archived convesations list
-        // conv.last_message_text = htmlEntities(conv.last_message_text)
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);

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

@@ -40,21 +40,15 @@ export class FirebaseAuthService extends MessagingAuthService {
 
 
   // BehaviorSubject
-  BSAuthStateChanged: BehaviorSubject<any>;
-  BSSignOut: BehaviorSubject<any>;
-  // firebaseSignInWithCustomToken: BehaviorSubject<any>;
+  BSAuthStateChanged: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public params
   // private persistence: string;
   public SERVER_BASE_URL: string;
 
   // private
-  private URL_TILEDESK_SIGNIN: string;
-  private URL_TILEDESK_SIGNIN_ANONYMOUSLY: string;
   private URL_TILEDESK_CREATE_CUSTOM_TOKEN: string;
-  private URL_TILEDESK_SIGNIN_WITH_CUSTOM_TOKEN: string;
-  //TODO-GAB
-  // private imageRepo: ImageRepoService = new FirebaseImageRepoService();
 
   private firebaseToken: string;
   private logger: LoggerService = LoggerInstance.getInstance()

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

@@ -32,10 +32,10 @@ import { messageType, isEmojii } from 'src/chat21-core/utils/utils-message';
 export class FirebaseConversationHandler extends ConversationHandlerService {
 
     // BehaviorSubject
-    messageAdded: BehaviorSubject<MessageModel>;
-    messageChanged: BehaviorSubject<MessageModel>;
-    messageRemoved: BehaviorSubject<string>;
-    isTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+    messageAdded: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageChanged: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageRemoved: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+    messageWait: BehaviorSubject<any> = new BehaviorSubject<string>(null);
 
     // public variables
     public attributes: any;

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

@@ -31,12 +31,12 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
     // BehaviorSubject
-    BSConversationDetail: BehaviorSubject<ConversationModel>;
+    BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationChangedDetailed: BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}> = new BehaviorSubject<{value: ConversationModel, previousValue: ConversationModel}>(null);
+    conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
     // readAllMessages: BehaviorSubject<string>;
-    conversationAdded: BehaviorSubject<ConversationModel>;
-    conversationChanged: BehaviorSubject<ConversationModel>;
-    conversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
 
     // public params
     conversations: Array<ConversationModel> = [];
@@ -51,6 +51,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     private logger: LoggerService = LoggerInstance.getInstance()
     private ref: firebase.database.Query;
     private BASE_URL: string;
+    private BASE_URL_DATABASE: string;
     // private audio: any;
     // private setTimeoutSound: any;
     private subscribe: any
@@ -79,6 +80,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         //this.databaseProvider.initialize(userId, this.tenant);
         //this.getConversationsFromStorage();
         this.BASE_URL = this.appConfig.getConfig().firebaseConfig.chat21ApiUrl;
+        this.BASE_URL_DATABASE = this.appConfig.getConfig().firebaseConfig.databaseURL;
     }
 
     /**
@@ -165,6 +167,45 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         }, 2000);
     }
 
+    public getLastConversation(callback: (conversation: ConversationModel, error: string)=>void){
+
+        this.getFirebaseToken((error, idToken) => {
+            this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationsRESTApi  idToken', idToken)
+            this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationsRESTApi  error', error)
+            if (idToken) {
+                const httpOptions = {
+                    headers: new HttpHeaders({
+                        'Accept': 'application/json',
+                        'Content-Type': 'application/json',
+                        // 'Authorization': 'Bearer ' + idToken,
+                    })
+
+                }
+                const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId);
+                const queryString = '?auth=' + idToken +'&orderBy="timestamp"&limitToLast=1'
+                const url = this.BASE_URL_DATABASE + urlNodeFirebase + '.json' + queryString// + queryString;
+                this.http.get(url, httpOptions).subscribe((childSnapshot: any) => {
+                    this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationsRESTApi - RES', childSnapshot);
+                    if(childSnapshot){
+                        const childData: ConversationModel = childSnapshot[Object.keys(childSnapshot)[0]];
+                        childData.uid = Object.keys(childSnapshot)[0]
+                        const conversation = this.completeConversation(childData); 
+                        callback(conversation, null)
+                    }else if(!childSnapshot){
+                        callback(null, null)
+                    }
+                }, (error) => {
+                    this.logger.error('[FIREBASEConversationsHandlerSERVICE] getConversationsRESTApi ERROR ', error);
+                    callback(null, 'error')
+                }, () => {
+                    this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationsRESTApi * COMPLETE *');
+                });
+            } else {
+                callback(null, 'error')
+            }
+        });
+    }
+
     /**
      * restituisce il numero di conversazioni nuove
      */
@@ -439,7 +480,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
      * 6 -  ordino l'array per timestamp
      * 7 -  pubblico conversations:update
      */
-    //TODO-GAB: ora emit singola conversation e non dell'intero array di conversations
     private added(childSnapshot: any) {
         if (this.conversationGenerate(childSnapshot)) {
             const index = searchIndexInArrayForUid(this.conversations, childSnapshot.key);
@@ -462,13 +502,14 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
      * 7 -  attivo sound se è un msg nuovo
      */
 
-    //TODO-GAB: ora emit singola conversation e non dell'intero array di conversations
     private changed(childSnapshot: any) {
+        const oldConversation = this.conversations[searchIndexInArrayForUid(this.conversations, childSnapshot.key)]
         if (this.conversationGenerate(childSnapshot)) {
             const index = searchIndexInArrayForUid(this.conversations, childSnapshot.key);
             if (index > -1) {
                 const conversationChanged = this.conversations[index]
-                this.conversationChanged.next(conversationChanged);
+                this.conversationChanged.next(conversationChanged)
+                this.conversationChangedDetailed.next({value: conversationChanged, previousValue: oldConversation});
             }
         } else {
             this.logger.error('[FIREBASEConversationsHandlerSERVICE]CHANGED::conversations with conversationId: ', childSnapshot.key, 'is not valid')
@@ -482,7 +523,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
      * 4 -  pubblico conversations:update
      * 5 -  elimino conversazione dall'array delle conversazioni chiuse
      */
-    //TODO-GAB: ora emit singola conversation e non dell'intero array di conversations
     private removed(childSnapshot: any) {
         const index = searchIndexInArrayForUid(this.conversations, childSnapshot.key);
         if (index > -1) {
@@ -548,7 +588,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         /** END: UPDATE CONVERSATIONS is_new IF conv is selected or sender is me */
 
         // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
-        // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.conversation_with = conversation_with;
         conv.conversation_with_fullname = conversation_with_fullname;
         conv.status = this.setStatusConversation(conv.sender, conv.uid);

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

@@ -31,11 +31,11 @@ import { LoggerInstance } from '../logger/loggerInstance';
 export class FirebaseGroupsHandler extends GroupsHandlerService {
 
     // BehaviorSubject
-    BSgroupDetail: BehaviorSubject<GroupModel>;
-    SgroupDetail: Subject<GroupModel>;
-    groupAdded: BehaviorSubject<GroupModel>;
-    groupChanged: BehaviorSubject<GroupModel>;
-    groupRemoved: BehaviorSubject<GroupModel>;
+    BSgroupDetail: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null); 
+    SgroupDetail: Subject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupAdded: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupChanged: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupRemoved: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
 
     // public params
     conversations: Array<ConversationModel> = [];

package/src/chat21-core/providers/firebase/firebase-image-repo.ts

@@ -8,6 +8,7 @@ import { ImageRepoService } from '../abstract/image-repo.service';
 // import * as firebase from 'firebase/app';
 import firebase from "firebase/app";
 import 'firebase/storage';
+import { HttpClient } from '@angular/common/http';
 
 @Injectable({ providedIn: 'root' })
 
@@ -17,7 +18,7 @@ export class FirebaseImageRepoService extends ImageRepoService {
     private urlStorageBucket = environment.firebaseConfig.storageBucket + '/o/profiles%2F';
     private baseImageURL: string;
     
-    constructor() {
+    constructor(public http: HttpClient) {
         super();
     }
 

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

@@ -23,9 +23,8 @@ import { LoggerInstance } from '../logger/loggerInstance';
 export class FirebasePresenceService extends PresenceService {
 
   // BehaviorSubject
-  // BSIsOnline: BehaviorSubject<any>;
-  BSIsOnline: BehaviorSubject<any>;
-  BSLastOnline: BehaviorSubject<any>;
+  BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSLastOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public tenant: string;
 

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

@@ -32,8 +32,8 @@ export class TypingModel {
 export class FirebaseTypingService extends TypingService {
 
   // BehaviorSubject
-  BSIsTyping: BehaviorSubject<any>;
-  BSSetTyping: BehaviorSubject<any>;
+  BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public params
   // public tenant: string;

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

@@ -24,7 +24,7 @@ import { UploadModel } from '../../models/upload';
 export class FirebaseUploadService extends UploadService {
 
   // BehaviorSubject
-  BSStateUpload: BehaviorSubject<any>;
+  BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   //private
   private url: string;