@dapex-tech/elite-online-services 0.0.11 → 0.0.13

package/core/request.d.ts

@@ -1,3 +1,5 @@
+import type { AxiosResponse, AxiosInstance } from 'axios';
+import FormData from 'form-data';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 import { CancelablePromise } from './CancelablePromise';
@@ -8,23 +10,25 @@ export declare const isString: (value: any) => value is string;
 export declare const isStringWithValue: (value: any) => value is string;
 export declare const isBlob: (value: any) => value is Blob;
 export declare const isFormData: (value: any) => value is FormData;
+export declare const isSuccess: (status: number) => boolean;
 export declare const base64: (str: string) => string;
 export declare const getQueryString: (params: Record<string, any>) => string;
 export declare const getFormData: (options: ApiRequestOptions) => FormData | undefined;
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 export declare const resolve: <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>) => Promise<T | undefined>;
-export declare const getHeaders: (config: OpenAPIConfig, options: ApiRequestOptions) => Promise<Headers>;
+export declare const getHeaders: (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData) => Promise<Record<string, string>>;
 export declare const getRequestBody: (options: ApiRequestOptions) => any;
-export declare const sendRequest: (config: OpenAPIConfig, options: ApiRequestOptions, url: string, body: any, formData: FormData | undefined, headers: Headers, onCancel: OnCancel) => Promise<Response>;
-export declare const getResponseHeader: (response: Response, responseHeader?: string) => string | undefined;
-export declare const getResponseBody: (response: Response) => Promise<any>;
+export declare const sendRequest: <T>(config: OpenAPIConfig, options: ApiRequestOptions, url: string, body: any, formData: FormData | undefined, headers: Record<string, string>, onCancel: OnCancel, axiosClient: AxiosInstance) => Promise<AxiosResponse<T>>;
+export declare const getResponseHeader: (response: AxiosResponse<any>, responseHeader?: string) => string | undefined;
+export declare const getResponseBody: (response: AxiosResponse<any>) => any;
 export declare const catchErrorCodes: (options: ApiRequestOptions, result: ApiResult) => void;
 /**
  * Request method
  * @param config The OpenAPI configuration object
  * @param options The request options from the service
+ * @param axiosClient The axios client instance to use
  * @returns CancelablePromise<T>
  * @throws ApiError
  */
-export declare const request: <T>(config: OpenAPIConfig, options: ApiRequestOptions) => CancelablePromise<T>;
+export declare const request: <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient?: AxiosInstance) => CancelablePromise<T>;
 export {};

package/core/request.js

