@navservice/core 1.51.0 → 1.53.0

package/build/es/index.browser.js

@@ -5,7 +5,7 @@ class config_env {
         config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
     }
     static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
-        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL?.trim();
     }
 }
 const src_config_env = config_env;

package/build/es/utils/_api.d.ts

@@ -1,41 +1,16 @@
 import { AxiosResponse } from "axios";
-declare const _api: {
-    new (): {};
-    servidor_service_usuario: {
-        new (): {};
-        get "__#private@#axios"(): import("axios").AxiosInstance;
-        post({ url, data, setToken }: {
-            url: string;
-            data: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        get({ url, params, setToken }: {
-            url: string;
-            params?: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        patch({ url, data, setToken }: {
-            url: string;
-            data: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        delete({ url }: {
-            url: string;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-    };
-    headers({ setToken }: {
-        setToken?: boolean;
-    }): {
-        headers: {
-            Authorization: string;
-            "Content-type": string;
-        };
-    } | {
-        headers: {
-            "Content-type": string;
-            Authorization?: undefined;
-        };
-    };
-};
-export default _api;
+interface ApiClientOptions {
+    baseURL?: string;
+    withAuth?: boolean;
+}
+export default class api {
+    private axios;
+    private withAuth;
+    constructor({ baseURL, withAuth }: ApiClientOptions);
+    private set_bearer_token;
+    get<T = any>(url: string, params?: Record<string, any>): Promise<AxiosResponse<T>>;
+    post<T = any>(url: string, data?: any): Promise<AxiosResponse<T>>;
+    patch<T = any>(url: string, data?: any): Promise<AxiosResponse<T>>;
+    delete<T = any>(url: string): Promise<AxiosResponse<T>>;
+}
+export {};

package/build/es/utils/index.d.ts

@@ -1,44 +1,7 @@
+import _api from "./_api";
 import _form from "./_form";
 declare const utils: {
-    api: {
-        new (): {};
-        servidor_service_usuario: {
-            new (): {};
-            get "__#private@#axios"(): import("axios").AxiosInstance;
-            post({ url, data, setToken }: {
-                url: string;
-                data: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            get({ url, params, setToken }: {
-                url: string;
-                params?: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            patch({ url, data, setToken }: {
-                url: string;
-                data: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            delete({ url }: {
-                url: string;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-        };
-        headers({ setToken }: {
-            setToken?: boolean;
-        }): {
-            headers: {
-                Authorization: string;
-                "Content-type": string;
-            };
-        } | {
-            headers: {
-                "Content-type": string;
-                Authorization?: undefined;
-            };
-        };
-    };
+    api: typeof _api;
     data: {
         new (): {};
         YYYY_MM_DD_00_00_00(newData: string): string;

package/build/es/utils.js

@@ -1,15 +1,5 @@
 import axios from "axios";
 import { useLayoutEffect, useState } from "react";
-class config_env {
-    static SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    static init(config) {
-        config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    }
-    static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
-        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    }
-}
-const src_config_env = config_env;
 const _session_storage = class {
     static adicionar_item_session_storage({ chave, novoItem }) {
         try {
@@ -51,59 +41,53 @@ const _session_storage = class {
     }
 };
 const utils_session_storage = _session_storage;
-const _api_api = class _api {
-    static servidor_service_usuario = class {
-        static get #axios() {
-            return axios.create({
-                baseURL: src_config_env.PUBLIC_BASE_URL_BACKEND_PRINCIPAL
-            });
-        }
-        static async post({ url, data, setToken = true }) {
-            return await this.#axios.post(url, data, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async get({ url, params, setToken = true }) {
-            const queryParams = new URLSearchParams();
-            if (params) Object.entries(params).forEach(([key, value])=>{
-                console.log('13');
-                if (null != value) {
-                    console.log('14');
-                    queryParams.append(key, value);
-                    console.log('15');
-                }
-            });
-            const queryString = queryParams.toString();
-            const fullUrl = queryString ? `${url}?${queryString}` : url;
-            return await this.#axios.get(fullUrl, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async patch({ url, data, setToken = true }) {
-            return await this.#axios.patch(url, data, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async delete({ url }) {
-            return await this.#axios.delete(url);
-        }
-    };
-    static headers({ setToken = true }) {
-        const get_auth_user = utils_session_storage.get_item_session_storage("auth_user");
-        if (true === setToken) return {
+class config_env {
+    static SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+    static init(config) {
+        config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+    }
+    static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
+        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL?.trim();
+    }
+}
+const src_config_env = config_env;
+class api {
+    axios;
+    withAuth;
+    constructor({ baseURL, withAuth = true }){
+        this.withAuth = withAuth;
+        this.axios = axios.create({
+            baseURL: src_config_env.PUBLIC_BASE_URL_BACKEND_PRINCIPAL ?? baseURL,
             headers: {
-                Authorization: `Bearer ${get_auth_user?.data?.usuario?.token}`,
-                "Content-type": "application/json"
+                "Content-Type": "application/json"
             }
-        };
-        return {
-            headers: {
-                "Content-type": "application/json"
+        });
+        this.set_bearer_token();
+    }
+    set_bearer_token() {
+        this.axios.interceptors.request.use((config)=>{
+            if (this.withAuth) {
+                const auth = utils_session_storage.get_item_session_storage("auth_user");
+                if (auth?.data?.usuario?.token) config.headers.Authorization = `Bearer ${auth.data.usuario.token}`;
             }
-        };
+            return config;
+        });
     }
-};
-const utils_api = _api_api;
+    get(url, params) {
+        return this.axios.get(url, {
+            params
+        });
+    }
+    post(url, data) {
+        return this.axios.post(url, data);
+    }
+    patch(url, data) {
+        return this.axios.patch(url, data);
+    }
+    delete(url) {
+        return this.axios.delete(url);
+    }
+}
 const _data = class {
     static YYYY_MM_DD_00_00_00(newData) {
         let dataAtual = new Date();
@@ -521,7 +505,7 @@ class _hooks {
 }
 const utils_hooks = new _hooks;
 const utils = {
-    api: utils_api,
+    api: api,
     data: utils_data,
     form: utils_form,
     geral: _geral,

package/build/lib/index.browser.cjs

@@ -62,7 +62,7 @@ class config_env {
         config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
     }
     static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
-        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL?.trim();
     }
 }
 /* export default */ const src_config_env = (config_env);

package/build/lib/utils/_api.d.ts

@@ -1,41 +1,16 @@
 import { AxiosResponse } from "axios";
-declare const _api: {
-    new (): {};
-    servidor_service_usuario: {
-        new (): {};
-        get "__#private@#axios"(): import("axios").AxiosInstance;
-        post({ url, data, setToken }: {
-            url: string;
-            data: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        get({ url, params, setToken }: {
-            url: string;
-            params?: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        patch({ url, data, setToken }: {
-            url: string;
-            data: any;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-        delete({ url }: {
-            url: string;
-            setToken?: boolean;
-        }): Promise<AxiosResponse<any, any, {}>>;
-    };
-    headers({ setToken }: {
-        setToken?: boolean;
-    }): {
-        headers: {
-            Authorization: string;
-            "Content-type": string;
-        };
-    } | {
-        headers: {
-            "Content-type": string;
-            Authorization?: undefined;
-        };
-    };
-};
-export default _api;
+interface ApiClientOptions {
+    baseURL?: string;
+    withAuth?: boolean;
+}
+export default class api {
+    private axios;
+    private withAuth;
+    constructor({ baseURL, withAuth }: ApiClientOptions);
+    private set_bearer_token;
+    get<T = any>(url: string, params?: Record<string, any>): Promise<AxiosResponse<T>>;
+    post<T = any>(url: string, data?: any): Promise<AxiosResponse<T>>;
+    patch<T = any>(url: string, data?: any): Promise<AxiosResponse<T>>;
+    delete<T = any>(url: string): Promise<AxiosResponse<T>>;
+}
+export {};

package/build/lib/utils/index.d.ts

@@ -1,44 +1,7 @@
+import _api from "./_api";
 import _form from "./_form";
 declare const utils: {
-    api: {
-        new (): {};
-        servidor_service_usuario: {
-            new (): {};
-            get "__#private@#axios"(): import("axios").AxiosInstance;
-            post({ url, data, setToken }: {
-                url: string;
-                data: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            get({ url, params, setToken }: {
-                url: string;
-                params?: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            patch({ url, data, setToken }: {
-                url: string;
-                data: any;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-            delete({ url }: {
-                url: string;
-                setToken?: boolean;
-            }): Promise<import("axios").AxiosResponse<any, any, {}>>;
-        };
-        headers({ setToken }: {
-            setToken?: boolean;
-        }): {
-            headers: {
-                Authorization: string;
-                "Content-type": string;
-            };
-        } | {
-            headers: {
-                "Content-type": string;
-                Authorization?: undefined;
-            };
-        };
-    };
+    api: typeof _api;
     data: {
         new (): {};
         YYYY_MM_DD_00_00_00(newData: string): string;

package/build/lib/utils.cjs

@@ -57,18 +57,6 @@ __webpack_require__.d(__webpack_exports__, {
 ;// CONCATENATED MODULE: external "axios"
 const external_axios_namespaceObject = require("axios");
 var external_axios_default = /*#__PURE__*/__webpack_require__.n(external_axios_namespaceObject);
-;// CONCATENATED MODULE: ./src/config_env/index.ts
-class config_env {
-    static SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    static init(config) {
-        config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    }
-    static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
-        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
-    }
-}
-/* export default */ const src_config_env = (config_env);
-
 ;// CONCATENATED MODULE: ./src/utils/_session_storage.ts
 const _session_storage = class _session_storage {
     static adicionar_item_session_storage({ chave, novoItem }) {
@@ -112,68 +100,61 @@ const _session_storage = class _session_storage {
 };
 /* export default */ const utils_session_storage = (_session_storage);
 
+;// CONCATENATED MODULE: ./src/config_env/index.ts
+class config_env {
+    static SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+    static init(config) {
+        config_env.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL = config.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL;
+    }
+    static get PUBLIC_BASE_URL_BACKEND_PRINCIPAL() {
+        return this.SET_PUBLIC_BASE_URL_BACKEND_PRINCIPAL?.trim();
+    }
+}
+/* export default */ const src_config_env = (config_env);
+
 ;// CONCATENATED MODULE: ./src/utils/_api.ts
 
 
 
-const _api_api = class _api {
-    static servidor_service_usuario = class servidor_service_usuario {
-        static get #axios() {
-            return external_axios_default().create({
-                baseURL: src_config_env.PUBLIC_BASE_URL_BACKEND_PRINCIPAL
-            });
-        }
-        static async post({ url, data, setToken = true }) {
-            return await this.#axios.post(url, data, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async get({ url, params, setToken = true }) {
-            const queryParams = new URLSearchParams();
-            if (params) {
-                Object.entries(params).forEach(([key, value])=>{
-                    console.log('13');
-                    if (value !== null && value !== undefined) {
-                        console.log('14');
-                        queryParams.append(key, value);
-                        console.log('15');
-                    }
-                });
+class api {
+    axios;
+    withAuth;
+    constructor({ baseURL, withAuth = true }){
+        this.withAuth = withAuth;
+        this.axios = external_axios_default().create({
+            baseURL: src_config_env.PUBLIC_BASE_URL_BACKEND_PRINCIPAL ?? baseURL,
+            headers: {
+                "Content-Type": "application/json"
             }
-            const queryString = queryParams.toString();
-            const fullUrl = queryString ? `${url}?${queryString}` : url;
-            return await this.#axios.get(fullUrl, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async patch({ url, data, setToken = true }) {
-            return await this.#axios.patch(url, data, _api.headers({
-                setToken: setToken
-            }));
-        }
-        static async delete({ url }) {
-            return await this.#axios.delete(url);
-        }
-    };
-    static headers({ setToken = true }) {
-        const get_auth_user = utils_session_storage.get_item_session_storage("auth_user");
-        if (setToken === true) {
-            return {
-                headers: {
-                    Authorization: `Bearer ${get_auth_user?.data?.usuario?.token}`,
-                    "Content-type": "application/json"
-                }
-            };
-        } else {
-            return {
-                headers: {
-                    "Content-type": "application/json"
+        });
+        this.set_bearer_token();
+    }
+    set_bearer_token() {
+        this.axios.interceptors.request.use((config)=>{
+            if (this.withAuth) {
+                const auth = utils_session_storage.get_item_session_storage("auth_user");
+                if (auth?.data?.usuario?.token) {
+                    config.headers.Authorization = `Bearer ${auth.data.usuario.token}`;
                 }
-            };
-        }
+            }
+            return config;
+        });
     }
-};
-/* export default */ const utils_api = (_api_api);
+    get(url, params) {
+        return this.axios.get(url, {
+            params
+        });
+    }
+    post(url, data) {
+        return this.axios.post(url, data);
+    }
+    patch(url, data) {
+        return this.axios.patch(url, data);
+    }
+    delete(url) {
+        return this.axios.delete(url);
+    }
+}
 
 ;// CONCATENATED MODULE: ./src/utils/_data.ts
 const _data = class _data {
@@ -687,7 +668,7 @@ class _hooks {
 
 
 const utils = {
-    api: utils_api,
+    api: api,
     data: utils_data,
     form: utils_form,
     geral: _geral,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@navservice/core",
-    "version": "1.51.0",
+    "version": "1.53.0",
     "description": "Service core de todos os micro serviços",
     "type": "module",
     "exports": {