@chat21/chat21-ionic 3.0.55-RC6 → 3.0.57

package/src/chat21-core/providers/localSessionStorage.ts

@@ -6,35 +6,35 @@ import { LoggerService } from './abstract/logger.service';
 import { LoggerInstance } from './logger/loggerInstance';
 
 @Injectable()
-export class LocalSessionStorage extends AppStorageService{
-    
-    private storagePrefix: string = STORAGE_PREFIX;
-    private projectID: string;
-    private persistence: string;
-    private logger: LoggerService = LoggerInstance.getInstance();
-    
-    initialize(storagePrefix: string, persistence: string, projectID: string): void {
-      this.storagePrefix = storagePrefix;
-      this.projectID = projectID;
-      this.persistence = persistence;
-      // this.persistence = 'LOCAL';
-      this.logger.info('[LocalSessionStorage] - initialize ', this.storagePrefix, this.persistence, this.projectID)
+export class LocalSessionStorage extends AppStorageService {
+
+  private storagePrefix: string = STORAGE_PREFIX;
+  private projectID: string;
+  private persistence: string;
+  private logger: LoggerService = LoggerInstance.getInstance();
+
+  initialize(storagePrefix: string, persistence: string, projectID: string): void {
+    this.storagePrefix = storagePrefix;
+    this.projectID = projectID;
+    this.persistence = persistence;
+    // this.persistence = 'LOCAL';
+    // this.logger.info('[LocalSessionStorage] - initialize ', this.storagePrefix, this.persistence, this.projectID)
   }
 
   /** GET item in local/session storage from key value
    *  @param key
    */
   getItem(key: string) {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] getItem - Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      return this.getValueForKey(newKey);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] getItem - Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    return this.getValueForKey(newKey);
   }
 
   /** SET new item in local/session storage
@@ -42,173 +42,174 @@ export class LocalSessionStorage extends AppStorageService{
    *  @param value
    */
   setItem(key: string, value: any): void {
-      this.removeItem(key);
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] setItem > Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      this.saveValueForKey(newKey, value);
+    // this.removeItem(key);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] setItem > Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    this.saveValueForKey(newKey, value);
   }
 
   /** GET item in local/session storage from key value without project id SUFFIX
-   *  @param key
+   * @param key
+   * @deprecated
    */
-  getItemWithoutProjectID(key: string) {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] getItemWithoutProjectID > Error :' + e);
-      }
-      const newKey = prefix + key;
-      return this.getValueForKey(newKey);
-  }
+  // getItemWithoutProjectID(key: string) {
+  //     let prefix;
+  //     try {
+  //         // const sv = 'sv' + environment.shemaVersion + '_';
+  //         // prefix = prefix + sv;
+  //         prefix = this.storagePrefix + '_';
+  //     } catch (e) {
+  //         this.logger.error('[LocalSessionStorage] getItemWithoutProjectID > Error :' + e);
+  //     }
+  //     const newKey = prefix + key;
+  //     return this.getValueForKey(newKey);
+  // }
 
   /** SET new item in local/session storage without project id SUFFIX
    *  @param key
    *  @param value
    */
-  setItemWithoutProjectID(key: string, value: any): void {
-      this.removeItem(key);
-      let prefix = STORAGE_PREFIX;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] setItemWithoutProjectID > Error :' + e);
-      }
-      const newKey = prefix + key;
-      this.saveValueForKey(newKey, value);
-  }
+  // setItemWithoutProjectID(key: string, value: any): void {
+  //   this.removeItem(key);
+  //   let prefix = STORAGE_PREFIX;
+  //   try {
+  //     // const sv = 'sv' + environment.shemaVersion + '_';
+  //     // prefix = prefix + sv;
+  //     prefix = this.storagePrefix + '_';
+  //   } catch (e) {
+  //     this.logger.error('[LocalSessionStorage] setItemWithoutProjectID > Error :' + e);
+  //   }
+  //   const newKey = prefix + key;
+  //   this.saveValueForKey(newKey, value);
+  // }
 
   removeItem(key: string): void {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] removeItem > Error :' + e);
