@qlibs/utils 1.7.2 → 1.7.4

package/dist/utils/axios.d.ts

@@ -1,2 +1,8 @@
 import { AxiosInstance } from 'axios';
-export declare function injectAxiosInstance(axiosInstance: AxiosInstance, contentType: 'application/json' | 'multipart/form-data' | string, Modal: any): AxiosInstance;
+export declare function injectAxiosInstance(axiosInstance: AxiosInstance, headers: 'application/json' | 'multipart/form-data' | string | {
+    contentType: 'application/json' | 'multipart/form-data' | string;
+    'x-platform'?: 'cms' | 'web' | 'mobile';
+    'x-device-id': string;
+    'x-device-name': string;
+    'x-app-version': string;
+}, Modal: any): AxiosInstance;

package/dist/utils/axios.js

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectAxiosInstance = injectAxiosInstance;
 const auth_1 = require("./auth");
-function injectAxiosInstance(axiosInstance, contentType, Modal) {
+function injectAxiosInstance(axiosInstance, headers, Modal) {
     axiosInstance.interceptors.request.use(async (config) => {
-        config.headers['Content-Type'] = contentType || 'application/json';
+        config.headers['Content-Type'] = (typeof headers === 'object' ? headers.contentType : headers) || 'application/json';
+        config.headers['x-platform'] = headers['x-platform'] || 'cms';
+        config.headers['x-device-id'] = headers['x-device-id'];
+        config.headers['x-device-name'] = headers['x-device-name'];
+        config.headers['x-app-version'] = headers['x-app-version'];
         config.headers['Authorization'] = 'Bearer ' + (0, auth_1.getToken)();
         return config;
     }, (error) => {

package/dist/utils/image.d.ts

@@ -8,5 +8,5 @@ export declare function bytesToMB(sizeInBytes: number): number;
 export declare function isImage(file: File | Blob): any;
 export declare const getBase64: (file: File) => Promise<string>;
 export declare function fileListToBase64(fileList: any[]): Promise<string[]>;
-export declare function getFile(newFile: File | any): any;
+export declare function getFile(newFile: File | any, fileType?: 'image' | 'file'): any;
 export declare function isPhotoDataOK(item: any): boolean;

package/dist/utils/image.js

@@ -105,14 +105,22 @@ async function fileListToBase64(fileList) {
     }
     return (await Promise.all(promises));
 }
-function getFile(newFile) {
-    console.info('getFile - newFile instanceof File', newFile instanceof File);
-    if (isImage(newFile) && newFile.originFileObj) {
-        console.info('getFile - return (newFile as any).originFileObj');
+function getFile(newFile, fileType = 'image') {
+    console.info('getFile - newFile instanceof File', newFile instanceof File, fileType);
+    if (fileType === 'image' && isImage(newFile) && newFile.originFileObj) {
+        console.info('image - getFile - return (newFile as any).originFileObj');
         return newFile.originFileObj;
     }
-    else if (isImage(newFile) && newFile instanceof File) {
-        console.info('getFile - return newFile');
+    else if (fileType === 'image' && isImage(newFile) && newFile instanceof File) {
+        console.info('image - getFile - return newFile');
+        return newFile;
+    }
+    else if (fileType === 'file' && newFile.originFileObj) {
+        console.info('file - getFile - return (newFile as any).originFileObj');
+        return newFile.originFileObj;
+    }
+    else if (fileType === 'file' && newFile instanceof File) {
+        console.info('file - getFile - return newFile');
         return newFile;
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlibs/utils",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "",
   "author": "QBIT Developer",
   "license": "MIT",