@chat21/chat21-ionic 3.0.59-rc1 → 3.0.59-rc16

package/src/app/services/app-config.ts

@@ -18,18 +18,88 @@ export class AppConfigProvider {
 
   /** */
   loadAppConfig() {
-    const that = this;
-    return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
-        that.appConfig = data;
+    // const that = this;
+    // return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
+    //     that.appConfig = data;
+    //   }).catch(err => {
+    //     console.log('error loadAppConfig' + err);
+    //   });
+
+    // ---- new
+
+
+    return this.http.get(this.appConfig.remoteConfigUrl)
+      .toPromise().then((data: any ) => {
+        console.log('AppConfigService loadAppConfig data: ', data);
+ 
+        const allconfig = data
+        // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig: ', allconfig);
+
+        if (allconfig.hasOwnProperty('wsUrlRel')) {
+
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel ->: ', allconfig.wsUrlRel);
+          var wsUrlRelIsEmpty = this.isEmpty(allconfig.wsUrlRel)
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel -> wsUrlRelIsEmpty ?', wsUrlRelIsEmpty);
+
+          if (wsUrlRelIsEmpty === false) {
+            // console.log('[APP-CONFIG-SERVICE]- loadAppConfig allconfig !!!! exist - SERVER_BASE_URL', data.apiUrl);
+
+            if (allconfig.apiUrl.indexOf("http://") !== -1) {
+
+              const ws_url = allconfig.apiUrl.replace("http://", "ws://").slice(0, -1) + allconfig.wsUrlRel;
+              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTP - wsUrl', ws_url);
+
+              allconfig.wsUrl = ws_url
+
+            } else if (allconfig.apiUrl.indexOf("https://") !== -1) {
+
+              const ws_url = allconfig.apiUrl.replace("https://", "wss://").slice(0, -1) + allconfig.wsUrlRel;
+
+              allconfig.wsUrl = ws_url
+
+              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
+            } else {
+              console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
+
+              // console.log(window.location)
+
+              if (window.location.protocol === 'http:') {
+                allconfig.wsUrl = 'ws://' + window.location.hostname + '/ws/'
+
+              } else if (window.location.protocol === 'https:') {
+
+                allconfig.wsUrl = 'wss://' + window.location.hostname + '/ws/'
+              } else {
+
+                allconfig.wsUrl = 'ws://' + window.location.hostname + '/ws/'
+              }
+            }
+
+          } else {
+            console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! exist wsUrlRel but IS EMPTY');
+          }
+
+        } else {
+
+          console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! does not exist wsUrlRel');
+        }
+
+        this.appConfig = allconfig;
+      
+
       }).catch(err => {
-        // console.log('error loadAppConfig' + err);
+        console.error('error loadAppConfig' + err);
       });
   }
 
+  isEmpty(wsUrlRel: string) {
+    return (wsUrlRel === undefined || wsUrlRel == null || wsUrlRel.length <= 0) ? true : false;
+  }
+
   /** */
   getConfig() {
     return this.appConfig;
   }
-  
+
 
 }

package/src/app/services/nav-proxy.service.ts

@@ -25,7 +25,7 @@ export class NavProxyService {
   
     this.sidebarNav = sidebarNav;
     this.detailNav = detailNav;
-    this.logger.info('[NAV-SERV] initialize sidebarNav', sidebarNav, ' detailNav', detailNav);
+    this.logger.log('[NAV-SERV] initialize sidebarNav', sidebarNav, ' detailNav', detailNav);
   }
 
   setRoot(page: any, navExtra: any) {

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

@@ -21,6 +21,8 @@ export class TiledeskService {
     public appConfigProvider: AppConfigProvider
   ) {
     this.apiUrl = appConfigProvider.getConfig().apiUrl;
+    // const projectUrl = this.apiUrl + 'projects/'
+    // console.log('[TILEDESK-SERVICE] projectUrl' ,projectUrl  )
   }
 
 
@@ -51,7 +53,7 @@ export class TiledeskService {
 
   // http://tiledesk-server-pre.herokuapp.com/requests_util/lookup/id_project/support-group-60ffe291f725db00347661ef-b4cb6875785c4a23b27244fe498eecf44
   public getProjectIdByConvRecipient(token: string ,conversationWith: string ) {
-    const lookupUrl =this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
+    const lookupUrl = this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
 
     this.logger.log('[TILEDESK-SERVICE] GET PROJECTID BY CONV RECIPIENT - URL ', lookupUrl);
 
@@ -70,6 +72,25 @@ export class TiledeskService {
       }))
   }
 
+  public getProjects(token: string) {
+    const url = this.apiUrl + 'projects/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECTS URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    return this.http
+    .get(url, httpOptions)
+    .pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] GET PROJECTS - RES ', res);
+      return res
+    }))
+  }
+