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

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 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
+ 
 ### 3.4.13-rc.3
 - added: copilot-popover on each received message
 - changed: canned-responsed no data ui

package/package.json

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

package/src/app/app.component.ts

@@ -40,7 +40,10 @@ import { Deeplinks } from '@ionic-native/deeplinks/ngx';
 import { TriggerEvents } from './services/triggerEvents/triggerEvents';
 import { Globals } from './utils/globals';
 import { GlobalSettingsService } from './services/global-settings/global-settings.service';
-import { commandToMessage, conversationToMessage, isSender } from 'src/chat21-core/utils/utils-message';
+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',
@@ -103,13 +106,10 @@ export class AppComponent implements OnInit {
     private appConfigProvider: AppConfigProvider,
     public events: EventsService,
     public triggerEvents: TriggerEvents,
-    public config: Config,
     public chatManager: ChatManager,
     public translate: TranslateService,
     public alertController: AlertController,
     public navCtrl: NavController,
-    // public userService: UserService,
-    // public currentUserService: CurrentUserService,
     public modalController: ModalController,
     public messagingAuthService: MessagingAuthService,
     public tiledeskAuthService: TiledeskAuthService,
@@ -137,7 +137,12 @@ export class AppComponent implements OnInit {
     public fcm: FCM,
     public el: ElementRef,
     public g: Globals,
-    public globalSettingsService: GlobalSettingsService
+    public globalSettingsService: GlobalSettingsService,
+
+    /**TILEDESK SERVICES */
+    private tiledeskService: TiledeskService,
+    private projectService: ProjectService,
+    private contactsService: ContactsService
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
@@ -1153,7 +1158,7 @@ export class AppComponent implements OnInit {
     // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - GO-ONLINE isOnline ', this.isOnline);
     // clearTimeout(this.timeModalLogin);
     const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-
+    const serverBaseURL = this.appConfigProvider.getConfig().apiUrl 
     // const supportmode = this.appConfigProvider.getConfig().supportMode;
     // this.logger.log('[APP-COMP] - GO-ONLINE - supportmode ', supportmode);
     // if (supportmode === true) {
@@ -1166,6 +1171,10 @@ export class AppComponent implements OnInit {
     this.logger.log('[APP-COMP] - GO-ONLINE - currentUser ', currentUser);
     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/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html

@@ -97,16 +97,6 @@
     <div role="messaggio" *ngIf="messageType(MESSAGE_TYPE_MINE, message)" class="msg_container base_sent">
 
       <div class="message-date-hover"> {{message.timestamp | date:'HH:mm' }} </div>
-
-      <!-- <ng-container *ngIf="areVisibleCAR && supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg canned" ion-button fill="clear"
-          (click)="presentCreateCannedResponseModal(message)" [tooltip]="addAsCannedResponseTooltipText"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="flash-outline" style="font-size: 1em;"> </ion-icon>
-          <span class="add-canned-response-add-icon">+</span>
-        </ion-button>
-      </ng-container> -->
-
       
       <div class="bubble-container">
 
@@ -174,6 +164,7 @@
           [fontSize]="stylesMap?.get('fontSize')"
           [fontFamily]="stylesMap?.get('fontFamily')"
           [stylesMap]="stylesMap"
+          [isCopilotEnabled]="isCopilotEnabled"
           (onBeforeMessageRender)="onBeforeMessageRenderFN($event)"
           (onAfterMessageRender)="onAfterMessageRenderFN($event)" 
           (onElementRendered)="onElementRenderedFN($event)"
@@ -189,22 +180,6 @@
         </ion-button>
       </ng-container>
 
-      <!-- <ng-container *ngIf="areVisibleCAR && supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg canned" ion-button fill="clear"
-          (click)="presentCreateCannedResponseModal(message)" [tooltip]="addAsCannedResponseTooltipText"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="flash-outline" style="font-size: 1em;"> </ion-icon>
-          <span class="add-canned-response-add-icon">+</span>
-        </ion-button>
-      </ng-container> -->
-      <!-- <ng-container *ngIf="supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg emoji" ion-button fill="clear"
-          (click)="presentEmojiiModal()" tooltip="{{addAsCannedResponseTooltipText}}"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="happy-outline" style="font-size: 1em;"> </ion-icon>
-        </ion-button>
-      </ng-container> -->
-
       <div class="message-date-hover" *ngIf="isChannelTypeGroup(channelType)"> {{message.timestamp | date:'HH:mm' }} </div>
     </div>
     

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -29,6 +29,7 @@ export class IonConversationDetailComponent extends ConversationContentComponent
   @Input() senderId: string;
   @Input() channelType: string;
   @Input() areVisibleCAR: boolean;
+  @Input() isCopilotEnabled: boolean = false
   @Input() supportMode: boolean;
   @Input() isMobile: boolean;
   @Input() openInfoConversation: boolean;
@@ -166,7 +167,6 @@ export class IonConversationDetailComponent extends ConversationContentComponent
     }else if(event.option === 'jsonInfo'){
       this.presentJsonMessageModal(event.data.message)
     } else if(event.option === 'copilot_question'){
-      console.log('hereeeeeee', event)
       this.eventService.publish('copilot:new_question', {text: event.data.text})
 
     }

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html

@@ -11,6 +11,7 @@
   </div> -->
   <chat-options
     [message]="message"
+    [isCopilotEnabled]="isCopilotEnabled"
     [logLevel]="logger.getLoggerConfig().logLevel"
     (onOptionsDataReturned)="onOptionsDataReturnedFN($event)">
   </chat-options>

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts

@@ -26,6 +26,7 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
   @Input() fontFamily: string;
   @Input() stylesMap: Map<string, string>;
   @Input() supportMode: boolean;
+  @Input() isCopilotEnabled: boolean = false;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
   @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>();

package/src/app/chatlib/conversation-detail/message/options/options.component.html

@@ -2,7 +2,7 @@
   <div class="options-logo" (click)="onClickOptionsMessage($event)" >
     <ion-icon name="chevron-down"></ion-icon>
   </div>
-  <div class="options-logo" (click)="onClickOptionsCopilot($event)">
+  <div *ngIf="isCopilotEnabled" class="options-logo" (click)="onClickOptionsCopilot($event)">
     <ion-icon id="copilot" src="assets/images/icons/copilot.svg"></ion-icon>
   </div>
 </div>

package/src/app/chatlib/conversation-detail/message/options/options.component.ts

@@ -14,6 +14,7 @@ import { CopilotPopoverComponent } from 'src/app/components/copilot-popover/copi
 export class OptionsComponent implements OnInit {
 
   @Input() message: MessageModel;
+  @Input() isCopilotEnabled: boolean = false;
   @Input() logLevel: number;
   @Output() onOptionsDataReturned = new EventEmitter<{option: string, data: any}>();
 

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
@@ -120,12 +118,11 @@ export class CannedResponseComponent implements OnInit {
   }
 
   getAndShowCannedResponses(strSearch, projectId) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[CANNED] - loadTagsCanned tagsCanned.length', this.tagsCanned.length)
     //if(this.tagsCanned.length <= 0 ){
     this.tagsCanned = []
     this.showLoading = true;
-    this.cannedResponsesService.getAll(tiledeskToken, projectId).subscribe((res) => {
+    this.cannedResponsesService.getAll(projectId).subscribe((res) => {
       this.logger.log('[CANNED] - loadTagsCanned  getCannedResponses RES', res)
 
       this.tagsCanned = res
@@ -205,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)
@@ -219,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

@@ -28,7 +28,7 @@
       </div>
     </div>
 
-    <div>
+    <div *ngIf="isCopilotEnabled">
       <!-- COPILOT-OPTION -->
       <div class="section-option" id="copilot" tooltip="{{translationMap?.get('COPILOT.ASK_AI')}}" placement="top">
         <ion-button id="copilot" fill="clear" [class.active]="section ==='copilot'" (click)="onOpenSection('copilot')">
@@ -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-detail/message-text-area/message-text-area.component.ts

@@ -52,6 +52,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() channel: string;
   @Input() tagsCannedFilter: any;
   @Input() areVisibleCAR: boolean;
+  @Input() isCopilotEnabled: boolean = false;
   @Input() supportMode: boolean;
   @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string, presence: {}};
   @Input() fileUploadAccept: string;

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) {
@@ -225,17 +223,15 @@ export class InfoContentComponent implements OnInit {
 
     this.member = null;
 
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-    this.contactsService.loadContactDetail(tiledeskToken, this.conversationWith)
-      .subscribe(res => {
-        this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail RES', res);
-        this.member = res
-        this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect member', this.member);
-      }, (error) => {
-        this.logger.error('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail - ERROR  ', error);
-      }, () => {
-        this.logger.log('I[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail * COMPLETE *');
-      });
+    this.contactsService.loadContactDetail(this.conversationWith).subscribe(res => {
+      this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail RES', res);
+      this.member = res
+      this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect member', this.member);
+    }, (error) => {
+      this.logger.error('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail - ERROR  ', error);
+    }, () => {
+      this.logger.log('I[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail * COMPLETE *');
+    });
   }
 
   // ---------------------------------------------------

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

@@ -38,7 +38,6 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
   constructor(
     public imageRepoService: ImageRepoService,
     public presenceService: PresenceService,
-    public tiledeskAuthService: TiledeskAuthService,
     public contactsService: ContactsService,
     public renderer: Renderer2,
     private router: Router,
@@ -56,10 +55,7 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
     // const currentUrl = this.router.url;
     // this.logger.log('InfoGroupComponent current_url ', currentUrl);
     // .pipe(takeUntil(this.unsubscribe$))
-    router.events
-      .pipe(filter(event => event instanceof NavigationEnd))
-
-      .subscribe((event: NavigationEnd) => {
+    router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
         // console.log('InfoGroupComponent -  router.events prev url :', event.url);
         this.previousUrl = event.url;
 
@@ -122,8 +118,6 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
 
     if (this.groupDetail) {
       if (this.groupDetail.uid.startsWith('group-')) {
-        const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-
         this.member_array = []
         const members_isonline_array = []
 
@@ -156,9 +150,7 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
 
             });
 
-          this.contactsService.loadContactDetail(tiledeskToken, key)
-            .pipe(takeUntil(this.unsubscribe$))
-            .subscribe(user => {
+          this.contactsService.loadContactDetail(key).pipe(takeUntil(this.unsubscribe$)).subscribe(user => {
               this.logger.log('InfoGroupComponent group detail loadContactDetail RES', user);
               // this.logger.log('InfoGroupComponent group detail this.presenceService.BSIsOnline.value()', this.presenceService.BSIsOnline.getValue);
 

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

@@ -1,3 +1,4 @@
+import { AppConfigProvider } from 'src/app/services/app-config';
 import { filter } from 'rxjs/operators';
 import { Component, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, SimpleChange } from '@angular/core';
 import { CopilotService } from 'src/app/services/copilot/copilot.service';
@@ -39,19 +40,23 @@ export class CopilotSuggestionsComponent implements OnInit {
     public tiledeskAuthService: TiledeskAuthService,
     public tiledeskService: TiledeskService,
     public copilotService: CopilotService,
+    public appConfigProvider: AppConfigProvider,
     public el: ElementRef
-  ) { }
+  ) { 
+    const serverBaseUrl = this.appConfigProvider.getConfig().apiUrl
+    this.copilotService.initialize(serverBaseUrl)
+  }
 
   ngOnInit() {
     this.loggedUser = this.tiledeskAuthService.getCurrentUser()
   }
 
   ngOnChanges(changes: SimpleChange){
-      this.logger.debug('[COPILOT] - loadTagsCanned strSearch ', this.currentString)
-      if(changes && changes['conversationWith'] && (changes['conversationWith'].previousValue !== changes['conversationWith'].currentValue)){
-        this.projectID = getProjectIdSelectedConversation(this.conversationWith)
-      }
-      this.loadSuggestions(this.conversationWith)
+    this.logger.debug('[COPILOT] - loadTagsCanned strSearch ', this.currentString)
+    if(changes && changes['conversationWith'] && (changes['conversationWith'].previousValue !== changes['conversationWith'].currentValue)){
+      this.projectID = getProjectIdSelectedConversation(this.conversationWith)
+    }
+    this.loadSuggestions(this.conversationWith)
   }
 
 
@@ -70,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
@@ -90,13 +93,12 @@ export class CopilotSuggestionsComponent implements OnInit {
 
 
   getAndShowSuggestions(projectId) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[COPILOT] - loadTagsCanned tagsCanned.length', this.suggestions.length)
     //if(this.tagsCanned.length <= 0 ){
     this.suggestions = []
     this.showLoading = true;
     if(this.question && this.question !== ''){
-      this.copilotService.getAllFromQuestion(this.question, tiledeskToken, projectId, this.conversationWith).subscribe((res) => {
+      this.copilotService.getAllFromQuestion(this.question, projectId, this.conversationWith).subscribe((res) => {
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses RES', res)
         this.suggestions = res.map(el => ({ ...el, disabled : true }))
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses tagsCannedCount', this.suggestions)
@@ -108,7 +110,7 @@ export class CopilotSuggestionsComponent implements OnInit {
         this.onLoadedSuggestions.emit(this.suggestions)
       })
     } else {
-      this.copilotService.getAll(tiledeskToken, projectId, this.conversationWith).subscribe((res) => {
+      this.copilotService.getAll(projectId, this.conversationWith).subscribe((res) => {
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses RES', res)
         this.suggestions = res.map(el => ({ ...el, disabled : true }))
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses tagsCannedCount', this.suggestions)

package/src/app/components/navbar/navbar.component.ts

@@ -1,7 +1,7 @@
 import { AppConfigProvider } from 'src/app/services/app-config';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { EventsService } from 'src/app/services/events-service';
-import { ProjectsService } from './../../services/projects/projects.service';
+import { ProjectService } from '../../services/projects/project.service';
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
@@ -33,7 +33,7 @@ export class NavbarComponent implements OnInit {
   public MT: boolean;
 
   constructor(
-    private projectsService: ProjectsService,
+    private projectService: ProjectService,
     private tiledeskAuthService: TiledeskAuthService,
     private appConfigProvider: AppConfigProvider,
     private translateService: CustomTranslateService, 
@@ -78,7 +78,7 @@ export class NavbarComponent implements OnInit {
 
   getProjects() {
     this.logger.log('[NAVBAR] calling getProjects ... ');
-    this.projectsService.getProjects(this.tiledeskToken).subscribe((projects: any) => {
+    this.projectService.getProjects().subscribe((projects: any) => {
       this.logger.log('[NAVBAR] getProjects PROJECTS ', projects);
       if (projects) {
           // this.projects = projects;
@@ -170,7 +170,7 @@ export class NavbarComponent implements OnInit {
       url = baseUrl + '#/project/' + this.project.id_project.id + '/project-settings/general' + '?token=' + this.tiledeskToken
     }else if(event ==='allProjects'){
       url = baseUrl + '#/projects/' + '?token=' + this.tiledeskToken
-    }else if('addProject'){
+    }else if(event === 'addProject'){
       url = baseUrl + '#/create-new-project/' + '?token=' + this.tiledeskToken
     }
     console.log('onClickDropdownOption-->', url)

package/src/app/components/project-item/project-item.component.ts

@@ -14,6 +14,7 @@ import { WebSocketJs } from 'src/app/services/websocket/websocket-js';
 import { AppConfigProvider } from 'src/app/services/app-config';
 import { ConvertRequestToConversation } from 'src/chat21-core/utils/convertRequestToConversation';
 import { compareValues } from 'src/chat21-core/utils/utils';
+import { ProjectService } from 'src/app/services/projects/project.service';
 
 @Component({
   selector: 'app-project-item',
@@ -46,7 +47,7 @@ export class ProjectItemComponent implements OnInit {
     public appStorageService: AppStorageService,
     private translateService: CustomTranslateService,
     public tiledeskAuthService: TiledeskAuthService,
-    public tiledeskService: TiledeskService,
+    public projectService: ProjectService,
     public webSocketJs: WebSocketJs,
     private appConfigProvider: AppConfigProvider,
     public events: EventsService,
@@ -174,9 +175,7 @@ export class ProjectItemComponent implements OnInit {
 
     if (!stored_project || stored_project === 'undefined') {
       this.logger.log('PROJECT-ITEM - THERE IS NOT STORED LAST PROJECT OR IS UNDEFINED ', stored_project)
-      const tiledeskToken = this.appStorageService.getItem('tiledeskToken');
-      this.logger.log('[PROJECT-ITEM] - GET PROJECTS - tiledeskToken', tiledeskToken);
-      this.tiledeskService.getProjects(tiledeskToken).subscribe(projects => {
+      this.projectService.getProjects().subscribe(projects => {
         this.logger.log('[PROJECT-ITEM - GET PROJECTS - RES', projects);
 
         this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTS - RES this.project', this.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
@@ -177,7 +171,7 @@ export class CreateCannedResponsePage implements OnInit {
     this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - MSG ', message);
     this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - TITLE ', title);
 
-    this.cannedResponsesService.add(this.tiledeskToken, this.prjctID, title.trim(), message.trim()).subscribe((responses: any) => {
+    this.cannedResponsesService.add(this.prjctID, title.trim(), message.trim()).subscribe((responses: any) => {
       this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - RES ', responses);
     }, (error) => {
       this.logger.error('[CREATE-CANNED-RES]- CREATE CANNED RESP - ERROR  ', error);