@chat21/chat21-web-widget 5.0.53 → 5.0.54

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

@@ -1,3 +1,4 @@
+import { Chat21Service } from 'src/chat21-core/providers/mqtt/chat-service';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
@@ -19,6 +20,7 @@ import { LoggerInstance } from '../logger/loggerInstance';
 // @Injectable({ providedIn: 'root' })
 @Injectable()
 export class MQTTPresenceService extends PresenceService {
+  
 
   // BehaviorSubject
   BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
@@ -30,7 +32,7 @@ export class MQTTPresenceService extends PresenceService {
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
-    // private events: EventsService
+    public chat21Service: Chat21Service
   ) {
     super();
   }
@@ -47,40 +49,11 @@ export class MQTTPresenceService extends PresenceService {
   }
 
   lastOnlineForUser(userid: string) {
-    // console.log('lastOnlineForUser', userid);
-    // const that = this;
-    // const urlNodeLastOnLine = this.urlNodePresence + userid + '/lastOnline';
-    // console.log('urlNodeLastOnLine: ', urlNodeLastOnLine);
-    // const lastOnlineRef = firebase.database().ref().child(urlNodeLastOnLine);
-    // lastOnlineRef.on('value', (child) => {
-    //   if (child.val()) {
-    //     that.events.publish('last-connection-date-' + userid, userid, child.val());
-    //   } else {
-    //     that.events.publish('last-connection-date-' + userid, userid, '');
-    //   }
-    // });
+
   }
 
   public setPresence(userid: string): void  {
-    // console.log(' setPresence: ', userid);
-    // this.onlineConnectionsRef = this.referenceOnlineForUser(userid);
-    // this.lastOnlineConnectionsRef = this.referenceLastOnlineForUser(userid);
-    // const connectedRefURL = '/.info/connected';
-    // const conn = firebase.database().ref(connectedRefURL);
-    // conn.on('value', (dataSnapshot) => {
-    //   // console.log('self.deviceConnectionRef: ', dataSnapshot.val());
-    //   if (dataSnapshot.val()) {
-    //     if (this.onlineConnectionsRef) {
-    //       this.keyConnectionRef = this.onlineConnectionsRef.push(true);
-    //       this.keyConnectionRef.onDisconnect().remove();
-    //       const now: Date = new Date();
-    //       const timestamp = now.valueOf();
-    //       this.lastOnlineConnectionsRef.onDisconnect().set(timestamp);
-    //     } else {
-    //       console.log('This is an error. self.deviceConnectionRef already set. Cannot be set again.');
-    //     }
-    //   }
-    // });
+
   }
 
   /**
@@ -88,130 +61,14 @@ export class MQTTPresenceService extends PresenceService {
    * richiamato prima del logout
    */
   public removePresence(): void {
-    // if (this.onlineConnectionsRef) {
-    //   const now: Date = new Date();
-    //   const timestamp = now.valueOf();
-    //   this.lastOnlineConnectionsRef.set(timestamp);
-    //   this.onlineConnectionsRef.off();
-    //   this.onlineConnectionsRef.remove();
-    //   console.log('goOffline onlineConnectionsRef', this.onlineConnectionsRef);
-    // }
-  }
-
-}
-
-
-  /**
-   * controlla se esiste una connessione per l'utente analizzato,
-   * verificando se esiste un nodo in presence/uid/connections
-   * mi sottosrivo al nodo
-   * se non esiste pubblico utente offline
-   * se esiste pubblico utente online
-   * @param userid
-   */
-
-
-  /**
-   * mi sottoscrivo al nodo presence/uid/lastOnline
-   * e recupero la data dell'ultimo stato online
-   * pubblico lastConnectionDate
-   * @param userid
-   */
-
-
-  /**
-   * calcolo tempo trascorso tra ora e timestamp passato
-   * @param timestamp
-   */
 
+  }
 
-  // /**
-  //  * recupero la reference di lastOnline del currentUser
-  //  * usata in setupMyPresence
-  //  * @param userid
-  //  */
-  // lastOnlineRefForUser(userid){
-  //   let lastOnlineRefURL = this.urlNodeFirebase+"/presence/"+userid+"/lastOnline";
-  //   const lastOnlineRef = firebase.database().ref().child(lastOnlineRefURL);
-  //   return lastOnlineRef;
-  // }
-
-  // /**
-  //  * recupero la reference di connections (online/offline) del currentUser
-  //  * usata in setupMyPresence
-  //  * @param userid
-  //  */
-  // onlineRefForUser(userid){
-  //   let myConnectionsRefURL = this.urlNodeFirebase+"/presence/"+userid+"/connections";
-  //   const connectionsRef = firebase.database().ref().child(myConnectionsRefURL);
-  //   return connectionsRef;
-  // }
-
-  // /**
-  //  * 1 - imposto reference online/offline
-  //  * 2 - imposto reference lastConnection
-  //  * 3 - mi sincronizzo con /.info/connected
-  //  * 4 - se il valore esiste l'utente è online
-  //  * 5 - aggiungo nodo a connection (true)
-  //  * 6 - aggiungo job su onDisconnect di deviceConnectionRef che rimuove nodo connection 
-  //  * 7 - aggiungo job su onDisconnect di lastOnlineRef che imposta timestamp
-  //  * 8 - salvo reference connected nel singlelton !!!!! DA FARE
-  //  * @param userid
-  //  */
-  // setupMyPresence(userid){
-  //   let that = this;
-  //   this.myConnectionsRef = this.onlineRefForUser(userid);
-  //   this.lastOnlineRef = this.lastOnlineRefForUser(userid);
-  //   let connectedRefURL = "/.info/connected";
-  //   let conn = firebase.database().ref(connectedRefURL);
-  //   conn.on('value', function(dataSnapshot) {
-  //     //console.log("KEY: ",dataSnapshot,that.deviceConnectionRef);
-  //     if(dataSnapshot.val()){
-  //       console.log("self.deviceConnectionRef: ", that.myConnectionsRef);
-  //       //if (!that.myConnectionsRef || that.myConnectionsRef==='undefined') {
-  //       if (that.myConnectionsRef) {
-  //         //this.deviceConnectionRef = myConnectionsRef.set(true);
-  //         let conection = true;
-  //         //that.deviceConnectionRef = 
-  //         const keyMyConnectionRef = that.myConnectionsRef.push(conection);
-  //         //!!! quando faccio logout devo disconnettermi
-  //         keyMyConnectionRef.onDisconnect().remove();
-  //         // when I disconnect, update the last time I was seen online
-  //         let now: Date = new Date();
-  //         let timestamp = now.valueOf();
-  //         that.lastOnlineRef.onDisconnect().set(timestamp);
-  //       } else {
-  //         console.log("This is an error. self.deviceConnectionRef already set. Cannot be set again.");
-  //       }
-  //     }
-  //   });
-  // }
+  public imHere(): void {
+    this.logger.debug('[MQTT-PRESENCE] imHere', this.tenant);
+    setTimeout(() => {
+      this.chat21Service.chatClient.ImHere()
+    }, 2000);
+  }
 
-  /**
-   * rimuovo la references su lastOnline
-   * rimuovo la references su connection
-   */
-  // goOffline() {
-  //   console.log("goOffline.", this.myConnectionsRef)
-  //   // this.removeConnectionReference();
-  //   this.removeLastOnlineReference();
-  // }
-
-  // removeConnectionReference(){
-  //   if(this.myConnectionsRef){
-  //     this.myConnectionsRef.off();
-  //     console.log("goOffline 1", this.myConnectionsRef)
-  //     this.myConnectionsRef.remove();
-  //     console.log("goOffline 2", this.myConnectionsRef)
-  //   }
-  //   this.myConnectionsRef = null;
-  // }
-
-//   removeLastOnlineReference(){
-//     if(this.lastOnlineRef){
-//       this.lastOnlineRef.off();
-//       this.lastOnlineRef.remove();
-//     }
-//     this.lastOnlineRef = null;
-//   }
-// }
+}

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

@@ -117,7 +117,12 @@ export class TiledeskAuthService {
           resolve(this.currentUser)
         }
       }, (error) => {
+        if(error.status === 401){
+          this.logOut()
+        }
         reject(error)
+        
+        
       });
     });
   }

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

@@ -1,5 +1,6 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { map } from 'rxjs/operators';
 import { AppStorageService } from '../abstract/app-storage.service';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -11,7 +12,7 @@ export class TiledeskRequestsService {
   public SERVER_BASE_URL: string;
 
   // private
-  private URL_TILEDESK_CLOSE_REQUEST: string;
+  private URL_TILEDESK_REQUEST: string;
   private tiledeskToken: string;
 
   private logger: LoggerService = LoggerInstance.getInstance()
@@ -24,7 +25,7 @@ export class TiledeskRequestsService {
   initialize(serverBaseUrl: string, projectId: string,) {
     this.logger.debug('[TILEDESK-REQUEST-SERV] - initialize', projectId);
     this.SERVER_BASE_URL = serverBaseUrl;
-    this.URL_TILEDESK_CLOSE_REQUEST = this.SERVER_BASE_URL + projectId +'/requests/';
+    this.URL_TILEDESK_REQUEST = this.SERVER_BASE_URL + projectId +'/requests/';
   }
 
 
@@ -37,8 +38,8 @@ export class TiledeskRequestsService {
       Authorization: this.tiledeskToken,
     });
     const requestOptions = { headers: headers };
-    const that = this;
-    const url = this.URL_TILEDESK_CLOSE_REQUEST + supportgroupid + '/closeg'
+    
+    const url = this.URL_TILEDESK_REQUEST + supportgroupid + '/closeg'
     return new Promise((resolve, reject) => {
       this.logger.debug('[TILEDESK-REQUEST-SERV] - closeSupportGroup URLLLL', url, requestOptions);
       this.http.put(url, null, requestOptions).subscribe((data) => {
@@ -49,4 +50,20 @@ export class TiledeskRequestsService {
       });
     });
   }
+
+  public sendMessageToRequest(request_id: string, token: string, message: any): Promise<any> {
+    const url = this.URL_TILEDESK_REQUEST + request_id + '/messages'
+    this.logger.log('[TILEDESK-SERVICE] - SEND MESSAGE TO A REQUEST url ', url);
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+    const body = message;
+    return this.http.post(url, body, httpOptions).toPromise().then(res => {
+      this.logger.log('[TILEDESK-SERVICE] - SEND MESSAGE TO A REQUEST res ', res);
+      return res
+    })
+  }
 }

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

@@ -1,3 +1,7 @@
+import { convertMessage } from 'src/app/utils/utils';
+import { MessageModel } from './../models/message';
+import { ConversationModel } from './../models/conversation';
+import { v4 as uuidv4 } from 'uuid';
 import {
     MESSAGE_TYPE_INFO,
     MESSAGE_TYPE_MINE,
@@ -69,6 +73,18 @@ export function isMine(message: any) {
     return false;
 }
 
+export function isSender(sender: string, currentUserId: string) {
+  if (currentUserId) {
+      if (sender === currentUserId) {
+          return true;
+      } else {
+          return false;
+      }
+  } else {
+      return false;
+  }
+}
+
 /** */
 export function messageType(msgType: string, message: any) {
 
@@ -177,3 +193,23 @@ export function hideInfoMessage(msg, infoMessageKeyEnabled): boolean{
   }
   return true
 }
+
+
+export function conversationToMessage(conversation: ConversationModel, currentUserId: string): MessageModel{
+  let message: any = {}
+  message.uid = conversation['message_id']? conversation['message_id'] : uuidv4()
+  message.text = conversation.text? conversation.text.trim(): conversation.last_message_text.trim()
+  message.sender = conversation.sender
+  message.sender_fullname = conversation.sender_fullname
+  message.recipient = conversation.recipient
+  message.recipient_fullname = conversation.recipient_fullname
+  message.status = +conversation.status
+  message.timestamp = conversation.timestamp
+  message.metadata = conversation['metadata']
+  message.channel_type = conversation.channel_type
+  message.type = conversation.type
+  message.isSender = isSender(message.sender, currentUserId)
+  message.attributes = conversation.attributes
+
+  return message as MessageModel
+}

package/src/iframe-style.css

@@ -69,8 +69,8 @@
     max-width: 400px;
 }
 #tiledesk-container.closed #tiledeskdiv.messagePreview {
-    width: 340px;
-    height: 300px;
+    width: 375px; /*340px*/
+    height: 440px; /*300px*/
     min-width: 340px;
 }
 

package/src/models/project.ts

@@ -1,3 +1,5 @@
+import { IRules } from './rule';
+
 export class ProjectModel {
     constructor(
         public id?: string,
@@ -22,6 +24,7 @@ export class ProjectModel {
         public color?: string,
         public welcomeTitle?: string,
         public welcomeMsg?: string,
+        public attributes?: IRules
     ) { }
 
     initialize (
@@ -40,7 +43,7 @@ export class ProjectModel {
         trialDaysLeft?: number,
         trialExpired?: boolean,
         updatedAt?: string,
-        versions?: string
+        versions?: string,
     ) {
         this.id = id;
         this.activeOperatingHours = activeOperatingHours;

package/src/models/rule.ts

@@ -0,0 +1,19 @@
+export interface IRules {
+    [id: string]:Rule[]
+}
+
+export interface Rule {
+    uid: string,
+    name: string,
+    description?: string,
+    when: {
+        regexOption: string,
+        text: string, 
+        urlMatches: string, 
+        triggerEvery: number
+    },
+    do: [
+        // {wait: number},
+        {message: any}
+    ]
+}