-      }
-      const newKey = prefix + this.projectID + '_' + key;
-      return this.removeItemForKey(newKey);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] removeItem > Error :' + e);
+    }
+    const newKey = prefix + this.projectID + '_' + key;
+    return this.removeItemForKey(newKey);
   }
 
   clear(): void {
-      let prefix;
-      try {
-          // const sv = 'sv' + environment.shemaVersion + '_';
-          // prefix = prefix + sv;
-          prefix = this.storagePrefix + '_';
-      } catch (e) {
-          this.logger.error('[LocalSessionStorage] clear > Error :' + e);
-      }
-      const prefixKey = prefix + this.projectID
-      const arrayKey: Array<string>  = [];
-      for (let i = 0; i < localStorage.length; i++) {
-        const key = localStorage.key(i);
-        if (key.indexOf(prefixKey) !== -1) {
-          arrayKey.push(key);
-        }
-      }
-  
-      for (let i = 0; i < arrayKey.length; i++) {
-        // localStorage.removeItem(arrayKey[i]);
-        this.removeItemForKey(arrayKey[i]);
+    let prefix;
+    try {
+      // const sv = 'sv' + environment.shemaVersion + '_';
+      // prefix = prefix + sv;
+      prefix = this.storagePrefix + '_';
+    } catch (e) {
+      this.logger.error('[LocalSessionStorage] clear > Error :' + e);
+    }
+    const prefixKey = prefix + this.projectID
+    const arrayKey: Array<string> = [];
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key.indexOf(prefixKey) !== -1) {
+        arrayKey.push(key);
       }
-  
+    }
+
+    for (let i = 0; i < arrayKey.length; i++) {
+      // localStorage.removeItem(arrayKey[i]);
+      this.removeItemForKey(arrayKey[i]);
+    }
+
   }
 
 
   // ---------- PRIVATE METHODS start --------------- //
 
   private getValueForKey(key) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.getItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.getItem(key);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.getItem(key);
+      } else {
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.getItem(key);
+      } else {
+        this.logger.warn('sessionStorage is not defind. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.getItem(key);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.getItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
       }
+    }
   }
 
   private saveValueForKey(key, value) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.setItem(key, value);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.setItem(key, value);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.setItem(key, value);
+      } else {
+        this.logger.warn('localStorage is not defined. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.setItem(key, value);
+      } else {
+        this.logger.warn('sessionStorage is not defined. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.setItem(key, value);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.setItem(key, value);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defined. Storage disabled');
+        return null;
       }
+    }
   }
 
   private removeItemForKey(key: string) {
-      if (this.persistence === 'local' || this.persistence === 'LOCAL') {
-        if (supports_html5_storage()) {
-          return localStorage.removeItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
-        if (supports_html5_session()) {
-          return sessionStorage.removeItem(key);
-        } else {
-          this.logger.warn('sessionStorage is not defind. Storage disabled');
-          return null;
-        }
-      } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+    if (this.persistence === 'local' || this.persistence === 'LOCAL') {
+      if (supports_html5_storage()) {
+        return localStorage.removeItem(key);
+      } else {
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
+      }
+    } else if (this.persistence === 'session' || this.persistence === 'SESSION') {
+      if (supports_html5_session()) {
+        return sessionStorage.removeItem(key);
+      } else {
+        this.logger.warn('sessionStorage is not defind. Storage disabled');
         return null;
+      }
+    } else if (this.persistence === 'none' || this.persistence === 'NONE') {
+      return null;
+    } else {
+      if (supports_html5_storage()) {
+        return localStorage.removeItem(key);
       } else {
-        if (supports_html5_storage()) {
-          return localStorage.removeItem(key);
-        } else {
-          this.logger.warn('localStorage is not defind. Storage disabled');
-          return null;
-        }
+        this.logger.warn('localStorage is not defind. Storage disabled');
+        return null;
       }
+    }
   }
 
 }

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

@@ -5,12 +5,16 @@ import { UserModel } from 'src/chat21-core/models/user';
 import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user';
 import { AppStorageService } from '../abstract/app-storage.service';
 import { LoggerInstance } from '../logger/loggerInstance';
+// import { BehaviorSubject } from 'rxjs';
+// import { EventsService } from 'src/app/services/events-service';
+
 
 @Injectable({
   providedIn: 'root'
 })
 export class TiledeskAuthService {
 
+  // public isOnline$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
   // private persistence: string;
   public SERVER_BASE_URL: string;
 
@@ -22,9 +26,12 @@ export class TiledeskAuthService {
   private tiledeskToken: string;
   private currentUser: UserModel;
   private logger: LoggerService = LoggerInstance.getInstance()
-  
-  constructor(public http: HttpClient,
-              public appStorage: AppStorageService) { }
+
+  constructor(
+    public http: HttpClient,
+    public appStorage: AppStorageService,
+    // private events: EventsService,
+    ) { }
 
 
   initialize(serverBaseUrl: string) {
@@ -57,7 +64,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -86,7 +94,8 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken);
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(that.tiledeskToken)
         }
       }, (error) => {
@@ -111,7 +120,9 @@ export class TiledeskAuthService {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
           that.createCompleteUser(data['user']);
-          that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+
+          // that.appStorage.setItem('tiledeskToken', that.tiledeskToken); // salvarlo esternamente nell'app.component
+          this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           resolve(this.currentUser)
         }
       }, (error) => {
@@ -120,10 +131,13 @@ export class TiledeskAuthService {
     });
   }
 
