eco-vue-js 0.11.32 → 0.11.34

package/dist/utils/ApiClient.js

@@ -1,6 +1,4 @@
 import { ref } from 'vue';
-import _sfc_main from '../components/Auth/WRouteAuth.vue.js';
-import _sfc_main$1 from '../components/Auth/WRouteAuthNo.vue.js';
 import { removeExpirationDate, getLastRefreshPromise, setRefreshTimestamp, removeRefreshTimestamp, checkExpirationDate, setExpirationDate } from '../components/Auth/utils/utils.js';
 export { updateExpirationDate } from '../components/Auth/utils/utils.js';
 import { encodeQueryParams, ApiError, ApiErrorCancel } from './api.js';
@@ -18,20 +16,20 @@ const HEADERS_FORMDATA = {
 class ApiClientInstance {
   constructor(config) {
     this.config = config;
+    window.addEventListener("storage", this.checkAuth);
+    this.useAuth = () => {
+      return this.auth;
+    };
   }
   refreshPromise = null;
-  isAuthFailed = ref(false);
-  get routeNameAuth() {
-    return this.config.routeNameAuth;
-  }
-  get routeNameAuthNo() {
-    return this.config.routeNameAuthNo;
-  }
+  auth = ref(true);
+  useAuth;
   setOnFailure(value) {
     this.config.onFailure = value;
   }
   logout() {
     removeExpirationDate();
+    this.auth.value = false;
   }
   async retry(request) {
     const newRequest = request.clone();
@@ -48,14 +46,14 @@ class ApiClientInstance {
       if (refreshTimeoutPromise) {
         this.refreshPromise = refreshTimeoutPromise.then(() => {
           this.refreshPromise = null;
-          this.isAuthFailed.value = false;
+          this.auth.value = true;
         }).catch(async () => {
           this.refreshPromise = null;
           const check = this.checkAuth();
           if (!check) {
             if (this.refreshPromise) return this.refreshPromise;
             if (check === null) {
-              this.isAuthFailed.value = true;
+              this.auth.value = false;
               return Promise.reject();
             }
             return this.refresh();
@@ -66,9 +64,10 @@ class ApiClientInstance {
         const promise = this.config.tokenRefresh ? this.config.tokenRefresh() : this.fetch("GET", this.config.refreshUrl, { updateToken: true });
         this.refreshPromise = promise.then(() => {
           this.refreshPromise = null;
+          this.auth.value = true;
         }).catch((error) => {
           this.refreshPromise = null;
-          this.isAuthFailed.value = true;
+          this.auth.value = false;
           return Promise.reject(error);
         }).finally(removeRefreshTimestamp);
       }
@@ -79,7 +78,7 @@ class ApiClientInstance {
     let result;
     if (this.config.tokenGetter && !this.config.tokenRefresh) result = !!this.config.tokenGetter?.();
     else result = checkExpirationDate();
-    if (result) this.isAuthFailed.value = false;
+    if (result !== false) this.auth.value = result !== null;
     return result;
   }
   fetch(method, url, config, baseUrl) {
@@ -91,7 +90,7 @@ class ApiClientInstance {
         if (!check) {
           if (check !== null && (this.config.refreshUrl || this.config.tokenRefresh)) await this.refresh();
           if (!this.checkAuth()) {
-            this.isAuthFailed.value = true;
+            this.auth.value = false;
             reject();
             return;
           }
@@ -100,6 +99,7 @@ class ApiClientInstance {
           const token = this.config.tokenGetter();
           if (token) headers.append("Authorization", "Bearer " + token);
           else {
+            this.auth.value = false;
             reject();
             return;
           }
@@ -132,7 +132,7 @@ class ApiClientInstance {
           } else {
             if (response.status === 401) {
               if (this.config.refreshUrl || this.config.tokenRefresh) return this.refresh().then(() => this.retry(request));
-              this.isAuthFailed.value = true;
+              this.auth.value = false;
             }
             this.config.onFailure?.(response);
             reject(new ApiError({
@@ -172,47 +172,6 @@ class ApiClientInstance {
   delete(url, config) {
     return this.fetch("DELETE", url, config);
   }
-  getRouteAuth() {
-    return {
-      path: "",
-      props: { apiClientInstance: this },
-      component: _sfc_main,
-      beforeEnter: async (to) => {
-        if (to.meta.noAuth) return;
-        if (this.refreshPromise) await this.refreshPromise;
-        if (!this.checkAuth()) {
-          if (this.config.refreshUrl || this.config.tokenRefresh) return this.refresh().catch(() => ({
-            name: this.routeNameAuthNo,
-            query: to.fullPath !== "/" ? { hash: to.fullPath } : void 0
-          }));
-          return { name: this.routeNameAuthNo, query: to.fullPath !== "/" ? { hash: to.fullPath } : void 0 };
-        }
-      },
-      meta: {
-        noAuth: false
-      }
-    };
-  }
-  getRouteAuthNo() {
-    return {
-      path: "",
-      props: { apiClientInstance: this },
-      component: _sfc_main$1,
-      beforeEnter: (to, from) => {
-        if (!this.checkAuth()) {
-          if (!to.query.hash && !from.meta.noAuth && from.fullPath !== "/") {
-            return { ...to, query: { hash: from.fullPath } };
-          }
-          return;
-        }
-        if (typeof to.query.hash === "string") return to.query.hash;
-        else return { name: this.routeNameAuth };
-      },
-      meta: {
-        noAuth: true
-      }
-    };
-  }
   addInstance(baseUrl) {
     return {
       baseUrl,

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/rsmple/eco-vue-js.git"
   },
-  "version": "0.11.32",
+  "version": "0.11.34",
   "dependencies": {
     "@stylistic/eslint-plugin": "5.2.3",
     "@tanstack/eslint-plugin-query": "5.83.1",
@@ -123,12 +123,6 @@
     "./dist/components/ActionsBar/WActionsBarFilter.vue": {
       "import": "./dist/components/ActionsBar/WActionsBarFilter.vue.js"
     },
-    "./dist/components/Auth/WRouteAuth.vue": {
-      "import": "./dist/components/Auth/WRouteAuth.vue.js"
-    },
-    "./dist/components/Auth/WRouteAuthNo.vue": {
-      "import": "./dist/components/Auth/WRouteAuthNo.vue.js"
-    },
     "./dist/components/BottomSheet/WBottomSheet.vue": {
       "import": "./dist/components/BottomSheet/WBottomSheet.vue.js"
     },

package/dist/components/Auth/WRouteAuth.vue.d.ts

@@ -1,22 +0,0 @@
-import { ApiClientInstance } from '../../utils/ApiClient';
-type __VLS_Props = {
-    apiClientInstance: ApiClientInstance;
-};
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
-    };
-    refs: {};
-    rootEl: any;
-};
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};
-//# sourceMappingURL=WRouteAuth.vue.d.ts.map

package/dist/components/Auth/WRouteAuth.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WRouteAuth.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Auth/WRouteAuth.vue"],"names":[],"mappings":"AAQA;AAgEA,OAAO,EAAC,KAAK,iBAAiB,EAAC,MAAM,mBAAmB,CAAA;AAExD,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,iBAAiB,CAAA;CACrC,CAAC;AAyCF,iBAAS,cAAc;WA8BT,OAAO,IAA6B;;yBAVrB,GAAG;;;;EAe/B;AASD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe,kSAMnB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAQpG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}

package/dist/components/Auth/WRouteAuth.vue.js

@@ -1,44 +0,0 @@
-import { defineComponent, resolveComponent, watch, onBeforeUnmount, createBlock, renderSlot, unref, openBlock, resolveDynamicComponent } from 'vue';
-import { useOptionalRouter, useOptionalRoute } from '../../composables/useOptionalRouter.js';
-import '@tanstack/vue-query';
-
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "WRouteAuth",
-  props: {
-    apiClientInstance: {}
-  },
-  setup(__props) {
-    const props = __props;
-    let RouterViewComponent = null;
-    try {
-      RouterViewComponent = resolveComponent("RouterView");
-    } catch {
-      RouterViewComponent = null;
-    }
-    const router = useOptionalRouter();
-    const route = useOptionalRoute();
-    const redirect = () => {
-      router.push({ name: props.apiClientInstance.routeNameAuthNo, query: route.fullPath !== "/" ? { hash: route.fullPath } : void 0 });
-    };
-    const checkAuth = () => {
-      if (props.apiClientInstance.checkAuth()) return;
-      {
-        if (props.apiClientInstance.refreshPromise) {
-          redirect();
-        }
-      }
-    };
-    watch(() => props.apiClientInstance.isAuthFailed.value, (value) => {
-      if (value) redirect();
-    });
-    window.addEventListener("storage", checkAuth);
-    onBeforeUnmount(() => {
-      window.removeEventListener("storage", checkAuth);
-    });
-    return (_ctx, _cache) => {
-      return unref(RouterViewComponent) ? (openBlock(), createBlock(resolveDynamicComponent(unref(RouterViewComponent)), { key: 0 })) : renderSlot(_ctx.$slots, "default", { key: 1 });
-    };
-  }
-});
-
-export { _sfc_main as default };

package/dist/components/Auth/WRouteAuth.vue2.js

@@ -1,5 +0,0 @@
-import _sfc_main from './WRouteAuth.vue.js';
-
-
-
-export { _sfc_main as default };

package/dist/components/Auth/WRouteAuthNo.vue.d.ts

@@ -1,22 +0,0 @@
-import { ApiClientInstance } from '../../utils/ApiClient';
-type __VLS_Props = {
-    apiClientInstance: ApiClientInstance;
-};
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: {
-        default?(_: {}): any;
-    };
-    refs: {};
-    rootEl: any;
-};
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};
-//# sourceMappingURL=WRouteAuthNo.vue.d.ts.map

package/dist/components/Auth/WRouteAuthNo.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WRouteAuthNo.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Auth/WRouteAuthNo.vue"],"names":[],"mappings":"AAQA;AA2EA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAA;AAexD,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,iBAAiB,CAAA;CACrC,CAAC;AAiDF,iBAAS,cAAc;WA8BT,OAAO,IAA6B;;yBAVrB,GAAG;;;;EAe/B;AASD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe,kSAMnB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAQpG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}

package/dist/components/Auth/WRouteAuthNo.vue.js

@@ -1,56 +0,0 @@
-import { defineComponent, resolveComponent, ref, watch, onBeforeMount, onBeforeUnmount, createBlock, renderSlot, unref, openBlock, resolveDynamicComponent } from 'vue';
-import { useQueryClient } from '@tanstack/vue-query';
-import { useOptionalRouter, useOptionalRoute } from '../../composables/useOptionalRouter.js';
-
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "WRouteAuthNo",
-  props: {
-    apiClientInstance: {}
-  },
-  setup(__props) {
-    let RouterViewComponent = null;
-    try {
-      RouterViewComponent = resolveComponent("RouterView");
-    } catch {
-      RouterViewComponent = null;
-    }
-    const props = __props;
-    const router = useOptionalRouter();
-    const route = useOptionalRoute();
-    const queryClient = useQueryClient();
-    const queryEnabled = ref(false);
-    const redirect = async () => {
-      if (typeof route.query.hash === "string" && route.query.hash && route.query.hash !== "/") {
-        const resolved = router.resolve(route.query.hash);
-        if (!resolved.matched.length) {
-          await router.replace({ name: props.apiClientInstance.routeNameAuth });
-        } else {
-          await router.replace(resolved);
-        }
-      } else {
-        await router.replace({ name: props.apiClientInstance.routeNameAuth });
-      }
-    };
-    const checkLogin = () => {
-      if (!props.apiClientInstance.checkAuth()) return;
-      redirect();
-    };
-    watch(() => props.apiClientInstance.isAuthFailed.value, (value) => {
-      if (value) return;
-      redirect();
-    });
-    onBeforeMount(() => {
-      window.addEventListener("storage", checkLogin);
-      queryClient.clear();
-      queryEnabled.value = true;
-    });
-    onBeforeUnmount(() => {
-      window.removeEventListener("storage", checkLogin);
-    });
-    return (_ctx, _cache) => {
-      return unref(RouterViewComponent) ? (openBlock(), createBlock(resolveDynamicComponent(unref(RouterViewComponent)), { key: 0 })) : renderSlot(_ctx.$slots, "default", { key: 1 });
-    };
-  }
-});
-
-export { _sfc_main as default };

package/dist/components/Auth/WRouteAuthNo.vue2.js

@@ -1,5 +0,0 @@
-import _sfc_main from './WRouteAuthNo.vue.js';
-
-
-
-export { _sfc_main as default };