@@ -1,10 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.request = exports.catchErrorCodes = exports.getResponseBody = exports.getResponseHeader = exports.sendRequest = exports.getRequestBody = exports.getHeaders = exports.resolve = exports.getFormData = exports.getQueryString = exports.base64 = exports.isFormData = exports.isBlob = exports.isStringWithValue = exports.isString = exports.isDefined = void 0;
+exports.request = exports.catchErrorCodes = exports.getResponseBody = exports.getResponseHeader = exports.sendRequest = exports.getRequestBody = exports.getHeaders = exports.resolve = exports.getFormData = exports.getQueryString = exports.base64 = exports.isSuccess = exports.isFormData = exports.isBlob = exports.isStringWithValue = exports.isString = exports.isDefined = void 0;
 /* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+const axios_1 = __importDefault(require("axios"));
+const form_data_1 = __importDefault(require("form-data"));
 const ApiError_1 = require("./ApiError");
 const CancelablePromise_1 = require("./CancelablePromise");
 const isDefined = (value) => {
@@ -31,9 +36,13 @@ const isBlob = (value) => {
 };
 exports.isBlob = isBlob;
 const isFormData = (value) => {
-    return value instanceof FormData;
+    return value instanceof form_data_1.default;
 };
 exports.isFormData = isFormData;
+const isSuccess = (status) => {
+    return status >= 200 && status < 300;
+};
+exports.isSuccess = isSuccess;
 const base64 = (str) => {
     try {
         return btoa(str);
@@ -93,7 +102,7 @@ const getUrl = (config, options) => {
 };
 const getFormData = (options) => {
     if (options.formData) {
-        const formData = new FormData();
+        const formData = new form_data_1.default();
         const process = (key, value) => {
             if ((0, exports.isString)(value) || (0, exports.isBlob)(value)) {
                 formData.append(key, value);
@@ -124,17 +133,19 @@ const resolve = async (options, resolver) => {
     return resolver;
 };
 exports.resolve = resolve;
-const getHeaders = async (config, options) => {
+const getHeaders = async (config, options, formData) => {
     const [token, username, password, additionalHeaders] = await Promise.all([
         (0, exports.resolve)(options, config.TOKEN),
         (0, exports.resolve)(options, config.USERNAME),
         (0, exports.resolve)(options, config.PASSWORD),
         (0, exports.resolve)(options, config.HEADERS),
     ]);
+    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {};
     const headers = Object.entries({
         Accept: 'application/json',
         ...additionalHeaders,
         ...options.headers,
+        ...formHeaders,
     })
         .filter(([_, value]) => (0, exports.isDefined)(value))
         .reduce((headers, [key, value]) => ({
@@ -162,42 +173,46 @@ const getHeaders = async (config, options) => {
             headers['Content-Type'] = 'application/json';
         }
     }
-    return new Headers(headers);
+    return headers;
 };
 exports.getHeaders = getHeaders;
 const getRequestBody = (options) => {
-    if (options.body !== undefined) {
-        if (options.mediaType?.includes('/json')) {
-            return JSON.stringify(options.body);
-        }
-        else if ((0, exports.isString)(options.body) || (0, exports.isBlob)(options.body) || (0, exports.isFormData)(options.body)) {
-            return options.body;
-        }
-        else {
-            return JSON.stringify(options.body);
-        }
+    if (options.body) {
+        return options.body;
     }
     return undefined;
 };
 exports.getRequestBody = getRequestBody;
-const sendRequest = async (config, options, url, body, formData, headers, onCancel) => {
-    const controller = new AbortController();
-    const request = {
+const sendRequest = async (config, options, url, body, formData, headers, onCancel, axiosClient) => {
+    const source = axios_1.default.CancelToken.source();
+    const requestConfig = {
+        url,
         headers,
-        body: body ?? formData,
+        data: body ?? formData,
         method: options.method,
-        signal: controller.signal,
+        withCredentials: config.WITH_CREDENTIALS,
+        withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false,
+        cancelToken: source.token,
     };
-    if (config.WITH_CREDENTIALS) {
-        request.credentials = config.CREDENTIALS;
+    onCancel(() => source.cancel('The user aborted a request.'));
+    try {
+        return await axiosClient.request(requestConfig);
+    }
+    catch (error) {
+        const axiosError = error;
+        if (axiosError.response) {
+            if (axiosError.response.data) {
+                throw axiosError.response.data;
+            }
+            throw axiosError.response;
+        }
+        throw error;
     }
-    onCancel(() => controller.abort());
-    return await fetch(url, request);
 };
 exports.sendRequest = sendRequest;
 const getResponseHeader = (response, responseHeader) => {
     if (responseHeader) {
-        const content = response.headers.get(responseHeader);
+        const content = response.headers[responseHeader];
         if ((0, exports.isString)(content)) {
             return content;
         }
@@ -205,24 +220,9 @@ const getResponseHeader = (response, responseHeader) => {
     return undefined;
 };
 exports.getResponseHeader = getResponseHeader;
-const getResponseBody = async (response) => {
+const getResponseBody = (response) => {
     if (response.status !== 204) {
-        try {
-            const contentType = response.headers.get('Content-Type');
-            if (contentType) {
-                const jsonTypes = ['application/json', 'application/problem+json'];
-                const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
-                if (isJSON) {
-                    return await response.json();
-                }
-                else {
-                    return await response.text();
-                }
-            }
-        }
-        catch (error) {
-            console.error(error);
-        }
+        return response.data;
     }
     return undefined;
 };
@@ -261,23 +261,24 @@ exports.catchErrorCodes = catchErrorCodes;
  * Request method
  * @param config The OpenAPI configuration object
  * @param options The request options from the service
+ * @param axiosClient The axios client instance to use
  * @returns CancelablePromise<T>
  * @throws ApiError
  */
