@chat21/chat21-ionic 3.4.29 → 3.4.30-rc2

package/src/chat21-core/providers/native/native-upload-service.ts

@@ -6,6 +6,7 @@ import { UploadModel } from '../../models/upload';
 import { AppStorageService } from '../abstract/app-storage.service';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
+import { first } from 'rxjs/operators';
 
 // @Injectable({ providedIn: 'root' })
 @Injectable()
@@ -14,8 +15,8 @@ export class NativeUploadService extends UploadService {
     BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null)
 
     private tiledeskToken: string;
-    private URL_TILEDESK_IMAGES: string;
     private URL_TILEDESK_FILE: string;
+    private URL_TILEDESK_UPLOAD: string;
     private logger: LoggerService = LoggerInstance.getInstance()
 
     constructor(
@@ -25,15 +26,17 @@ export class NativeUploadService extends UploadService {
         super();
     }
 
-    initialize(): void {
-        this.logger.info('[NATIVE UPLOAD] initialize')
-        this.URL_TILEDESK_FILE = this.getBaseUrl() + 'files'
-        this.URL_TILEDESK_IMAGES = this.getBaseUrl() + 'images'
+    initialize(projectId?: string): void {
+        this.logger.info('[NATIVE UPLOAD] initialize', this.getBaseUrl())
+        if (projectId) {
+            this.URL_TILEDESK_FILE = this.getBaseUrl() + projectId + '/files'
+        }
+        this.URL_TILEDESK_UPLOAD = this.getBaseUrl();
         this.tiledeskToken = this.appStorage.getItem('tiledeskToken')
     }
 
 
-    upload(userId: string, upload: UploadModel): Promise<{ downloadURL: string, src: string}>  {
+    upload(userId: string, upload: UploadModel): Promise<{downloadURL: string, src: string}>  {
         this.logger.log('[NATIVE UPLOAD] - upload new image/file ... upload', upload)
         const headers = new HttpHeaders({
             Authorization: this.tiledeskToken,
@@ -45,37 +48,93 @@ export class NativeUploadService extends UploadService {
 
         const that = this;
         if ((upload.file.type.startsWith('image') && (!upload.file.type.includes('svg')))) {
-            this.logger.log('[NATIVE UPLOAD] - upload new image')
             //USE IMAGE API
-            const url = this.URL_TILEDESK_IMAGES + '/users'
+            const url = this.URL_TILEDESK_UPLOAD + 'images/users'
             return new Promise((resolve, reject) => {
-                that.http.post(url, formData, requestOptions).subscribe(data => {
-                    const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
-                    resolve({downloadURL : downloadURL, src: downloadURL})
-                    // that.BSStateUpload.next({upload: upload});
-                }, (error) => {
-                    reject(error)
+                that.http.post(url, formData, requestOptions).pipe(first()).subscribe({
+                    next: (data) => {
+                        const downloadURL = this.URL_TILEDESK_UPLOAD + 'images?path=' + encodeURIComponent(data?.['filename']);
+                        resolve({downloadURL : downloadURL, src: downloadURL})
+                        // that.BSStateUpload.next({upload: upload});
+                    },
+                    error: (error) => {
+                        reject(error)
+                    }
                 });
             });
         } else {
-            this.logger.log('[NATIVE UPLOAD] - upload new file')
             //USE FILE API
-            const url = this.URL_TILEDESK_FILE + '/users'
+            const url = this.URL_TILEDESK_UPLOAD + 'files/users'
             return new Promise((resolve, reject) => {
-                that.http.post(url, formData, requestOptions).subscribe(data => {
-                    const src = this.URL_TILEDESK_FILE + '?path=' + encodeURI(data['filename']);
-                    const downloadURL = this.URL_TILEDESK_FILE + '/download' + '?path=' + encodeURI(data['filename']);
-                    resolve({downloadURL : downloadURL, src: src})
-                    // that.BSStateUpload.next({upload: upload});
-                }, (error) => {
-                    this.logger.error('[NATIVE UPLOAD] - ERROR upload new file ', error)
-                    reject(error)
+                that.http.post(url, formData, requestOptions).pipe(first()).subscribe({
+                    next: (data) => {
+                        const src = this.URL_TILEDESK_UPLOAD + 'files?path=' + encodeURIComponent(data['filename']);
+                        const downloadURL = this.URL_TILEDESK_UPLOAD + 'files/download' + '?path=' + encodeURIComponent(data['filename']);
+                        resolve({downloadURL : downloadURL, src: src})
+                        // that.BSStateUpload.next({upload: upload});
+                    }, 
+                    error: (error) => {
+                        this.logger.error('[NATIVE UPLOAD] - ERROR upload new file ', error)
+                        reject(error)
+                    }
                 });
             });
         }
         
     }
 
+    uploadFile(userId: string, upload: UploadModel): Promise<{downloadURL: string, src: string}>  {
+        this.logger.log('[NATIVE UPLOAD] - upload new image/file ... upload', upload)
+        const headers = new HttpHeaders({
+            Authorization: this.tiledeskToken,
+            //'Content-Type': 'multipart/form-data',
+        });
+        const requestOptions = { headers: headers };
+        const formData = new FormData();
+        formData.append('file', upload.file);
+
+        const that = this;
+        const url = this.URL_TILEDESK_FILE + '/chat'
+        return new Promise((resolve, reject) => {
+            that.http.post(url, formData, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    const src = this.URL_TILEDESK_UPLOAD + 'files?path=' + encodeURIComponent(data['filename']);
+                    const downloadURL = this.URL_TILEDESK_UPLOAD + 'files/download?path=' + encodeURIComponent(data['filename']);
+                    resolve({downloadURL : downloadURL, src: src})
+                },
+                error: (error) => {
+                    reject(error)
+                }
+            });
+        });    
+    }
+
+    uploadAsset(userId: string, upload: UploadModel, expiration: number = 60): Promise<{downloadURL: string, src: string}> {
+        this.logger.log('[NATIVE UPLOAD] - upload new asset ... upload', upload, 'expiration:', expiration)
+        const headers = new HttpHeaders({
+            Authorization: this.tiledeskToken,
+        });
+        const requestOptions = { headers: headers };
+        const formData = new FormData();
+        formData.append('file', upload.file);
+
+        const that = this;
+        const queryString = expiration !== undefined ? `?expiration=${encodeURIComponent(String(expiration))}` : ''
+        const url = this.URL_TILEDESK_FILE + `/assets${queryString}`
+        return new Promise((resolve, reject) => {
+            that.http.post(url, formData, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    const src = this.URL_TILEDESK_UPLOAD + 'files?path=' + data['filename'];
+                    const downloadURL = this.URL_TILEDESK_UPLOAD + 'files/download?path=' + encodeURIComponent(data['filename']);
+                    resolve({downloadURL : downloadURL, src: src})
+                },
+                error: (error) => {
+                    reject(error)
+                }
+            });
+        });
+    }
+
     uploadProfile(userId: string, upload: UploadModel): Promise<any> {
         this.logger.log('[NATIVE UPLOAD] - upload new photo profile  ... upload', upload)
         const headers = new HttpHeaders({
@@ -88,14 +147,18 @@ export class NativeUploadService extends UploadService {
 
         // USE IMAGE API
         const that = this;
-        const url = this.URL_TILEDESK_IMAGES + `/users/photo?force=true&user_id=${userId}`
+        const queryString = userId?.startsWith('bot_') ? `?bot_id=${encodeURIComponent(userId.substring('bot_'.length))}` : ''
+        const url = this.URL_TILEDESK_FILE + `/users/photo${queryString}`
         return new Promise((resolve, reject) => {
-            that.http.put(url, formData, requestOptions).subscribe(data => {
-                const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['thumbnail'];
-                resolve(downloadURL)
-                // that.BSStateUpload.next({upload: upload});
-            }, (error) => {
-                reject(error)
+            that.http.put(url, formData, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    const downloadURL = this.getBaseUrl() + 'files?path=' + data['thumbnail'];
+                    resolve(downloadURL)
+                    // that.BSStateUpload.next({upload: upload});
+                },
+                error: (error) => {
+                    reject(error)
+                }
             });
         });
     }
@@ -110,18 +173,50 @@ export class NativeUploadService extends UploadService {
 
         //USE IMAGE API
         const that = this;
-        const url = this.URL_TILEDESK_IMAGES + '/users' + '?path=' + path.split('path=')[1]
+        const url = this.URL_TILEDESK_UPLOAD + 'images/users' + '?path=' + path.split('path=')[1]
+        return new Promise((resolve, reject) => {
+            that.http.delete(url, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
+                    resolve(true)
+                    // that.BSStateUpload.next({upload: upload});
+                }, 
+                error: (error) => {
+                    reject(error)
+                }
+            });
+        });
+    }
+
+    deleteFile(userId: string, path: string): Promise<any>{
+        this.logger.log('[NATIVE UPLOAD] - delete image ... upload', userId)
+        const headers = new HttpHeaders({
+            Authorization: this.tiledeskToken,
+            //'Content-Type': 'multipart/form-data',
+        });
+        const requestOptions = { headers: headers };
+
+        //USE IMAGE API
+        const that = this;
+        const url = this.URL_TILEDESK_FILE + '?path=' + path.split('path=')[1]
         return new Promise((resolve, reject) => {
-            that.http.delete(url, requestOptions).subscribe(data => {
-                // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
-                resolve(true)
-                // that.BSStateUpload.next({upload: upload});
-            }, (error) => {
-                reject(error)
+            that.http.delete(url, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
+                    resolve(true)
+                    // that.BSStateUpload.next({upload: upload});
+                },
+                error: (error) => {
+                    reject(error)
+                }
             });
         });
     }
 
+    deleteAsset(userId: string, path: string): Promise<any>{
+        return this.deleteFile(userId, path);
+    }
+    
     deleteProfile(userId: string, path: string): Promise<any>{
         this.logger.log('[NATIVE UPLOAD] - delete image ... upload', userId)
         const headers = new HttpHeaders({
@@ -132,14 +227,17 @@ export class NativeUploadService extends UploadService {
 
         //USE IMAGE API
         const that = this;
-        const url = this.URL_TILEDESK_IMAGES + '/users' + '?path=' + "uploads/users/"+ userId + "/images/photo.jpg"
+        const url = this.URL_TILEDESK_FILE + '?path=' + "uploads/users/"+ userId + "/images/photo.jpg"
         return new Promise((resolve, reject) => {
-            that.http.delete(url, requestOptions).subscribe(data => {
-                // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
-                resolve(true)
-                // that.BSStateUpload.next({upload: upload});
-            }, (error) => {
-                reject(error)
+            that.http.delete(url, requestOptions).pipe(first()).subscribe({
+                next: (data) => {
+                    // const downloadURL = this.URL_TILEDESK_IMAGES + '?path=' + data['filename'];
+                    resolve(true)
+                    // that.BSStateUpload.next({upload: upload});
+                },
+                error: (error) => {
+                    reject(error)
+                }
             });
         });
     }

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

@@ -121,6 +121,7 @@ export class TiledeskAuthService {
       this.http.post(this.URL_TILEDESK_SIGNIN_WITH_CUSTOM_TOKEN, null, requestOptions).subscribe((data) => {
         if (data['success'] && data['token']) {
           that.tiledeskToken = data['token'];
+          data['user'].token = tiledeskToken; // mantengo il token custom nell'oggetto user
           that.createCompleteUser(data['user']);
           this.checkAndSetInStorageTiledeskToken(that.tiledeskToken)
           this.BS_IsONLINE.next(true)
@@ -177,6 +178,8 @@ export class TiledeskAuthService {
       this.currentUser = member;
       this.logger.log('[TILEDESK-AUTH] - createCompleteUser member ', member);
       this.appStorage.setItem('currentUser', JSON.stringify(this.currentUser));
+      const { iat, aud, iss, jti, ...cleanUser } = user; //destructuring and rest user object
+      localStorage.setItem('user', JSON.stringify(cleanUser));
 
     } catch (err) {
       this.logger.error('[TILEDESK-AUTH]- createCompleteUser ERR ', err)

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

@@ -765,6 +765,12 @@ export function isOnMobileDevice() {
   return IS_ON_MOBILE_DEVICE;
 }
 
+
+export function checkIfIsInIframe(){
+  const isInIframe = window.self !== window.top;
+  return isInIframe;
+}
+
 export function checkWindowWidthIsLessThan991px() {
   // console.log('UTILS - checkWindowWidthIsLessThan991px:: ', window.innerWidth);
   if (window.innerWidth < 991) {
@@ -1018,6 +1024,14 @@ export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
 }
 
 function extractUrls(text: string): string[] {
-  const urlRegex = /https?:\/\/[^\s]+/g;
-  return text.match(urlRegex) || [];
+  // Rileva URL con o senza protocollo (http/https)
+  const urlRegex = /\b((https?:\/\/)?(www\.)?[a-z0-9.-]+\.[a-z]{2,})(\/[^\s]*)?/gi;
+  const matches = text.match(urlRegex) || [];
+  // Normalizza: aggiunge https:// se manca, così il parsing con new URL() funziona
+  return matches.map((url) => {
+    if (!/^https?:\/\//i.test(url)) {
+      return 'https://' + url;
+    }
+    return url;
+  });
 }