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

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chat21-ionic ver 3.0
 
+### 3.4.13-rc.5
+- removed: tiledeskToken from tiledesk-service
+
 ### 3.4.13-rc.4
 - added: management for copilot option in project.profile obj
 - removed: token in each tiledesk Service method calls and added initialize method for each services

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.13-rc4",
+    "version": "3.4.13-rc5",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -42,6 +42,8 @@ import { Globals } from './utils/globals';
 import { GlobalSettingsService } from './services/global-settings/global-settings.service';
 import { conversationToMessage } from 'src/chat21-core/utils/utils-message';
 import { ProjectService } from './services/projects/project.service';
+import { ContactsService } from './services/contacts/contacts.service';
+import { TiledeskService } from './services/tiledesk/tiledesk.service';
 
 @Component({
   selector: 'app-root',
@@ -136,7 +138,11 @@ export class AppComponent implements OnInit {
     public el: ElementRef,
     public g: Globals,
     public globalSettingsService: GlobalSettingsService,
-    public projectService: ProjectService
+
+    /**TILEDESK SERVICES */
+    private tiledeskService: TiledeskService,
+    private projectService: ProjectService,
+    private contactsService: ContactsService
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
@@ -1166,7 +1172,9 @@ export class AppComponent implements OnInit {
     this.chatManager.setTiledeskToken(tiledeskToken);
     this.chatManager.setCurrentUser(currentUser);
 
+    this.tiledeskService.initialize(serverBaseURL)
     this.projectService.initialize(serverBaseURL)
+    this.contactsService.initialize(serverBaseURL)
     // this.chatManager.startApp();
 
     // ----------------------------------------------

package/src/app/components/canned-response/canned-response.component.ts

@@ -101,9 +101,7 @@ export class CannedResponseComponent implements OnInit {
   }
 
   getProjectIdByConversationWith(strSearch, conversationWith: string) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-
-    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+    this.tiledeskService.getProjectIdByConvRecipient(conversationWith).subscribe((res) => {
       this.logger.log('[CANNED] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT RES', res)
       if (res) {
         const projectId = res.id_project
@@ -204,9 +202,8 @@ export class CannedResponseComponent implements OnInit {
   onConfirmEditCanned(canned, ev){
     ev.preventDefault()
     ev.stopPropagation()
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[CANNED] onConfirmEditCanned ', canned, ev)
-    this.cannedResponsesService.edit(tiledeskToken, canned.id_project, canned).subscribe(cannedRes=> {
+    this.cannedResponsesService.edit(canned.id_project, canned).subscribe(cannedRes=> {
       canned.disabled = true
     }, (error) => {
       this.logger.error('[CANNED] - onConfirmEditCanned - ERROR  ', error)
@@ -218,9 +215,8 @@ export class CannedResponseComponent implements OnInit {
   onDeleteCanned(canned, ev){
     ev.preventDefault()
     ev.stopPropagation()
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[CANNED] onDeleteCanned ', canned)
-    this.cannedResponsesService.delete(tiledeskToken, canned.id_project, canned._id).subscribe(cannedRes=> {
+    this.cannedResponsesService.delete(canned.id_project, canned._id).subscribe(cannedRes=> {
       if(cannedRes.status === 1000){
         this.tagsCannedFilter.splice(this.tagsCannedFilter.findIndex(el => el._id === canned._id), 1)
       }

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

@@ -61,12 +61,12 @@
               <ion-icon slot="icon-only" name="flash-outline" style="font-size: 24px;"></ion-icon>
             </ion-button>
           </div>
-          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP)  && tagsCannedCount === 0"
+          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP)  && tagsCannedFilter.length === 0"
             tooltip="{{translationMap?.get('NO_CANNED_RESPONSES')}}" placement="top"
             class="no-canned-responses-btn-badge">
             <ion-icon name="alert-sharp" style="vertical-align: middle;"></ion-icon>
           </div>
-          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) && (tagsCannedCount > 0)"
+          <div *ngIf="conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) && (tagsCannedFilter.length > 0)"
             tooltip="{{translationMap?.get('YES_CANNED_RESPONSES')}}" placement="top" class="canned-responses-btn-badge">
             <ion-icon name="information-sharp" style="vertical-align: middle;"></ion-icon>
           </div>

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

@@ -110,9 +110,7 @@ export class InfoContentComponent implements OnInit {
   }
 
   getProjectIdByConversationWith(conversationWith: string) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-
-    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe(res => {
+    this.tiledeskService.getProjectIdByConvRecipient(conversationWith).subscribe(res => {
       this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT RES', res);
 
       if (res) {

package/src/app/components/copilot-popover/copilot-popover.component.html

@@ -11,7 +11,7 @@
           [(ngModel)]="text" 
           (ionChange)="ionChange($event);" 
           (ionFocus)="ionFocus()"
-          (keydown.enter)="onKeydown($event, messageString)">
+          (keydown.enter)="onKeydown($event)">
         </ion-textarea>
       </div>
     </div>

package/src/app/components/copilot-popover/copilot-popover.component.ts

@@ -72,9 +72,8 @@ export class CopilotPopoverComponent implements OnInit {
     this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] ionFocus event ");
   }
 
-  onKeydown(e: any, text: string) {
+  onKeydown(e: any) {
     this.logger.log("[COPILOT-POPOVER] - returnChangeTextArea - onKeydown in MSG-TEXT-AREA event", e)
-    this.logger.log("[COPILOT-POPOVER] - returnChangeTextArea - onKeydown in MSG-TEXT-AREA text", text)
   }
 
 

package/src/app/components/copilot-suggestions/copilot-suggestions.component.ts

@@ -75,9 +75,7 @@ export class CopilotSuggestionsComponent implements OnInit {
   }
 
   getProjectIdByConversationWith(conversationWith: string) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-
-    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+    this.tiledeskService.getProjectIdByConvRecipient(conversationWith).subscribe((res) => {
       this.logger.log('[COPILOT] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT RES', res)
       if (res) {
         const projectId = res.id_project

package/src/app/modals/create-canned-response/create-canned-response.page.ts

@@ -5,7 +5,6 @@ import { Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service';
 import { MenuController } from '@ionic/angular';
 import { EventsService } from 'src/app/services/events-service';
@@ -28,7 +27,6 @@ export class CreateCannedResponsePage implements OnInit {
   private logger: LoggerService = LoggerInstance.getInstance();
 
   prjctID: string;
-  tiledeskToken: string;
   showSpinnerCreateCannedResponse: boolean = false;
   addWhiteSpaceBefore: boolean;
   mouseOverBtnAddRecipientNamePlaceholder: boolean = false;
@@ -40,7 +38,6 @@ export class CreateCannedResponsePage implements OnInit {
     private formBuilder: FormBuilder,
     private translate: TranslateService,
     private translateService: CustomTranslateService,
-    public tiledeskAuthService: TiledeskAuthService,
     public tiledeskService: TiledeskService,
     public cannedResponsesService: CannedResponsesService,
     private menu: MenuController,
@@ -61,9 +58,7 @@ export class CreateCannedResponsePage implements OnInit {
     // this.getCurrentProjectId();
     // console.log('[CREATE-CANNED-RES] - conversationWith ', this.conversationWith)
      console.log('[CREATE-CANNED-RES] - message ', this.message, this.conversationWith)
-    this.tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-    this.logger.log('[CREATE-CANNED-RES] tiledeskToken ', this.tiledeskToken)
-    this.getCurrentProjectId(this.conversationWith, this.tiledeskToken);
+    this.getCurrentProjectId(this.conversationWith);
 
 
     let keys= [
@@ -108,7 +103,7 @@ export class CreateCannedResponsePage implements OnInit {
   }
 
 
-  getCurrentProjectId(conversation_id, tiledeskToken) {
+  getCurrentProjectId(conversation_id) {
     const conversationWith_segments = conversation_id.split('-')
     // Removes the last element of the array if is = to the separator
     if (
@@ -133,14 +128,13 @@ export class CreateCannedResponsePage implements OnInit {
       this.prjctID = conversationWith_segments[2]
       this.logger.log('[CREATE-CANNED-RES] - loadTagsCanned projectId ', this.prjctID)
     } else {
-      this.getProjectIdByConversationWith(conversation_id, tiledeskToken)
+      this.getProjectIdByConversationWith(conversation_id)
     }
   }
 
-  getProjectIdByConversationWith(conversationWith: string, tiledeskToken: string) {
-    // const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
+  getProjectIdByConversationWith(conversationWith: string) {
 
-    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+    this.tiledeskService.getProjectIdByConvRecipient(conversationWith).subscribe((res) => {
       this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT RES', res)
       if (res) {
         this.prjctID = res.id_project

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

@@ -31,11 +31,8 @@ export class ContactsDirectoryPage implements OnInit {
     private navService: NavProxyService,
     // private contactsDirectoryService: ContactsDirectoryService,
     private contactsService: ContactsService,
-    private appConfigProvider: AppConfigProvider,
     public events: EventsService
-  ) {
-    const serverBaseUrl = this.appConfigProvider.getConfig().apiUrl
-    this.contactsService.initialize(serverBaseUrl)
+  ) {    
   }
 
   ngOnInit() {

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

@@ -544,9 +544,8 @@ 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
@@ -968,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
@@ -1037,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, {})
+      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

@@ -75,7 +75,7 @@ export class CannedResponsesService {
       
   }
 
-  public edit(token: string, projectid: string, canned: any){
+  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);
     
@@ -97,14 +97,14 @@ export class CannedResponsesService {
     }))
   }
 
-  public delete(token: string, projectid: string, cannedID: string){
+  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/tiledesk/tiledesk.service.ts

@@ -6,6 +6,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({
@@ -13,38 +14,41 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class TiledeskService {
 
-  private apiUrl: string;
+  // private
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
-  ) {
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    // const projectUrl = this.apiUrl + 'projects/'
-    // console.log('[TILEDESK-SERVICE] projectUrl' ,projectUrl  )
+    public appStorageService: AppStorageService
+  ) {}
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
   }
 
 
   // CLOSE SUPPORT GROUP
-  public closeSupportGroup(token: string, projectid: string, supportgroupid: string) {
+  public closeSupportGroup(projectid: string, supportgroupid: string) {
+    const url = this.SERVER_BASE_URL + projectid + '/requests/' + supportgroupid + '/close';
+    this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup URL ', url);
+    
     const httpOptions = {
       headers: new HttpHeaders({
         'Accept': 'application/json',
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
     const body = {
       force: true
     };
-    // console.log('CLOUD FUNCT CLOSE SUPPORT GROUP REQUEST BODY ', body);
-    // https://tiledesk-server-pre.herokuapp.com/
-    // const url = 'https://tiledesk-server-pre.herokuapp.com/' + this.project_id + '/requests/' + group_id + '/close';
-    const url = this.apiUrl + projectid + '/requests/' + supportgroupid + '/close';
 
-    this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup URL ', url);
     return this.http.put(url, body, httpOptions).pipe(map((res: any) => {
         this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup - RES ', res);
         return res
@@ -54,14 +58,14 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ GET request by id
   // ---------------------------------------------
-  public getRequest(request_id: string, project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/requests/'+request_id
+  public getRequest(request_id: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/requests/'+request_id
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW LEAD url ', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -71,15 +75,15 @@ export class TiledeskService {
     }))
   }
 
-  public getProjectIdByConvRecipient(token: string ,conversationWith: string ) {
-    const lookupUrl = this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
+  public getProjectIdByConvRecipient(conversationWith: string ) {
+    const lookupUrl = this.SERVER_BASE_URL + 'requests_util/lookup/id_project/' + conversationWith;
 
     this.logger.log('[TILEDESK-SERVICE] GET PROJECTID BY CONV RECIPIENT - URL ', lookupUrl);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -89,14 +93,14 @@ export class TiledeskService {
     }))
   }
 
-  public getProjectUsersByProjectId(project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/project_users/';
+  public getProjectUsersByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
     this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     return this.http.get(url, httpOptions).pipe(map((res: any) => {
@@ -105,14 +109,14 @@ export class TiledeskService {
     }))
   }
 
-  public getAllLeadsActiveWithLimit(project_id: string, token: string, limit: number) {
-    const url = this.apiUrl + project_id + '/leads?limit=' + limit + '&with_fullname=true';
+  public getAllLeadsActiveWithLimit(project_id: string, limit: number) {
+    const url = this.SERVER_BASE_URL + project_id + '/leads?limit=' + limit + '&with_fullname=true';
     this.logger.log('[TILEDESK-SERVICE] - GET ALL ACTIVE LEADS (LIMIT 10000) -  URL', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     return this.http.get(url, httpOptions).pipe(map((res: any) => {
@@ -125,13 +129,13 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ Create new project user to get new lead ID
   // ---------------------------------------------
-  public createNewProjectUserToGetNewLeadID(project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/project_users/'
+  public createNewProjectUserToGetNewLeadID(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW PROJECT USER TO GET NEW LEAD ID url ', url);
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     const body = {};
@@ -144,14 +148,14 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ Create new lead 
   // ---------------------------------------------
-  public createNewLead(leadid: string, fullname: string, leademail: string, project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/leads/'
+  public createNewLead(leadid: string, fullname: string, leademail: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/leads/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW LEAD url ', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -167,15 +171,14 @@ export class TiledeskService {
   // -------------------------------------------------------------------------------------
   // @ Get all bots of the project (with all=true the response return also the identity bot) 
   // -------------------------------------------------------------------------------------
-  public getAllBotByProjectId(project_id: string, token: string) {
-   
-    const url = this.apiUrl + project_id + '/faq_kb?all=true'
+  public getAllBotByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/faq_kb?all=true'
     this.logger.log('[TILEDESK-SERVICE] - GET ALL BOTS BY PROJECT ID - URL', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -188,15 +191,14 @@ export class TiledeskService {
   // -------------------------------------------------------------------------------------
   // @ Get all DEPTS of the project
   // -------------------------------------------------------------------------------------
-  public getDeptsByProjectId(project_id: string, token: string) {
-   
-    const url = this.apiUrl + project_id + '/departments/allstatus';
+  public getDeptsByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/departments/allstatus';
     this.logger.log('[TILEDESK-SERVICE] - GET DEPTS (ALL STATUS) - URL', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -209,15 +211,14 @@ export class TiledeskService {
   // -----------------------------------------------------------------------------------------
   // @ Create ticket
   // -----------------------------------------------------------------------------------------
-  public createInternalRequest(requester_id: string, request_id: string, subject: string, message: string, departmentid: string, participantid: string, ticketpriority: string, project_id: string, token: string) {
-    
-    const url = this.apiUrl + project_id + '/requests/' + request_id + '/messages'
+  public createInternalRequest(requester_id: string, request_id: string, subject: string, message: string, departmentid: string, participantid: string, ticketpriority: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/requests/' + request_id + '/messages'
     this.logger.log('[WS-REQUESTS-SERV] - CREATE INTERNAL REQUEST URL ', url)
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     // this.logger.log('JOIN FUNCT OPTIONS  ', options);
@@ -240,20 +241,20 @@ export class TiledeskService {
   // -----------------------------------------------------------------------------------------
   // @ Send Email
   // -----------------------------------------------------------------------------------------
-  public sendEmail(token: string, projectid: string, request_id: string, form: { subject: string, text: string}) {
+  public sendEmail(projectid: string, request_id: string, form: { subject: string, text: string}) {
+    const url = this.SERVER_BASE_URL + projectid + '/requests/' + request_id + '/email/send';
+    this.logger.log('[TILEDESK-SERVICE] - sendEmail URL ', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Accept': 'application/json',
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
     const body = form;
 
-    const url = this.apiUrl + projectid + '/requests/' + request_id + '/email/send';
-    this.logger.log('[TILEDESK-SERVICE] - sendEmail URL ', url);
     return this.http.post(url, body, httpOptions).pipe(map((res: any) => {
         this.logger.log('[TILEDESK-SERVICE] - sendEmail - RES ', res);
         return res