@merkaly/nuxt 0.5.0 → 0.6.0

package/dist/module.d.mts

@@ -27,7 +27,7 @@ interface MerkalyModuleOptions {
         token: string;
     };
 }
-declare const merkalyModule: _nuxt_schema.NuxtModule<MerkalyModuleOptions, MerkalyModuleOptions, false>;
+declare const _default: _nuxt_schema.NuxtModule<MerkalyModuleOptions, MerkalyModuleOptions, false>;
 
-export { merkalyModule as default };
+export { _default as default };
 export type { MerkalyModuleOptions };

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.14.0"
   },
-  "version": "0.5.0",
+  "version": "0.6.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, useLogger, createResolver, addPlugin, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate } from '@nuxt/kit';
+import { defineNuxtModule, useLogger, createResolver, addPlugin, addServerHandler, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate } from '@nuxt/kit';
 import { defu } from 'defu';
 import { createJiti } from 'jiti';
 import { existsSync } from 'node:fs';
@@ -73,7 +73,7 @@ function configureSentry(nuxt, options) {
     org: "merkaly",
     project: options.sentry.project
   });
-  nuxt.options.sourcemap = { client: "hidden" };
+  nuxt.options.sourcemap = { client: "hidden", server: true };
 }
 async function loadBootstrapConfig(nuxt) {
   const rootDirResolver = createResolver(nuxt.options.rootDir);
@@ -95,15 +95,26 @@ function configureBootstrapVueNext(nuxt, components) {
     }
   );
 }