-const request = (config, options) => {
+const request = (config, options, axiosClient = axios_1.default) => {
     return new CancelablePromise_1.CancelablePromise(async (resolve, reject, onCancel) => {
         try {
             const url = getUrl(config, options);
             const formData = (0, exports.getFormData)(options);
             const body = (0, exports.getRequestBody)(options);
-            const headers = await (0, exports.getHeaders)(config, options);
+            const headers = await (0, exports.getHeaders)(config, options, formData);
             if (!onCancel.isCancelled) {
-                const response = await (0, exports.sendRequest)(config, options, url, body, formData, headers, onCancel);
-                const responseBody = await (0, exports.getResponseBody)(response);
+                const response = await (0, exports.sendRequest)(config, options, url, body, formData, headers, onCancel, axiosClient);
+                const responseBody = (0, exports.getResponseBody)(response);
                 const responseHeader = (0, exports.getResponseHeader)(response, options.responseHeader);
                 const result = {
                     url,
-                    ok: response.ok,
+                    ok: (0, exports.isSuccess)(response.status),
                     status: response.status,
                     statusText: response.statusText,
                     body: responseHeader ?? responseBody,

package/createClient.d.ts

@@ -15,5 +15,6 @@ export declare function createClient(baseUrl?: string): {
     DriverAuthService: typeof services.DriverAuthService;
     DriverTripsService: typeof services.DriverTripsService;
     DriversService: typeof services.DriversService;
+    HealthService: typeof services.HealthService;
     MainService: typeof services.MainService;
 };

package/models/AdminCreateDto.d.ts

@@ -0,0 +1,26 @@
+export type AdminCreateDto = {
+    /**
+     * Admin First Name
+     */
+    firstName: string;
+    /**
+     * Admin Last Name
+     */
+    lastName: string;
+    /**
+     * Admin Email
+     */
+    email: string;
+    /**
+     * Admin Password
+     */
+    password: string;
+    /**
+     * Admin Phone Country Code
+     */
+    phoneCountryCode?: string;
+    /**
+     * Admin Phone Number
+     */
+    phone?: string;
+};

package/models/AdminCreateDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/AdminDto.d.ts

@@ -23,16 +23,8 @@ export type AdminDto = {
      * Admin Email
      */
     email?: string;
-    /**
-     * Admin Password
-     */
-    password?: string;
     /**
      * Admin Role
      */
     role?: Record<string, any>;
-    /**
-     * Admin created at
-     */
-    createdAt?: string;
 };

package/models/AdminLoginResponseDto.d.ts

@@ -0,0 +1,38 @@
+export type AdminLoginResponseDto = {
+    /**
+     * Admin ID
+     */
+    id: number;
+    /**
+     * Admin First Name
+     */
+    firstName?: string;
+    /**
+     * Admin Last Name
+     */
+    lastName?: string;
+    /**
+     * Admin Phone Country Code
+     */
+    phoneCountryCode?: string;
+    /**
+     * Admin Phone Number
+     */
+    phone?: string;
+    /**
+     * Admin Email
+     */
+    email?: string;
+    /**
+     * Admin Role
+     */
+    role?: Record<string, any>;
+    /**
+     * Access Token
+     */
+    accessToken: string;
+    /**
+     * Refresh Token
+     */
+    refreshToken: string;
+};

package/models/AdminLoginResponseDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/AdminUpdateDto.d.ts

@@ -2,11 +2,11 @@ export type AdminUpdateDto = {
     /**
      * Admin First Name
      */
-    first_name?: string;
+    firstName?: string;
     /**
      * Admin Last Name
      */
-    last_name?: string;
+    lastName?: string;
     /**
      * Admin Phone Number
      */

package/models/CustomerDto.d.ts

@@ -15,52 +15,12 @@ export type CustomerDto = {
      * Customer Email
      */
     email: string;
-    /**
-     * User Password
-     */
-    password: string;
     /**
      * Customer Phone Country Code
      */
-    phoneCountryCode?: string;
+    phoneCountryCode: string;
     /**
      * Customer Phone Number
      */
-    phone?: string;
-    /**
-     * Customer Verified Status
-     */
-    isVerified?: boolean;
-    /**
-     * Customer Reset Code
-     */
-    resetCode?: string;
-    /**
-     * Customer Reset Expires At
-     */
-    resetExpiresAt?: string;
-    /**
-     * Customer Verification Code
-     */
-    verificationCode?: string;
-    /**
-     * Customer Verification Expires At
-     */
-    verificationExpiresAt?: string;
-    /**
-     * Customer FCM Token
-     */
-    fcmToken?: string;
-    /**
-     * Customer Created At
-     */
-    createdAt?: string;
-    /**
-     * Customer Updated At
-     */
-    updatedAt?: string;
-    /**
-     * Customer Deleted At
-     */
-    deletedAt?: string;
+    phone: string;
 };

package/models/CustomerLoginDto.d.ts

@@ -12,7 +12,7 @@ export type CustomerLoginDto = {
      */
     phoneCountryCode: string;
     /**
-     * Password must be at least 6 characters long
+     * Customer's Password, must be at least 6 characters long
      */
     password: string;
 };

package/models/CustomerLoginResponseDto.d.ts

@@ -0,0 +1,34 @@
+export type CustomerLoginResponseDto = {
+    /**
+     * User ID
+     */
+    id: number;
+    /**
+     * Customer First Name
+     */
+    firstName: string;
+    /**
+     * Customer Last Name
+     */
+    lastName: string;
+    /**
+     * Customer Email
+     */
+    email: string;
+    /**
+     * Customer Phone Country Code
+     */
+    phoneCountryCode: string;
+    /**
+     * Customer Phone Number
+     */
+    phone: string;
+    /**
+     * Access Token
+     */
+    accessToken: string;
+    /**
+     * Refresh Token
+     */
+    refreshToken: string;
+};

package/models/CustomerLoginResponseDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/CustomerRegisterDto.d.ts

@@ -0,0 +1,26 @@
+export type CustomerRegisterDto = {
+    /**
+     * Customer First Name
+     */
+    firstName: string;
+    /**
+     * Customer Last Name
+     */
+    lastName: string;
+    /**
+     * Customer Email
+     */
+    email?: string;
+    /**
+     * User Password
+     */
+    password: string;
+    /**
+     * Customer Phone Country Code
+     */
+    phoneCountryCode: string;
+    /**
+     * Customer Phone Number
+     */
+    phone: string;
+};

package/models/CustomerRegisterDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/DriverCreateDto.d.ts

@@ -0,0 +1,42 @@
+export type DriverCreateDto = {
+    /**
+     * Driver First Name
+     */
+    firstName: string;
+    /**
+     * Driver Last Name
+     */
+    lastName: string;
+    /**
+     * Driver Email
+     */
+    email: string;
+    /**
+     * Driver Password
+     */
+    password: string;
+    /**
+     * Driver License Number
+     */
+    license: string;
+    /**
+     * Driver Type (e.g., internal, external)
+     */
+    type: string;
+    /**
+     * Driver Phone Number
+     */
+    phone?: string;
+    /**
+     * Driver Status (active/inactive)
+     */
+    status?: boolean;
+    /**
+     * Last Location
+     */
+    lastLocation?: string;
+    /**
+     * Last Heartbeat
+     */
+    lastHeartbeat?: string;
+};

package/models/DriverCreateDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/DriverDto.d.ts

@@ -23,10 +23,6 @@ export type DriverDto = {
      * Driver Email
      */
     email: string;
-    /**
-     * Driver Password (6-20 characters)
-     */
-    password: string;
     /**
      * Driver License Number
      */

package/models/DriverLoginResponseDto.d.ts

@@ -0,0 +1,58 @@
+export type DriverLoginResponseDto = {
+    /**
+     * Admin ID
+     */
+    id: number;
+    /**
+     * Driver First Name
+     */
+    firstName: string;
+    /**
+     * Driver Last Name
+     */
+    lastName: string;
+    /**
+     * Driver Phone Country Code
+     */
+    phoneCountryCode?: string;
+    /**
+     * Driver Phone Number (10 digits)
+     */
+    phone?: string;
+    /**
+     * Driver Email
+     */
+    email: string;
+    /**
+     * Driver License Number
+     */
+    license: string;
+    /**
+     * Driver Type (e.g., internal, external)
+     */
+    type: string;
+    /**
+     * Driver Status (active/inactive)
+     */
+    status?: boolean;
+    /**
+     * Last Location
+     */
+    lastLocation?: string;
+    /**
+     * Last Heartbeat
+     */
+    lastHeartbeat?: string;
+    /**
+     * Driver Role
+     */
+    role?: Record<string, any>;
+    /**
+     * Access Token
+     */
+    accessToken: string;
+    /**
+     * Refresh Token
+     */
+    refreshToken: string;
+};

package/models/DriverLoginResponseDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/DriverTripActions.d.ts

@@ -6,5 +6,6 @@ export declare enum DriverTripActions {
     PAUSE = "pause",
     PAUSE_TRAFFIC = "pause-traffic",
     RESUME = "resume",
-    CANCEL = "cancel"
+    CANCEL = "cancel",
+    COMPLETE = "complete"
 }

package/models/DriverTripActions.js

@@ -15,4 +15,5 @@ var DriverTripActions;
     DriverTripActions["PAUSE_TRAFFIC"] = "pause-traffic";
     DriverTripActions["RESUME"] = "resume";
     DriverTripActions["CANCEL"] = "cancel";
+    DriverTripActions["COMPLETE"] = "complete";
 })(DriverTripActions || (exports.DriverTripActions = DriverTripActions = {}));

package/models/DriverUpdateDto.d.ts

@@ -39,12 +39,4 @@ export type DriverUpdateDto = {
      * Last Heartbeat
      */
     lastHeartbeat?: string;
-    /**
-     * Reset Code
-     */
-    resetCode?: Record<string, any> | null;
-    /**
-     * Reset Expires At
-     */
-    resetExpiresAt?: Record<string, any> | null;
 };

package/models/MessageResponseDto.d.ts

@@ -0,0 +1,6 @@
+export type MessageResponseDto = {
+    /**
+     * Message
+     */
+    message: string;
+};

package/models/MessageResponseDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/TokensDto.d.ts

@@ -0,0 +1,10 @@
+export type TokensDto = {
+    /**
+     * Access Token
+     */
+    accessToken: string;
+    /**
+     * Refresh Token
+     */
+    refreshToken: string;
+};

package/models/TokensDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });