@chat21/chat21-ionic 3.4.13-rc3 → 3.4.13-rc5

package/src/app/modals/create-ticket/create-ticket.page.ts

@@ -23,7 +23,6 @@ export class CreateTicketPage implements OnInit {
   loadingAssignee: boolean = true;
   loadingRequesters: boolean = true;
   prjctID: string;
-  tiledeskToken: string;
   selectedRequester: any;
   storageBucket: string;
   baseUrl: string;
@@ -66,7 +65,6 @@ export class CreateTicketPage implements OnInit {
   constructor(
     public modalController: ModalController,
     public tiledeskService: TiledeskService,
-    public tiledeskAuthService: TiledeskAuthService,
     public appConfigProvider: AppConfigProvider,
     public events: EventsService
   ) {}
@@ -85,11 +83,8 @@ export class CreateTicketPage implements OnInit {
       this.prjctID = storedPrjctObjct.id_project.id
       this.logger.log('[CREATE-TICKET] this.prjctID ', this.prjctID)
     }
-    this.tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-    this.logger.log('[CREATE-TICKET] tiledeskToken ', this.tiledeskToken)
-
-    this.getProjectUsersAndContacts(this.prjctID, this.tiledeskToken)
-    this.getProjectUserBotsAndDepts(this.prjctID, this.tiledeskToken)
+    this.getProjectUsersAndContacts(this.prjctID)
+    this.getProjectUserBotsAndDepts(this.prjctID)
   }
 
   getUploadEngine() {
@@ -108,16 +103,9 @@ export class CreateTicketPage implements OnInit {
   // -------------------------------------------------------------------------------------------
   // Create the array of the project-users and contacts displayed in the combo box  "Requester"
   // -------------------------------------------------------------------------------------------
-  getProjectUsersAndContacts(projctid: string, tiledesktoken: string) {
-    const projectUsers = this.tiledeskService.getProjectUsersByProjectId(
-      projctid,
-      tiledesktoken,
-    )
-    const leads = this.tiledeskService.getAllLeadsActiveWithLimit(
-      projctid,
-      tiledesktoken,
-      10000,
-    )
+  getProjectUsersAndContacts(projctid: string) {
+    const projectUsers = this.tiledeskService.getProjectUsersByProjectId(projctid)
+    const leads = this.tiledeskService.getAllLeadsActiveWithLimit(projctid,10000)
 
     zip(projectUsers, leads).subscribe(
       ([_prjctUsers, _leads]) => {
@@ -253,11 +241,11 @@ export class CreateTicketPage implements OnInit {
   // -------------------------------------------------------------------------------------------------------------------
   // Create the array of the project-users, the bots and of the departments displayed in the combo box "Select Assignee"
   // -------------------------------------------------------------------------------------------------------------------
-  getProjectUserBotsAndDepts(projctid: string, tiledesktoken: string) {
+  getProjectUserBotsAndDepts(projctid: string) {
     // this.loadingAssignee = true;
-    const projectUsers = this.tiledeskService.getProjectUsersByProjectId( projctid, tiledesktoken)
-    const bots = this.tiledeskService.getAllBotByProjectId(projctid, tiledesktoken)
-    const depts = this.tiledeskService.getDeptsByProjectId(projctid, tiledesktoken)
+    const projectUsers = this.tiledeskService.getProjectUsersByProjectId( projctid)
+    const bots = this.tiledeskService.getAllBotByProjectId(projctid)
+    const depts = this.tiledeskService.getDeptsByProjectId(projctid)
 
     zip(projectUsers, bots, depts).subscribe(
       ([_prjctUsers, _bots, _depts]) => {
@@ -361,8 +349,7 @@ export class CreateTicketPage implements OnInit {
         this.assignee_dept_id,
         this.assignee_participants_id,
         this.selectedPriority,
-        this.prjctID,
-        this.tiledeskToken
+        this.prjctID
       ).subscribe((newticket: any) => {
         this.logger.log('[WS-REQUESTS-LIST] create internalRequest - RES ', newticket);
 

package/src/app/modals/send-email/send-email.page.ts

@@ -34,7 +34,6 @@ export class SendEmailModal implements OnInit {
     public viewCtrl: ModalController,
     private formBuilder: FormBuilder,
     private tiledeskService: TiledeskService,
-    private tiledeskAuthService: TiledeskAuthService,
     private toastController: ToastController
   ) { }
 
@@ -81,8 +80,7 @@ export class SendEmailModal implements OnInit {
 
   onSubmit(){
     this.logger.log('[SEND-EMAIL-MODAL] onSubmit -->',this.emailFormGroup)
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-    this.tiledeskService.sendEmail(tiledeskToken, this.projectId, this.conversationWith, this.emailFormGroup.value).subscribe((res)=> {
+    this.tiledeskService.sendEmail(this.projectId, this.conversationWith, this.emailFormGroup.value).subscribe((res)=> {
       this.logger.debug('[SEND-EMAIL-MODAL] subscribe to sendEmail API response -->', res)
       if(res && res.queued){
         this.viewCtrl.dismiss({form: this.emailFormGroup.value})

package/src/app/pages/contacts-directory/contacts-directory.page.ts

@@ -10,6 +10,7 @@ import { EventsService } from '../../services/events-service';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppConfigProvider } from 'src/app/services/app-config';
 
 @Component({
   selector: 'app-contacts-directory',
@@ -18,7 +19,6 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class ContactsDirectoryPage implements OnInit {
   
-  @Input() token: string;
   @Input() isMobile: boolean;
   @Input() stylesMap: Map<string, string>;
   // @Input() user: string;
@@ -32,21 +32,19 @@ export class ContactsDirectoryPage implements OnInit {
     // private contactsDirectoryService: ContactsDirectoryService,
     private contactsService: ContactsService,
     public events: EventsService
-  ) {
+  ) {    
   }
 
   ngOnInit() {
-    this.logger.log('[CONTACT-DIRECTORY-PAGE] - TOKEN (ngOnInit)', this.token);
     this.initialize();
   }
 
   /** */
   initialize() {
     this.logger.log('[CONTACT-DIRECTORY-PAGE] - initialize');
-    this.logger.log('[CONTACT-DIRECTORY-PAGE] - token: ', this.token);
     this.contacts = [];
     this.initSubscriptions();
-    this.contactsService.loadContactsFromUrl(this.token);
+    this.contactsService.loadContactsFromUrl();
   }
 
   /**

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

@@ -135,7 +135,8 @@
                   [messages]="messages" 
                   [senderId]="loggedUser.uid"
                   [baseLocation]="window?.location?.origin"
-                  [areVisibleCAR]="areVisibleCAR" 
+                  [areVisibleCAR]="areVisibleCAR"
+                  [isCopilotEnabled]="isCopilotEnabled"
                   [supportMode]= "supportMode"
                   [isMobile]="isMobile"
                   [isTypings]="isTypings"
@@ -203,7 +204,8 @@
               [channelType]="channelType"
               [channel]="conversation?.attributes?.request_channel"
               [tagsCannedFilter]="tagsCannedFilter"
-              [areVisibleCAR]="areVisibleCAR" 
+              [areVisibleCAR]="areVisibleCAR"
+              [isCopilotEnabled]="isCopilotEnabled"
               [supportMode]="supportMode"
               [leadInfo]="leadInfo"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"

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

@@ -1,3 +1,4 @@
+import { ProjectPlanUtils } from './../../utils/project-utils';
 import { DomSanitizer } from '@angular/platform-browser';
 import {
   Component,
@@ -81,6 +82,7 @@ import { EventsService } from '../../services/events-service'
 import { WebsocketService } from 'src/app/services/websocket/websocket.service';
 import { Project } from 'src/chat21-core/models/projects';
 import { Globals } from 'src/app/utils/globals';
+import { ProjectService } from 'src/app/services/projects/project.service';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -147,6 +149,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
   public_Key: any;
   areVisibleCAR: boolean;
+  isCopilotEnabled: boolean;
   supportMode: boolean;
   isEmailEnabled: boolean;
   offlineMsgEmail: boolean;
@@ -234,10 +237,11 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public presenceService: PresenceService,
     public toastController: ToastController,
     public tiledeskService: TiledeskService,
+    public projectService: ProjectService,
     private networkService: NetworkService,
     private events: EventsService,
     private webSocketService: WebsocketService,
-    private sanitizer: DomSanitizer,
+    public projectPlanUtils: ProjectPlanUtils,
     private g: Globals,
   ) {
     // Change list on date change
@@ -498,6 +502,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.isEmailEnabled = (this.appConfigProvider.getConfig().emailSection === 'true' || this.appConfigProvider.getConfig().emailSection === true) ? true : false;
     this.isWhatsappTemplatesEnabled = (this.appConfigProvider.getConfig().whatsappTemplatesSection === 'true' || this.appConfigProvider.getConfig().whatsappTemplatesSection === true) ? true : false;
 
+    this.cannedResponsesService.initialize(appconfig.apiUrl)
+
     if (checkPlatformIsMobile()) {
       this.isMobile = true
       // this.openInfoConversation = false; // indica se è aperto il box info conversazione
@@ -538,13 +544,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   _getProjectIdByConversationWith(conversationWith: string) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     if (this.channelType !== TYPE_DIRECT && !this.conversationWith.startsWith('group-')) {
-      this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+      this.tiledeskService.getProjectIdByConvRecipient(conversationWith).subscribe((res) => {
         this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES + projectId', res, res.id_project)
         if (res) {
           const projectId = res.id_project
-          this.getProjectById(tiledeskToken, projectId)
+          this.getProjectById(projectId)
         }
       }, (error) => {
         this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ',conversationWith,  error)
@@ -558,13 +563,14 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     
   }
 
-  getProjectById(tiledeskToken, projectId) {
-    this.tiledeskService.getProjectById(tiledeskToken, projectId).subscribe((project) => {
+  getProjectById(projectId) {
+    this.projectService.getProjectById(projectId).subscribe(async (project) => {
       this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES', project)
       if (project) {
         const projectId = project.id_project
-        this.canShowCanned = this.checkPlanIsExpired(project)
+        this.canShowCanned = this.projectPlanUtils.checkPlanIsExpired(project)
         this.offlineMsgEmail = this.checkOfflineMsgEmailIsEnabled(project)
+        this.isCopilotEnabled = this.projectPlanUtils.checkProjectProfileFeature(project, 'copilot')
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -577,27 +583,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
 
-  checkPlanIsExpired(project: Project): boolean {
-    let check: boolean = false
-
-    //case FREE plan
-    if(project && project.trialExpired && project.profile.type=== 'trial'){
-      check = true
-    }else if(project && !project.trialExpired && project.profile.type=== 'trial'){
-      check = false
-    }
-
-    //case PAYMENT plan
-    if(project && project.isActiveSubscription && project.profile.type=== 'payment'){
-      check = true
-    }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
-      check = false
-    }
-
-    return check
-  }
-
-
   checkOfflineMsgEmailIsEnabled(project: Project): boolean {
     let check: boolean = true
 
@@ -982,10 +967,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   getLeadDetail() {
     const that = this;
     if (this.channelType !== TYPE_DIRECT && !this.conversationWith.startsWith('group-')) {
-      const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
       const projectId = getProjectIdSelectedConversation(this.conversationWith)
       this.logger.debug('[CONVS-DETAIL] getLeadDetail - section ', projectId)
-      this.tiledeskService.getRequest(this.conversationWith, projectId, tiledeskToken).subscribe((request: any) => {
+      this.tiledeskService.getRequest(this.conversationWith, projectId).subscribe((request: any) => {
         that.logger.debug('[CONVS-DETAIL] getLeadDetail - selected REQUEST detail', request)
         if(request && request.channel){
           this.conversation.attributes['request_channel'] = request.channel.name
@@ -1051,13 +1035,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   sendEmail(message: string): Observable<boolean> {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
     const emailFormGroup = {
       subject: this.translationsMap.get('EMAIL.SUBJECT_OFFLINE_MESSAGE'),
       text: message
     }
     let status = new Subject<boolean>();
-    this.tiledeskService.sendEmail(tiledeskToken, this.leadInfo.projectId, this.conversationWith, emailFormGroup).subscribe((res) => {
+    this.tiledeskService.sendEmail(this.leadInfo.projectId, this.conversationWith, emailFormGroup).subscribe((res) => {
       this.logger.debug('[SEND-EMAIL-MODAL] subscribe to sendEmail API response -->', res)
       if (res && res.queued) {
         this.presentToast(this.translationsMap.get('EMAIL.SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE'), 'success', '', 2000)

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

@@ -903,15 +903,11 @@ export class ConversationListPage implements OnInit {
   // Opens the list of contacts for direct convs
   // ---------------------------------------------------------
   openContactsDirectory(event: any) {
-    const TOKEN = this.tiledeskAuthService.getTiledeskToken()
-    this.logger.log('[CONVS-LIST-PAGE] openContactsDirectory', TOKEN)
+    this.logger.log('[CONVS-LIST-PAGE] openContactsDirectory')
     if (checkPlatformIsMobile()) {
-      presentModal(this.modalController, ContactsDirectoryPage, {
-        token: TOKEN,
-        isMobile: this.isMobile
-      })
+      presentModal(this.modalController, ContactsDirectoryPage, { isMobile: this.isMobile })
     } else {
-      this.navService.push(ContactsDirectoryPage, { token: TOKEN })
+      this.navService.push(ContactsDirectoryPage, { isMobile: this.isMobile })
     }
   }
 
@@ -1003,9 +999,7 @@ export class ConversationListPage implements OnInit {
         let project_id = ''
         if (conversationWith_segments.length === 4) {
           project_id = conversationWith_segments[2]
-
-          const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-          this.archiveSupportGroupConv(tiledeskToken,project_id,conversationId,)
+          this.archiveSupportGroupConv(project_id,conversationId)
         } else {
           this.getProjectIdByConversationWith(conversationId)
         }
@@ -1016,15 +1010,13 @@ export class ConversationListPage implements OnInit {
   }
 
   getProjectIdByConversationWith(conversationId: string) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-
-    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationId).subscribe((res) => {
+    this.tiledeskService.getProjectIdByConvRecipient(conversationId).subscribe((res) => {
       this.logger.log('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT RES',res)
 
       if (res) {
         const project_id = res.id_project
         this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  project_id',project_id)
-        this.archiveSupportGroupConv(tiledeskToken,project_id,conversationId)
+        this.archiveSupportGroupConv(project_id,conversationId)
       }
     },(error) => {
       this.logger.error('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT - ERROR  ',error)
@@ -1033,9 +1025,9 @@ export class ConversationListPage implements OnInit {
     })
   }
 
-  archiveSupportGroupConv(tiledeskToken, project_id, conversationId) {
+  archiveSupportGroupConv(project_id, conversationId) {
     this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation projectId: ',project_id)
-    this.tiledeskService.closeSupportGroup(tiledeskToken, project_id, conversationId).subscribe((res) => {
+    this.tiledeskService.closeSupportGroup(project_id, conversationId).subscribe((res) => {
       this.archiveActionNotAllowed = false
       this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation closeSupportGroup RES',res)
       if(res.status === REQUEST_ARCHIVED)

package/src/app/pages/create-requester/create-requester.page.ts

@@ -3,7 +3,6 @@ import { Validators, FormBuilder, FormGroup, FormControl} from '@angular/forms';
 import { ModalController } from '@ionic/angular'
 import { TranslateService } from '@ngx-translate/core';
 import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service';
-import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 @Component({
@@ -19,7 +18,6 @@ export class CreateRequesterPage implements OnInit {
   @Input() projectUserAndLeadsArray: any
  
   prjctID: string;
-  tiledeskToken: string;
   showSpinnerCreateRequester: boolean = false; 
   requester_id: string;
   logger: LoggerService = LoggerInstance.getInstance();
@@ -28,7 +26,6 @@ export class CreateRequesterPage implements OnInit {
     public modalController: ModalController,
     private formBuilder: FormBuilder,
     public tiledeskService: TiledeskService,
-    public tiledeskAuthService: TiledeskAuthService,
     private translate: TranslateService,
   ) {   }
 
@@ -42,9 +39,7 @@ export class CreateRequesterPage implements OnInit {
       this.prjctID = storedPrjctObjct.id_project.id
       this.logger.log('[CREATE-REQUESTER] this.prjctID ', this.prjctID)
     }
-    this.tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-    this.logger.log('[CREATE-REQUESTER] tiledeskToken ', this.tiledeskToken)
-
+    
     this.buildForm()
 
   }
@@ -84,13 +79,13 @@ export class CreateRequesterPage implements OnInit {
     this.logger.log('[CREATE-REQUESTER] - CREATE-NEW-USER email ', new_user_email);
 
 
-    this.tiledeskService.createNewProjectUserToGetNewLeadID(this.prjctID, this.tiledeskToken).subscribe(res => {
+    this.tiledeskService.createNewProjectUserToGetNewLeadID(this.prjctID).subscribe(res => {
       this.logger.log('[CREATE-REQUESTER] - CREATE-NEW-USER - CREATE-PROJECT-USER ', res);
       this.logger.log('[CREATE-REQUESTER] - CREATE-NEW-USER - CREATE-PROJECT-USER UUID ', res.uuid_user);
       if (res) {
         if (res.uuid_user) {
           let new_lead_id = res.uuid_user
-          this.createNewContact(new_lead_id, new_user_name, new_user_email, this.prjctID, this.tiledeskToken)
+          this.createNewContact(new_lead_id, new_user_name, new_user_email, this.prjctID)
         }
       }
     }, error => {
@@ -103,8 +98,8 @@ export class CreateRequesterPage implements OnInit {
   }
 
 
-  createNewContact(lead_id: string, lead_name: string, lead_email: string, projecId: string, tiledeskToken: string) {
-    this.tiledeskService.createNewLead(lead_id, lead_name, lead_email, projecId, tiledeskToken ).subscribe(lead => {
+  createNewContact(lead_id: string, lead_name: string, lead_email: string, projecId: string) {
+    this.tiledeskService.createNewLead(lead_id, lead_name, lead_email, projecId ).subscribe(lead => {
       this.logger.log('[CREATE-REQUESTER] - CREATE-NEW-USER - CREATE-NEW-LEAD -  RES ', lead);
       this.projectUserAndLeadsArray.push({ id: lead.lead_id, name: lead.fullname, role: 'lead', email: lead_email, requestertype: 'lead', requester_id: lead._id});
       this.requester_id = lead._id

package/src/app/services/canned-responses/canned-responses.service.ts

@@ -6,38 +6,44 @@ import { map } from 'rxjs/operators';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class CannedResponsesService {
 
-  private apiUrl: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
-   
     this.logger.log('[CANNED-RESPONSES-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[CANNED-RESPONSES-SERVICE] apiUrl ', this.apiUrl);
+  }
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[CANNED-RESPONSES-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
   }
 
 
-  public getAll(token: string, projectid: string) {
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/";
-    this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - URL ', cannedResponsesURL);
+  public getAll(projectid: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/canned/";
+    this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - URL ', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     
-    return this.http.get(cannedResponsesURL, httpOptions).pipe(map((res: any) => {
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
         this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - RES ', res);
         return res
     }))
@@ -46,14 +52,14 @@ export class CannedResponsesService {
   // -------------------------------------------------------------------------------------
   // @ Create - Save (POST) new canned response
   // -------------------------------------------------------------------------------------
-  public add(token: string, projectid: string, title: string, message: string) {
-    const url =  this.apiUrl  + projectid + '/canned/'
+  public add(projectid: string, title: string, message: string) {
+    const url =  this.SERVER_BASE_URL  + projectid + '/canned/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE CANNED-RES - URL', url); 
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -69,14 +75,14 @@ export class CannedResponsesService {
       
   }
 
-  public edit(token: string, projectid: string, canned: any){
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+ canned._id;
+  public edit(projectid: string, canned: any){
+    const cannedResponsesURL = this.SERVER_BASE_URL + projectid + "/canned/"+ canned._id;
     this.logger.log('[CANNED-RESPONSES-SERVICE] editCannedResponses - URL ', cannedResponsesURL);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -91,14 +97,14 @@ export class CannedResponsesService {
     }))
   }
 
-  public delete(token: string, projectid: string, cannedID: string){
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+cannedID;
+  public delete(projectid: string, cannedID: string){
+    const cannedResponsesURL = this.SERVER_BASE_URL + projectid + "/canned/"+cannedID;
     this.logger.log('[CANNED-RESPONSES-SERVICE] deleteCannedResponses - URL ', cannedResponsesURL);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 

package/src/app/services/contacts/contacts.service.ts

@@ -14,6 +14,7 @@ import { map } from 'rxjs/operators';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
@@ -26,36 +27,41 @@ export class ContactsService {
   BScontactDetail: BehaviorSubject<UserModel> = new BehaviorSubject<UserModel>(null);
 
   // private
-  private urlRemoteContacts: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private contacts: UserModel[];
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
-    this.urlRemoteContacts = appConfigProvider.getConfig().apiUrl + 'chat21/contacts';
+    this.logger.log('[COPILOT-SERVICE] HELLO !');
   }
 
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[COPILOT-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
 
-  // initialize() {}
 
   /** */
-  public loadContactsFromUrl(token: string) {
-    this.contacts = [];
-    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl token', token);
-    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl urlRemoteContacts', this.urlRemoteContacts)
+  public loadContactsFromUrl() {
+    const url = this.SERVER_BASE_URL + 'chat21/contacts';
+    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl urlRemoteContacts', url)
     // if (this.urlRemoteContacts.startsWith('http') && token) {
     const that = this;
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
-   
- 
-    this.http.get<any[]>(this.urlRemoteContacts, httpOptions).subscribe(users => {
+      
+    this.contacts = [];
+    this.http.get<any[]>(url, httpOptions).subscribe(users => {
       this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl users ', users);
       users.forEach(user => {
         const member = that.createCompleteUser(user);
@@ -103,24 +109,21 @@ export class ContactsService {
   * @param token
   * @param uid
   */
-  public loadContactDetail(token: string, uid: string) {
+  public loadContactDetail(uid: string) {
     this.contacts = [];
+    const url = this.SERVER_BASE_URL + 'chat21/contacts/' + uid;
     this.logger.log('[CONTACT-SERVICE] - loadContactDetail - uid ', uid);
-    this.logger.log('[CONTACT-SERVICE] - loadContactDetail - token ', token);
-    const urlRemoteContactDetail = this.urlRemoteContacts + '/' + uid;
     // if (urlRemoteContactDetail.startsWith('http') && token) {
 
       const httpOptions = {
         headers: new HttpHeaders({
           'Content-Type': 'application/json',
-          Authorization: token
+          Authorization: this.tiledeskToken
         })
       };
       // const postData = {};
-      this.logger.log('[CONTACT-SERVICE] - loadContactDetail  url ', urlRemoteContactDetail);
-      return this.http
-        .get(urlRemoteContactDetail, httpOptions)
-        .pipe(map((res: any) => {
+      this.logger.log('[CONTACT-SERVICE] - loadContactDetail  url ', url);
+      return this.http.get(url, httpOptions).pipe(map((res: any) => {
           this.logger.log('[CONTACT-SERVICE] - loadContactDetail - loadContactDetail RES ', res);
           if (res.uid) {
             let user = this.createCompleteUser(res)