@enfyra/sdk-nuxt 0.3.22 → 0.3.24

package/dist/module.cjs

@@ -61,8 +61,8 @@ enfyraSDK: {
     }
     kit.addImports([
       {
-        name: "useEnfyraApi",
-        from: resolve("./runtime/composables/useEnfyraApi")
+        name: "useEnfyra",
+        from: resolve("./runtime/composables/useEnfyra")
       },
       {
         name: "useEnfyraAuth",
@@ -72,18 +72,13 @@ enfyraSDK: {
     kit.addTypeTemplate({
       filename: "types/enfyra-sdk.d.ts",
       getContents: () => `
-import type { ApiOptions, UseEnfyraApiSSRReturn, UseEnfyraApiClientReturn } from '@enfyra/sdk-nuxt/types'
-
 declare module '#imports' {
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts: ApiOptions<T> & { ssr: true }
-  ): UseEnfyraApiSSRReturn<T>
+  export interface UseEnfyraReturn {
+    baseUrl: string;
+    apiPrefix: string;
+  }
 
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts?: ApiOptions<T> & { ssr?: false | undefined }
-  ): UseEnfyraApiClientReturn<T>
+  export function useEnfyra(): UseEnfyraReturn
 
   export function useEnfyraAuth(): import('@enfyra/sdk-nuxt/types').UseEnfyraAuthReturn
 }

package/dist/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;AAED,wBAkIG"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;AAED,wBA6HG"}

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "0.3.22",
+  "version": "0.3.24",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -58,8 +58,8 @@ enfyraSDK: {
     }
     addImports([
       {
-        name: "useEnfyraApi",
-        from: resolve("./runtime/composables/useEnfyraApi")
+        name: "useEnfyra",
+        from: resolve("./runtime/composables/useEnfyra")
       },
       {
         name: "useEnfyraAuth",
@@ -69,18 +69,13 @@ enfyraSDK: {
     addTypeTemplate({
       filename: "types/enfyra-sdk.d.ts",
       getContents: () => `
-import type { ApiOptions, UseEnfyraApiSSRReturn, UseEnfyraApiClientReturn } from '@enfyra/sdk-nuxt/types'
-
 declare module '#imports' {
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts: ApiOptions<T> & { ssr: true }
-  ): UseEnfyraApiSSRReturn<T>
+  export interface UseEnfyraReturn {
+    baseUrl: string;
+    apiPrefix: string;
+  }
 
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts?: ApiOptions<T> & { ssr?: false | undefined }
-  ): UseEnfyraApiClientReturn<T>
+  export function useEnfyra(): UseEnfyraReturn
 
   export function useEnfyraAuth(): import('@enfyra/sdk-nuxt/types').UseEnfyraAuthReturn
 }

package/dist/runtime/composables/useEnfyra.d.ts

@@ -0,0 +1,6 @@
+export interface UseEnfyraReturn {
+    baseUrl: string;
+    apiPrefix: string;
+}
+export declare function useEnfyra(): UseEnfyraReturn;
+//# sourceMappingURL=useEnfyra.d.ts.map

package/dist/runtime/composables/useEnfyra.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useEnfyra.d.ts","sourceRoot":"","sources":["../../../src/runtime/composables/useEnfyra.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,SAAS,IAAI,eAAe,CAU3C"}

package/dist/runtime/composables/useEnfyra.js

@@ -0,0 +1,13 @@
+import { useRuntimeConfig } from "#imports";
+import { getAppUrl, normalizeUrl } from "../utils/url.js";
+import { ENFYRA_API_PREFIX } from "../constants/config.js";
+export function useEnfyra() {
+  const config = useRuntimeConfig().public.enfyraSDK;
+  const appUrl = getAppUrl();
+  const apiPrefix = config?.apiPrefix || ENFYRA_API_PREFIX;
+  const baseUrl = normalizeUrl(appUrl, apiPrefix);
+  return {
+    baseUrl,
+    apiPrefix
+  };
+}

package/dist/runtime/composables/useEnfyraAuth.d.ts

@@ -1,89 +1,3 @@
-import type { LoginPayload, User } from "../../types/auth";
-export declare function useEnfyraAuth(): {
-    readonly me: import("vue").Ref<{
-        id: string;
-        email: string;
-        isRootAdmin: boolean;
-        isSystem: boolean;
-        role?: {
-            id: string;
-            name: string;
-            routePermissions: {
-                id: string;
-                isEnabled: boolean;
-                allowedUsers?: {
-                    id: string;
-                }[] | undefined;
-                methods: {
-                    id: string;
-                    method: string;
-                }[];
-                route: {
-                    id: string;
-                    path: string;
-                };
-            }[];
-        } | undefined;
-        allowedRoutePermissions?: {
-            id: string;
-            isEnabled: boolean;
-            allowedUsers?: {
-                id: string;
-            }[] | undefined;
-            methods: {
-                id: string;
-                method: string;
-            }[];
-            route: {
-                id: string;
-                path: string;
-            };
-        }[] | undefined;
-    } | null, User | {
-        id: string;
-        email: string;
-        isRootAdmin: boolean;
-        isSystem: boolean;
-        role?: {
-            id: string;
-            name: string;
-            routePermissions: {
-                id: string;
-                isEnabled: boolean;
-                allowedUsers?: {
-                    id: string;
-                }[] | undefined;
-                methods: {
-                    id: string;
-                    method: string;
-                }[];
-                route: {
-                    id: string;
-                    path: string;
-                };
-            }[];
-        } | undefined;
-        allowedRoutePermissions?: {
-            id: string;
-            isEnabled: boolean;
-            allowedUsers?: {
-                id: string;
-            }[] | undefined;
-            methods: {
-                id: string;
-                method: string;
-            }[];
-            route: {
-                id: string;
-                path: string;
-            };
-        }[] | undefined;
-    } | null>;
-    readonly login: (payload: LoginPayload) => Promise<any>;
-    readonly logout: () => Promise<void>;
-    readonly fetchUser: (options?: {
-        fields?: string[];
-    }) => Promise<void>;
-    readonly isLoggedIn: import("vue").ComputedRef<boolean>;
-};
+import type { UseEnfyraAuthReturn } from "../../types/auth";
+export declare function useEnfyraAuth(): UseEnfyraAuthReturn;
 //# sourceMappingURL=useEnfyraAuth.d.ts.map

package/dist/runtime/composables/useEnfyraAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEnfyraAuth.d.ts","sourceRoot":"","sources":["../../../src/runtime/composables/useEnfyraAuth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAuB,MAAM,kBAAkB,CAAC;AAMhF,wBAAgB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAgDG,YAAY;;mCAzBP;QAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;;EAqEzD"}
+{"version":3,"file":"useEnfyraAuth.d.ts","sourceRoot":"","sources":["../../../src/runtime/composables/useEnfyraAuth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAsB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOhF,wBAAgB,aAAa,IAAI,mBAAmB,CA8EnD"}

package/dist/runtime/composables/useEnfyraAuth.js

@@ -1,54 +1,22 @@
 import { ref, computed } from "vue";
-import { useEnfyraApi } from "./useEnfyraApi.js";
+import { $fetch } from "../utils/http.js";
+import { useEnfyra } from "./useEnfyra.js";
 const me = ref(null);
 const isLoading = ref(false);
 export function useEnfyraAuth() {
-  const {
-    data: loginData,
-    execute: executeLogin,
-    error: loginError
-  } = useEnfyraApi("/login", {
-    method: "post",
-    errorContext: "Login"
-  });
-  const { execute: executeLogout } = useEnfyraApi("/logout", {
-    method: "post",
-    errorContext: "Logout"
-  });
-  const {
-    data: meData,
-    execute: executeFetchUser,
-    error: fetchUserError
-  } = useEnfyraApi("/me", {
-    errorContext: "Fetch User Profile"
-  });
-  const fetchUser = async (options) => {
-    isLoading.value = true;
-    try {
-      const queryParams = {};
-      if (options?.fields && options.fields.length > 0) {
-        queryParams.fields = options.fields.join(",");
-      }
-      await executeFetchUser({
-        query: queryParams
-      });
-      if (fetchUserError.value) {
-        me.value = null;
-        return;
-      }
-      me.value = meData.value?.data?.[0];
-    } finally {
-      isLoading.value = false;
-    }
-  };
+  const { baseUrl } = useEnfyra();
   const login = async (payload) => {
     isLoading.value = true;
     try {
-      await executeLogin({ body: payload });
-      if (loginError.value) {
-        return null;
-      }
-      return loginData.value;
+      const response = await $fetch(`${baseUrl}/login`, {
+        method: "POST",
+        body: payload
+      });
+      me.value = response?.data?.[0] || null;
+      return response;
+    } catch (error) {
+      console.error("[Enfyra Auth] Login error:", error);
+      return null;
     } finally {
       isLoading.value = false;
     }
@@ -56,12 +24,15 @@ export function useEnfyraAuth() {
   const logout = async () => {
     isLoading.value = true;
     try {
-      await executeLogout();
+      await $fetch(`${baseUrl}/logout`, {
+        method: "POST"
+      });
       me.value = null;
       if (typeof window !== "undefined") {
         window.location.reload();
       }
     } catch (error) {
+      console.error("[Enfyra Auth] Logout error:", error);
       me.value = null;
       if (typeof window !== "undefined") {
         window.location.reload();
@@ -70,6 +41,25 @@ export function useEnfyraAuth() {
       isLoading.value = false;
     }
   };
+  const fetchUser = async (options) => {
+    isLoading.value = true;
+    try {
+      const queryParams = {};
+      if (options?.fields && options.fields.length > 0) {
+        queryParams.fields = options.fields.join(",");
+      }
+      const response = await $fetch(`${baseUrl}/me`, {
+        method: "GET",
+        query: queryParams
+      });
+      me.value = response?.data?.[0] || null;
+    } catch (error) {
+      console.error("[Enfyra Auth] Fetch user error:", error);
+      me.value = null;
+    } finally {
+      isLoading.value = false;
+    }
+  };
   const isLoggedIn = computed(() => !!me.value);
   return {
     me,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enfyra/sdk-nuxt",
-  "version": "0.3.22",
+  "version": "0.3.24",
   "type": "module",
   "description": "Nuxt SDK for Enfyra CMS",
   "repository": {

package/src/module.ts

@@ -89,8 +89,8 @@ export default defineNuxtModule<ModuleOptions>({
 
     addImports([
       {
-        name: "useEnfyraApi",
-        from: resolve("./runtime/composables/useEnfyraApi"),
+        name: "useEnfyra",
+        from: resolve("./runtime/composables/useEnfyra"),
       },
       {
         name: "useEnfyraAuth",
@@ -100,18 +100,13 @@ export default defineNuxtModule<ModuleOptions>({
     addTypeTemplate({
       filename: "types/enfyra-sdk.d.ts",
       getContents: () => `
-import type { ApiOptions, UseEnfyraApiSSRReturn, UseEnfyraApiClientReturn } from '@enfyra/sdk-nuxt/types'
-
 declare module '#imports' {
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts: ApiOptions<T> & { ssr: true }
-  ): UseEnfyraApiSSRReturn<T>
+  export interface UseEnfyraReturn {
+    baseUrl: string;
+    apiPrefix: string;
+  }
 
-  export function useEnfyraApi<T = any>(
-    path: (() => string) | string,
-    opts?: ApiOptions<T> & { ssr?: false | undefined }
-  ): UseEnfyraApiClientReturn<T>
+  export function useEnfyra(): UseEnfyraReturn
 
   export function useEnfyraAuth(): import('@enfyra/sdk-nuxt/types').UseEnfyraAuthReturn
 }

package/src/runtime/composables/useEnfyra.ts

@@ -0,0 +1,21 @@
+import { useRuntimeConfig } from "#imports";
+import { getAppUrl, normalizeUrl } from "../utils/url";
+import { ENFYRA_API_PREFIX } from "../constants/config";
+
+export interface UseEnfyraReturn {
+  baseUrl: string;
+  apiPrefix: string;
+}
+
+export function useEnfyra(): UseEnfyraReturn {
+  const config = useRuntimeConfig().public.enfyraSDK;
+  const appUrl = getAppUrl();
+  const apiPrefix = config?.apiPrefix || ENFYRA_API_PREFIX;
+  const baseUrl = normalizeUrl(appUrl, apiPrefix);
+
+  return {
+    baseUrl,
+    apiPrefix,
+  };
+}
+

package/src/runtime/composables/useEnfyraAuth.ts

@@ -1,95 +1,82 @@
 import { ref, computed } from "vue";
 import type { LoginPayload, User, UseEnfyraAuthReturn } from "../../types/auth";
-import { useEnfyraApi } from "./useEnfyraApi";
+import { $fetch } from "../utils/http";
+import { useEnfyra } from "./useEnfyra";
 
 const me = ref<User | null>(null);
 const isLoading = ref<boolean>(false);
 
-export function useEnfyraAuth() {
-  const {
-    data: loginData,
-    execute: executeLogin,
-    error: loginError,
-  } = useEnfyraApi("/login", {
-    method: "post",
-    errorContext: "Login",
-  });
+export function useEnfyraAuth(): UseEnfyraAuthReturn {
+  const { baseUrl } = useEnfyra();
 
-  const { execute: executeLogout } = useEnfyraApi("/logout", {
-    method: "post",
-    errorContext: "Logout",
-  });
-
-  const {
-    data: meData,
-    execute: executeFetchUser,
-    error: fetchUserError,
-  } = useEnfyraApi("/me", {
-    errorContext: "Fetch User Profile",
-  });
-
-  const fetchUser = async (options?: { fields?: string[] }) => {
+  const login = async (payload: LoginPayload) => {
     isLoading.value = true;
 
     try {
-      const queryParams: any = {};
-
-      if (options?.fields && options.fields.length > 0) {
-        queryParams.fields = options.fields.join(",");
-      }
-
-      await executeFetchUser({
-        query: queryParams,
+      const response = await $fetch(`${baseUrl}/login`, {
+        method: "POST",
+        body: payload,
       });
 
-      if (fetchUserError.value) {
-        me.value = null;
-        return;
-      }
-
-      me.value = (meData.value as any)?.data?.[0];
+      me.value = (response as any)?.data?.[0] || null;
+      return response;
+    } catch (error) {
+      console.error("[Enfyra Auth] Login error:", error);
+      return null;
     } finally {
       isLoading.value = false;
     }
   };
 
-  const login = async (payload: LoginPayload) => {
+  const logout = async () => {
     isLoading.value = true;
 
     try {
-      await executeLogin({ body: payload });
+      await $fetch(`${baseUrl}/logout`, {
+        method: "POST",
+      });
+      me.value = null;
 
-      if (loginError.value) {
-        return null;
+      if (typeof window !== "undefined") {
+        window.location.reload();
+      }
+    } catch (error) {
+      console.error("[Enfyra Auth] Logout error:", error);
+      me.value = null;
+      if (typeof window !== "undefined") {
+        window.location.reload();
       }
-
-      return loginData.value;
     } finally {
       isLoading.value = false;
     }
   };
 
-  const logout = async () => {
+  const fetchUser = async (options?: { fields?: string[] }) => {
     isLoading.value = true;
 
     try {
-      await executeLogout();
-      me.value = null;
+      const queryParams: any = {};
 
-      if (typeof window !== "undefined") {
-        window.location.reload();
+      if (options?.fields && options.fields.length > 0) {
+        queryParams.fields = options.fields.join(",");
       }
+
+      const response = await $fetch(`${baseUrl}/me`, {
+        method: "GET",
+        query: queryParams,
+      });
+
+      me.value = (response as any)?.data?.[0] || null;
     } catch (error) {
+      console.error("[Enfyra Auth] Fetch user error:", error);
       me.value = null;
-      if (typeof window !== "undefined") {
-        window.location.reload();
-      }
     } finally {
       isLoading.value = false;
     }
   };
 
   const isLoggedIn = computed(() => !!me.value);
+
   return {
     me,
     login,

package/dist/runtime/composables/useEnfyraApi.d.ts

@@ -1,8 +0,0 @@
-import type { ApiOptions, UseEnfyraApiSSRReturn, UseEnfyraApiClientReturn } from "../../types";
-export declare function useEnfyraApi<T = any>(path: (() => string) | string, opts: ApiOptions<T> & {
-    ssr: true;
-}): UseEnfyraApiSSRReturn<T>;
-export declare function useEnfyraApi<T = any>(path: (() => string) | string, opts?: ApiOptions<T> & {
-    ssr?: false | undefined;
-}): UseEnfyraApiClientReturn<T>;
-//# sourceMappingURL=useEnfyraApi.d.ts.map

package/dist/runtime/composables/useEnfyraApi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useEnfyraApi.d.ts","sourceRoot":"","sources":["../../../src/runtime/composables/useEnfyraApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAGV,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AA4BrB,wBAAgB,YAAY,CAAC,CAAC,GAAG,GAAG,EAClC,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAC7B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,EAAE,IAAI,CAAA;CAAE,GAClC,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAE5B,wBAAgB,YAAY,CAAC,CAAC,GAAG,GAAG,EAClC,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAC7B,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;CAAE,GACjD,wBAAwB,CAAC,CAAC,CAAC,CAAC"}