+function configureAppHead(nuxt) {
+  nuxt.options.app?.head?.script?.push({
+    crossorigin: "anonymous",
+    src: "https://kit.fontawesome.com/55a4b2f4e1.js"
+  });
+}
 function registerRuntimeFeatures(nuxt, options, resolver) {
   addPlugin({ src: resolver.resolve("./runtime/plugins/api.global") });
   addPlugin({ src: resolver.resolve("./runtime/plugins/auth0.client") });
   addPlugin({ src: resolver.resolve("./runtime/plugins/sentry.global") });
+  addServerHandler({
+    handler: resolver.resolve("./runtime/server/middleware/proxy"),
+    middleware: true
+  });
   addRouteMiddleware({
     global: options.auth0.requiresAuth,
     name: "auth",
     path: resolver.resolve("./runtime/middleware/auth")
   });
+  addImportsDir(resolver.resolve("./runtime/adapters"));
   addImportsDir(resolver.resolve("./runtime/composables"));
   addImportsDir(resolver.resolve("./runtime/utils"));
   addComponentsDir({
@@ -123,7 +134,7 @@ function configureVite(nuxt) {
     }
   );
 }
-const merkalyModule = defineNuxtModule({
+const module = defineNuxtModule({
   defaults: defaultOptions,
   meta: {
     name: "@merkaly/nuxt",
@@ -148,9 +159,10 @@ const merkalyModule = defineNuxtModule({
       logger.info("Loading bootstrap.config.ts");
     }
     configureBootstrapVueNext(nuxt, bootstrapComponentsConfig);
+    configureAppHead(nuxt);
     registerRuntimeFeatures(nuxt, options, resolver);
     configureVite(nuxt);
   }
 });
 
-export { merkalyModule as default };
+export { module as default };

package/dist/runtime/adapters/create.auth.session.d.ts

@@ -0,0 +1,9 @@
+interface AuthSessionData {
+    expiresAt: string | Date;
+    issuedAt: string | Date;
+    orgId?: string;
+    role: string;
+    userId: string;
+}
+export declare const createAuthSession: (args?: ((args: object) => import("#imports").AdapterArgs<AuthSessionData, Record<string, unknown>, object>) | undefined) => import("#imports").UseApiReturn<AuthSessionData, Record<string, unknown>, object>;
+export {};

package/dist/runtime/adapters/create.auth.session.js

@@ -0,0 +1,14 @@
+import { useAuth } from "#imports";
+import { withAdapter } from "../utils/withAdapter.js";
+export const createAuthSession = withAdapter(() => {
+  const { token } = useAuth();
+  return {
+    default: () => ({}),
+    global: true,
+    headers: {
+      authorization: token.value ? `Bearer ${token.value}` : ""
+    },
+    method: "POST",
+    uri: "/session"
+  };
+});

package/dist/runtime/adapters/delete.auth.session.d.ts

@@ -0,0 +1 @@
+export declare const deleteAuthSession: (args?: ((args: object) => import("../utils/withAdapter.js").AdapterArgs<undefined, Record<string, unknown>, object>) | undefined) => import("../composables/useApi.js").UseApiReturn<undefined, Record<string, unknown>, object>;

package/dist/runtime/adapters/delete.auth.session.js

@@ -0,0 +1,6 @@
+import { withAdapter } from "../utils/withAdapter.js";
+export const deleteAuthSession = withAdapter(() => ({
+  global: true,
+  method: "DELETE",
+  uri: "/session"
+}));

package/dist/runtime/adapters/read.auth.session.d.ts

@@ -0,0 +1,9 @@
+interface AuthSessionData {
+    expiresAt: string | Date;
+    issuedAt: string | Date;
+    orgId?: string;
+    role: string;
+    userId: string;
+}
+export declare const readAuthSession: (args?: ((args: object) => import("../utils/withAdapter.js").AdapterArgs<AuthSessionData, Record<string, unknown>, object>) | undefined) => import("../composables/useApi.js").UseApiReturn<AuthSessionData, Record<string, unknown>, object>;
+export {};

package/dist/runtime/adapters/read.auth.session.js

@@ -0,0 +1,8 @@
+import { withAdapter } from "../utils/withAdapter.js";
+export const readAuthSession = withAdapter(() => ({
+  default: () => ({}),
+  global: true,
+  immediate: false,
+  method: "GET",
+  uri: "/session"
+}));

package/dist/runtime/components/app.d.vue.ts

@@ -1,8 +1,8 @@
-declare var __VLS_8: {}, __VLS_10: {};
+declare var __VLS_7: {}, __VLS_9: {};
 type __VLS_Slots = {} & {
-    loading?: (props: typeof __VLS_8) => any;
+    loading?: (props: typeof __VLS_7) => any;
 } & {
-    default?: (props: typeof __VLS_10) => any;
+    default?: (props: typeof __VLS_9) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/app.vue

@@ -15,13 +15,15 @@ hook("page:finish", () => regenerate());
 </script>
 
 <template>
-  <BApp>
-    <!-- Mostramos spinner mientras auth se carga -->
-    <slot v-if="isLoading" name="loading" />
+  <main>
+    <BApp>
+      <!-- Mostramos spinner mientras auth se carga -->
+      <slot v-if="isLoading" name="loading" />
 
-    <!-- Renderizamos páginas solo cuando isLoading = false -->
-    <slot v-else>
-      <NuxtPage />
-    </slot>
-  </BApp>
+      <!-- Renderizamos páginas solo cuando isLoading = false -->
+      <slot v-else>
+        <NuxtPage />
+      </slot>
+    </BApp>
+  </main>
 </template>

package/dist/runtime/components/app.vue.d.ts

@@ -1,8 +1,8 @@
-declare var __VLS_8: {}, __VLS_10: {};
+declare var __VLS_7: {}, __VLS_9: {};
 type __VLS_Slots = {} & {
-    loading?: (props: typeof __VLS_8) => any;
+    loading?: (props: typeof __VLS_7) => any;
 } & {
-    default?: (props: typeof __VLS_10) => any;
+    default?: (props: typeof __VLS_9) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/input/InputMoney.d.vue.ts

@@ -77,9 +77,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     decimal: string;
     min: number;
     max: number;
-    prefix: string;
     placeholder: string;
     precision: number;
+    prefix: string;
     suffix: string;
     thousands: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/input/InputMoney.vue.d.ts

@@ -77,9 +77,9 @@ declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractP
     decimal: string;
     min: number;
     max: number;
-    prefix: string;
     placeholder: string;
     precision: number;
+    prefix: string;
     suffix: string;
     thousands: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/plugins/api.global.d.ts

@@ -37,9 +37,9 @@ export interface ParamsOptions {
     body?: FetchOptions['body'];
     controller?: AbortController;
     default?: () => unknown;
+    global?: boolean;
     headers?: FetchOptions['headers'];
     method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-    prefix?: string;
     query?: FetchOptions['query'];
     timeout?: FetchOptions['timeout'];
 }

package/dist/runtime/plugins/api.global.js

@@ -1,15 +1,15 @@
-import { defineNuxtPlugin, useRuntimeConfig } from "#app";
+import { defineNuxtPlugin } from "#app";
 import { useAuth } from "#imports";
+const GLOBAL_API_HEADER = "x-merkaly-global";
 export default defineNuxtPlugin(({ provide }) => provide("api", async (url, options = {}) => {
-  const { public: $config } = useRuntimeConfig();
   const { tenant, token } = useAuth();
   await $fetch(url, {
-    // Determine the base URL
-    baseURL: new URL(options.prefix || $config.merkaly.api.prefix || "/", $config.merkaly.api.url).href,
+    baseURL: "/api",
     body: options?.body,
     headers: {
       authorization: token.value ? `Bearer ${token.value}` : "",
       identity: tenant.value,
+      [GLOBAL_API_HEADER]: options.global ? "true" : "",
       ...options?.headers
     },
     method: options?.method,

package/dist/runtime/plugins/auth0.client.js

@@ -40,17 +40,17 @@ export default defineNuxtPlugin(async ({ callHook, hook }) => {
       redirect_uri: redirectUri
     }
   });
-  auth0.linkWithConnection = (connection) => {
-    return linkingClient.loginWithPopup({ authorizationParams: { connection } }).then(() => linkingClient.getIdTokenClaims()).then((claims) => {
-      if (!claims?.sub) {
-        throw new Error("Failed to get ID token for linking");
-      }
-      const [provider, ...userIdParts] = claims.sub.split("|");
-      const userId = userIdParts.join("|");
-      const body = { provider, userId };
-      const { $api } = useNuxtApp();
-      return $api("/identities", { method: "POST", prefix: "/", body });
-    });
+  auth0.linkWithConnection = async (connection) => {
+    await linkingClient.loginWithPopup({ authorizationParams: { connection } });
+    const claims = await linkingClient.getIdTokenClaims();
+    if (!claims?.sub) {
+      throw new Error("Failed to get ID token for linking");
+    }
+    const [provider, ...userIdParts] = claims.sub.split("|");
+    const userId = userIdParts.join("|");
+    const body = { provider, userId };
+    const { $api } = useNuxtApp();
+    return await $api("/identities", { body, global: true, method: "POST" });
   };
   const isAuthCallback = window.location.pathname === callbackPath;
   if (!isAuthCallback) {

package/dist/runtime/plugins/sentry.global.js

@@ -2,13 +2,10 @@ import { defineNuxtPlugin } from "#app";
 import { setUser } from "@sentry/nuxt";
 export default defineNuxtPlugin(async ({ hook }) => {
   hook("merkaly:auth", (user) => {
-    if (!user) {
-      return setUser(null);
-    }
-    return setUser({
+    return setUser(user ? {
       id: user.sub,
       email: user.email,
       username: user.name
-    });
+    } : null);
   });
 });

package/dist/runtime/server/middleware/proxy.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any> | undefined>;
+export default _default;

package/dist/runtime/server/middleware/proxy.js

@@ -0,0 +1,34 @@
+import { defineEventHandler, getRequestURL, proxyRequest } from "h3";
+import { useRuntimeConfig } from "#imports";
+const GLOBAL_API_HEADER = "x-merkaly-global";
+const API_PREFIX_PATTERN = /^\/api\/?/;
+const API_ROUTE_PATTERN = /^\/api(?:\/|$)/;
+const EDGE_SLASH_PATTERN = /^\/|\/$/g;
+function normalizeSegment(value) {
+  return value.replace(EDGE_SLASH_PATTERN, "");
+}
+function resolveProxyPath(prefix, pathname, search) {
+  const normalizedPathname = pathname.replace(API_PREFIX_PATTERN, "");
+  return `/${[prefix, normalizedPathname].map(normalizeSegment).filter(Boolean).join("/")}${search}`;
+}
+function isGlobalRequest(value) {
+  if (Array.isArray(value)) {
+    return value.includes("true");
+  }
+  return value === "true";
+}
+export default defineEventHandler((event) => {
+  if (!API_ROUTE_PATTERN.test(event.path)) {
+    return;
+  }
+  const { public: $config } = useRuntimeConfig();
+  const targetOrigin = new URL($config.merkaly.api.url);
+  const url = getRequestURL(event);
+  const prefix = isGlobalRequest(event.node.req.headers[GLOBAL_API_HEADER]) ? "" : $config.merkaly.api.prefix;
+  const path = resolveProxyPath(prefix, url.pathname, url.search);
+  event.node.req.headers["x-forwarded-host"] = url.host;
+  if (import.meta.dev && targetOrigin.hostname.endsWith(".test")) {
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+  }
+  return proxyRequest(event, new URL(path, targetOrigin).toString());
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"