-  logOut(){
-    this.logger.debug('[TILEDESK-AUTH] logOut()')
+  logOut() {
+    this.logger.log('[TILEDESK-AUTH] - LOGOUT')
     this.appStorage.removeItem('tiledeskToken')
     this.appStorage.removeItem('currentUser')
+    this.setCurrentUser(null);
+    // this.isOnline$.next(false) 
+    
   }
 
 
@@ -149,13 +163,29 @@ export class TiledeskAuthService {
       member.fullname = fullname;
       member.avatar = avatar;
       member.color = color;
-      this.currentUser = member; 
-      this.logger.debug('[TILEDESK-AUTH] - createCompleteUser member ', member)
+      this.currentUser = member;
+      this.logger.log('[TILEDESK-AUTH] - createCompleteUser member ', member);
       this.appStorage.setItem('currentUser', JSON.stringify(this.currentUser));
+      // this.isOnline$.next(true) 
     } catch (err) {
-      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err) 
+      this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err)
+    }
+  }
+
+
+  private checkAndSetInStorageTiledeskToken(tiledeskToken) {
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken tiledeskToken from request', tiledeskToken)
+    const storedTiledeskToken = this.appStorage.getItem('tiledeskToken');
+    this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken storedTiledeskToken ', storedTiledeskToken)
+    if (!storedTiledeskToken) {
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken TOKEN DOES NOT EXIST - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken !== tiledeskToken) {
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST BUT IS != FROM TOKEN - RUN SET ')
+      this.appStorage.setItem('tiledeskToken', tiledeskToken);
+    } else if (storedTiledeskToken && storedTiledeskToken === tiledeskToken){
+      this.logger.log('[TILEDESK-AUTH] - checkAndSetInStorageTiledeskToken STORED-TOKEN EXIST AND IS = TO TOKEN ')
     }
-    
   }
 
 

package/src/chat21-core/utils/user-typing/user-typing.component.html

@@ -1,11 +1,6 @@
-
-
-  <!-- <div class="tile-last-activity"> -->
-    <!-- <span class="spinner active" id="tile-spinner">
-      <div class="bounce1"></div>
-      <div class="bounce2"></div>
-      <div class="bounce3"></div>
-      <span></span>
-    </span> -->
-    <div class="tile-typing-now" [class.active]="isTyping"><span *ngIf="nameUserTypingNow">{{nameUserTypingNow}} </span>{{ translationMap.get('LABEL_IS_WRITING') }}</div>
-  <!-- </div> -->
+<div class="tile-typing-now" [class.active]="isTyping">
+  <span *ngIf="nameUserTypingNow">
+    {{nameUserTypingNow}}
+  </span>
+  {{ translationMap?.get('LABEL_IS_WRITING') }}
+</div>

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

@@ -700,7 +700,7 @@ export function getParameterByName(name: string) {
 
 
 export async function presentModal(modalController, page, attributes) {
-  console.log('UTILS - presentModal');
+  // console.log('UTILS - presentModal');
   const modal: HTMLIonModalElement =
     await modalController.create({
       component: page,
@@ -711,7 +711,7 @@ export async function presentModal(modalController, page, attributes) {
   await modal.present();
   modal.onDidDismiss().then((detail: any) => {
     if (detail !== null) {
-      console.log('UTILS - presentModal - detail.data:', detail.data);
+      // console.log('UTILS - presentModal - detail.data:', detail.data);
       return 'CLOSE!!!!!';
     }
   });
@@ -719,7 +719,7 @@ export async function presentModal(modalController, page, attributes) {
 
 
 export async function closeModal(modalController: ModalController) {
-  console.log('UTILS - closeModal', modalController);
+  // console.log('UTILS - closeModal', modalController);
   await modalController.getTop();
   await modalController.dismiss({ confirmed: true });
   // try {

package/src/global.scss

@@ -571,3 +571,20 @@ select:-webkit-autofill:focus {
     line-height: 42px;
 }
 /* End rules for the member list refactoring in the "info-group.component.html" (replacement of ion-grid with ion-list) */
+.missing-connection-toast {
+    --background:#FDD764;
+    --color:#2e3939;
+    font-weight: 500;
+    font-size: 16px;
+}
+
+
+.missing-connection-toast::part(message) {
+    // display: none;
+    display: flex;
+    align-items: center;
+}
+
+
+  
+