meemup-library 1.5.78 → 1.5.79

package/dist/controllers/ApiController.d.ts

@@ -11,8 +11,8 @@ export default class ApiController {
         deviceIdentifier: string;
     }>;
     fetchRequest(url: string, method: string, body?: any, headers?: object, authorization?: boolean, timeout?: number): Promise<IAnswer>;
-    fetchSuccess(response: any): IAnswer;
-    fetchError(error: any, message?: string): IAnswer;
+    fetchSuccess(response: any, status: number): IAnswer;
+    fetchError(error: any, message: string | undefined, status: number): IAnswer;
     patchWithAuth: (url: string, body?: any, headers?: any) => Promise<IAnswer>;
     postWithAuth: (url: string, body?: any, headers?: any) => Promise<IAnswer>;
     putWithAuth: (url: string, body: any, headers?: any) => Promise<IAnswer>;

package/dist/controllers/ApiController.js

@@ -7,119 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-// import axios, {AxiosError, AxiosInstance, AxiosResponse} from "axios";
-// export default class ApiController {
-//
-//
-//     account: IAccount | IDriverAccount;
-//
-//     constructor(account: IAccount | IDriverAccount) {
-//         this.account = account;
-//     }
-//
-//     async defaultHeader(authorization: boolean = true) {
-//
-//         return {
-//             companyId: this.getCompanyId(),
-//             ...authorization ? {Authorization: "Bearer " + this.account.token} : {}
-//         };
-//     }
-//
-//     async createInstance(header: object = {}, authorization: boolean = true, timeout: number = 15000) {
-//
-//         let data: any = await this.defaultHeader(authorization);
-//
-//         return axios.create({
-//             withCredentials: true,
-//             timeout: timeout,
-//             headers: {
-//                 ...data,
-//                 ...header
-//             }
-//         });
-//
-//     }
-//
-//     fetchSuccess(response: AxiosResponse, init: any = {}): IAnswer {
-//         if (response.status === 200) {
-//             if (response.data.success === true) {
-//                 return response.data;
-//             }
-//             if (response.data.message === "company not found") {
-//                 //TODO need fix
-//                 return response.data;
-//             }
-//         } else if (response.status === 401) {
-//             //TODO need fix
-//             return response.data;
-//             // window.location.replace(rootPath.signIn);
-//         }
-//         return {
-//             ...response.data,
-//             data: init
-//         };
-//     }
-//
-//     fetchError(error: AxiosError, initMessage = null): IAnswer {
-//
-//
-//         // console.log("error : ", error);
-//
-//         const message = error.message === "Network Error" ? "Please check your internet connection!" : error.message;
-//
-//
-//         return {
-//             success: false,
-//             data: null,
-//             exception: initMessage ? initMessage : message,
-//             message: initMessage ? initMessage : message
-//         };
-//     }
-//
-//     async postWithAuth(url: string, body: any = {}, header: any = {}): Promise<IAnswer> {
-//         // console.log("POST");
-//         const ax: any = await this.createInstance(header, true);
-//
-//         return ax.post(url, body).then(this.fetchSuccess).catch(this.fetchError);
-//
-//     }
-//
-//     async putWithAuth(url: string, body: any, header: any = {}): Promise<IAnswer> {
-//         // console.log("PUT");
-//         const ax: any = await this.createInstance(header, true, 8000);
-//         return ax.put(url, body).then(this.fetchSuccess).catch(this.fetchError);
-//     }
-//
-//     async getWithAuth(url: string, header: any = {}): Promise<IAnswer> {
-//         // console.log("GET");
-//         const ax: AxiosInstance = await this.createInstance(header, true);
-//         return ax.get(url).then(this.fetchSuccess).catch(this.fetchError);
-//
-//     }
-//
-//     async get(url: string, header: any = {}): Promise<IAnswer> {
-//         // console.log("GET");
-//         const ax: any = await this.createInstance(header, false);
-//         return ax.get(url).then(this.fetchSuccess).catch(this.fetchError);
-//     }
-//
-//     async deleteWithAuth(url: string, header: any = {}): Promise<IAnswer> {
-//         // console.log("DELETE");
-//         const ax: any = await this.createInstance(header, true);
-//         return ax.delete(url).then(this.fetchSuccess).catch(this.fetchError);
-//     }
-//
-//     private getCompanyId = (): string => {
-//
-//         const account: any = {...this.account};
-//
-//         if (account.companyId)
-//             return account.companyId + "";
-//
-//         return account.company.id + "";
-//     }
-//
-// }
 export default class ApiController {
     constructor(account) {
         this.account = account;
@@ -161,30 +48,31 @@ export default class ApiController {
                 clearTimeout(timeoutId);
                 const data = yield response.json();
                 if (response.ok) {
-                    return this.fetchSuccess(data);
+                    return this.fetchSuccess(data, response.status);
                 }
                 else {
-                    return this.fetchError(data, response.statusText);
+                    return this.fetchError(data, response.statusText, response.status);
                 }
             }
             catch (error) {
                 clearTimeout(timeoutId);
-                return this.fetchError(error, "Network Error");
+                return this.fetchError(error, "Network Error", -1);
             }
         });
     }
-    fetchSuccess(response) {
+    fetchSuccess(response, status) {
         if (response.success) {
-            return response;
+            return Object.assign(Object.assign({}, response), { status });
         }
-        return Object.assign(Object.assign({}, response), { data: null });
+        return Object.assign(Object.assign({}, response), { data: null, status });
     }
-    fetchError(error, message = "Unknown Error") {
+    fetchError(error, message = "Unknown Error", status) {
         return {
             success: false,
             data: null,
             exception: (error === null || error === void 0 ? void 0 : error.message) || message,
-            message: (error === null || error === void 0 ? void 0 : error.message) || message
+            message: (error === null || error === void 0 ? void 0 : error.message) || message,
+            status
         };
     }
 }

package/dist/interfaces/IAnswer.d.ts

@@ -3,6 +3,7 @@ interface IAnswer {
     exception: string | null;
     message: string;
     success: boolean;
+    status?: number;
 }
 export declare const initAnswer: IAnswer;
 export declare const initArrayAnswer: IAnswer;

package/dist/interfaces/IAnswer.js

@@ -2,6 +2,7 @@ export const initAnswer = {
     data: null,
     message: "",
     success: false,
-    exception: null
+    exception: null,
+    status: 200,
 };
 export const initArrayAnswer = Object.assign(Object.assign({}, initAnswer), { data: [] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meemup-library",
-  "version": "1.5.78",
+  "version": "1.5.79",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "remove:one": "rimraf dist",
     "remove:two": "rimraf ./src/dist",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "commit": "git add . && git commit -m \"version.1.5.78\" && git push origin "
+    "commit": "git add . && git commit -m \"version.1.5.79\" && git push origin "
   },
   "files": [
     "/dist"
@@ -26,4 +26,4 @@
   "dependencies": {
     "dayjs": "^1.11.13"
   }
-}
+}