@enfyra/sdk-nuxt 0.7.1 → 0.7.3

package/dist/module.cjs

@@ -99,18 +99,13 @@ declare module '#imports' {
       method: "post"
     });
     kit.addServerHandler({
-      route: `${apiPrefix}/auth/:provider`,
-      handler: resolve("./runtime/server/api/auth/[provider].get"),
-      method: "get"
-    });
-    kit.addServerHandler({
-      route: `${apiPrefix}/auth/:provider/callback`,
-      handler: resolve("./runtime/server/api/auth/[provider]/callback.get"),
+      route: `${apiPrefix}/auth/callback`,
+      handler: resolve("./runtime/server/api/auth/callback.get"),
       method: "get"
     });
     kit.addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
+      route: `${apiPrefix}/auth/[provider]`,
+      handler: resolve("./runtime/server/api/auth/[provider].get"),
       method: "get"
     });
     kit.addServerHandler({

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,wBAgJG"}
+{"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,wBA2IG"}

package/dist/module.json

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

package/dist/module.mjs

@@ -96,18 +96,13 @@ declare module '#imports' {
       method: "post"
     });
     addServerHandler({
-      route: `${apiPrefix}/auth/:provider`,
-      handler: resolve("./runtime/server/api/auth/[provider].get"),
-      method: "get"
-    });
-    addServerHandler({
-      route: `${apiPrefix}/auth/:provider/callback`,
-      handler: resolve("./runtime/server/api/auth/[provider]/callback.get"),
+      route: `${apiPrefix}/auth/callback`,
+      handler: resolve("./runtime/server/api/auth/callback.get"),
       method: "get"
     });
     addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
+      route: `${apiPrefix}/auth/[provider]`,
+      handler: resolve("./runtime/server/api/auth/[provider].get"),
       method: "get"
     });
     addServerHandler({

package/dist/runtime/composables/useEnfyraAuth.js

@@ -70,7 +70,7 @@ export function useEnfyraAuth() {
       return;
     }
     const currentUrl = window.location.href;
-    window.location.href = `${baseUrl}/auth/${provider}?redirect=${encodeURIComponent(currentUrl)}`;
+    window.location.href = `/api/auth/${provider}?redirect=${encodeURIComponent(currentUrl)}`;
   };
   return {
     me,

package/dist/runtime/server/api/all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"all.d.ts","sourceRoot":"","sources":["../../../../src/runtime/server/api/all.ts"],"names":[],"mappings":";AAUA,wBAQG"}
+{"version":3,"file":"all.d.ts","sourceRoot":"","sources":["../../../../src/runtime/server/api/all.ts"],"names":[],"mappings":";AAaA,wBAyBG"}

package/dist/runtime/server/api/all.js

@@ -1,4 +1,5 @@
-import { defineEventHandler, setResponseHeaders } from "h3";
+import { defineEventHandler, getQuery, sendRedirect, setResponseHeaders } from "h3";
+import { useRuntimeConfig } from "#imports";
 import { proxyToAPI } from "../../utils/server/proxy.js";
 const CORS_HEADERS = {
   "Access-Control-Allow-Origin": "*",
@@ -6,10 +7,26 @@ const CORS_HEADERS = {
   "Access-Control-Allow-Headers": "Content-Type, Authorization",
   "Access-Control-Max-Age": "86400"
 };
+const OAUTH_INIT_PATTERN = /\/auth\/(google|facebook|github)(?:\/|$|\?)/;
 export default defineEventHandler(async (event) => {
   setResponseHeaders(event, CORS_HEADERS);
   if (event.method === "OPTIONS") {
     return "";
   }
+  const pathname = event.path?.split("?")[0] || event.path || "";
+  const oauthMatch = pathname.match(OAUTH_INIT_PATTERN);
+  if (event.method === "GET" && oauthMatch) {
+    const provider = oauthMatch[1];
+    const query = getQuery(event);
+    const redirectParam = query.redirect;
+    if (redirectParam) {
+      const config = useRuntimeConfig();
+      const apiUrl = config.public?.enfyraSDK?.apiUrl;
+      if (apiUrl) {
+        const backendUrl = `${apiUrl.replace(/\/+$/, "")}/auth/${provider}?redirect=${encodeURIComponent(redirectParam)}`;
+        return sendRedirect(event, backendUrl, 302);
+      }
+    }
+  }
   return proxyToAPI(event);
 });

package/dist/runtime/server/api/auth/[provider].get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"[provider].get.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/server/api/auth/[provider].get.ts"],"names":[],"mappings":";AAYA,wBAyBG"}
+{"version":3,"file":"[provider].get.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/server/api/auth/[provider].get.ts"],"names":[],"mappings":";AAcA,wBAqBG"}

package/dist/runtime/server/api/auth/[provider].get.js

@@ -1,31 +1,27 @@
 import {
+  createError,
   defineEventHandler,
   getQuery,
-  createError,
-  sendError,
+  getRouterParam,
   sendRedirect
 } from "h3";
 import { useRuntimeConfig } from "#imports";
-import { normalizeUrl } from "../../../utils/url.js";
-const VALID_PROVIDERS = ["google", "facebook", "github"];
-export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
-  const apiUrl = config.public.enfyraSDK?.apiUrl;
-  const provider = event.context.params?.provider;
-  if (!provider || !VALID_PROVIDERS.includes(provider)) {
-    return sendError(
-      event,
-      createError({
-        statusCode: 400,
-        statusMessage: `Invalid OAuth provider: ${provider}`
-      })
-    );
+const OAUTH_PROVIDERS = ["google", "facebook", "github"];
+export default defineEventHandler((event) => {
+  const provider = getRouterParam(event, "provider");
+  if (!provider || !OAUTH_PROVIDERS.includes(provider)) {
+    throw createError({ statusCode: 400, message: "Invalid OAuth provider" });
   }
   const query = getQuery(event);
-  const redirectUrl = query.redirect;
-  let oauthUrl = normalizeUrl(apiUrl, `/auth/${provider}`);
-  if (redirectUrl) {
-    oauthUrl += `?redirect=${encodeURIComponent(redirectUrl)}`;
+  const redirectParam = query.redirect;
+  if (!redirectParam) {
+    throw createError({ statusCode: 400, message: "Redirect URL is required" });
+  }
+  const config = useRuntimeConfig();
+  const apiUrl = config.public?.enfyraSDK?.apiUrl;
+  if (!apiUrl) {
+    throw createError({ statusCode: 500, message: "API URL not configured" });
   }
-  return sendRedirect(event, oauthUrl, 302);
+  const backendUrl = `${apiUrl.replace(/\/+$/, "")}/auth/${provider}?redirect=${encodeURIComponent(redirectParam)}`;
+  return sendRedirect(event, backendUrl, 302);
 });

package/package.json

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

package/src/module.ts

@@ -130,22 +130,17 @@ declare module '#imports' {
       method: "post",
     });
 
-    // OAuth routes
+    // OAuth callback - sets cookies and redirects (must be before [provider])
     addServerHandler({
-      route: `${apiPrefix}/auth/:provider`,
-      handler: resolve("./runtime/server/api/auth/[provider].get"),
-      method: "get",
-    });
-
-    addServerHandler({
-      route: `${apiPrefix}/auth/:provider/callback`,
-      handler: resolve("./runtime/server/api/auth/[provider]/callback.get"),
+      route: `${apiPrefix}/auth/callback`,
+      handler: resolve("./runtime/server/api/auth/callback.get"),
       method: "get",
     });
 
+    // OAuth initiate - redirect to backend (not proxy)
     addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
+      route: `${apiPrefix}/auth/[provider]`,
+      handler: resolve("./runtime/server/api/auth/[provider].get"),
       method: "get",
     });
 

package/src/runtime/composables/useEnfyraAuth.ts

@@ -87,7 +87,7 @@ export function useEnfyraAuth(): UseEnfyraAuthReturn {
     }
 
     const currentUrl = window.location.href;
-    window.location.href = `${baseUrl}/auth/${provider}?redirect=${encodeURIComponent(currentUrl)}`;
+    window.location.href = `/api/auth/${provider}?redirect=${encodeURIComponent(currentUrl)}`;
   };
 
   return {

package/src/runtime/server/api/all.ts

@@ -1,4 +1,5 @@
-import { defineEventHandler, setResponseHeaders } from "h3";
+import { defineEventHandler, getQuery, sendRedirect, setResponseHeaders } from "h3";
+import { useRuntimeConfig } from "#imports";
 import { proxyToAPI } from "../../utils/server/proxy";
 
 const CORS_HEADERS = {
@@ -8,6 +9,8 @@ const CORS_HEADERS = {
   'Access-Control-Max-Age': '86400',
 };
 
+const OAUTH_INIT_PATTERN = /\/auth\/(google|facebook|github)(?:\/|$|\?)/;
+
 export default defineEventHandler(async (event) => {
   setResponseHeaders(event, CORS_HEADERS);
 
@@ -15,5 +18,22 @@ export default defineEventHandler(async (event) => {
     return '';
   }
 
+  // OAuth initiate: redirect to backend, do NOT proxy
+  const pathname = event.path?.split('?')[0] || event.path || '';
+  const oauthMatch = pathname.match(OAUTH_INIT_PATTERN);
+  if (event.method === 'GET' && oauthMatch) {
+    const provider = oauthMatch[1];
+    const query = getQuery(event);
+    const redirectParam = query.redirect as string;
+    if (redirectParam) {
+      const config = useRuntimeConfig();
+      const apiUrl = config.public?.enfyraSDK?.apiUrl;
+      if (apiUrl) {
+        const backendUrl = `${apiUrl.replace(/\/+$/, "")}/auth/${provider}?redirect=${encodeURIComponent(redirectParam)}`;
+        return sendRedirect(event, backendUrl, 302);
+      }
+    }
+  }
+
   return proxyToAPI(event);
 });

package/src/runtime/server/api/auth/[provider].get.ts

@@ -1,38 +1,36 @@
+/**
+ * OAuth initiate - redirect browser to backend, do NOT proxy/fetch
+ */
 import {
+  createError,
   defineEventHandler,
   getQuery,
-  createError,
-  sendError,
+  getRouterParam,
   sendRedirect,
 } from "h3";
 import { useRuntimeConfig } from "#imports";
-import { normalizeUrl } from "../../../utils/url";
 
-const VALID_PROVIDERS = ["google", "facebook", "github"];
-
-export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
-  const apiUrl = config.public.enfyraSDK?.apiUrl;
-  const provider = event.context.params?.provider;
+const OAUTH_PROVIDERS = ["google", "facebook", "github"];
 
-  if (!provider || !VALID_PROVIDERS.includes(provider)) {
-    return sendError(
-      event,
-      createError({
-        statusCode: 400,
-        statusMessage: `Invalid OAuth provider: ${provider}`,
-      })
-    );
+export default defineEventHandler((event) => {
+  const provider = getRouterParam(event, "provider");
+  if (!provider || !OAUTH_PROVIDERS.includes(provider)) {
+    throw createError({ statusCode: 400, message: "Invalid OAuth provider" });
   }
 
   const query = getQuery(event);
-  const redirectUrl = query.redirect as string | undefined;
+  const redirectParam = query.redirect as string;
+  if (!redirectParam) {
+    throw createError({ statusCode: 400, message: "Redirect URL is required" });
+  }
 
-  // Build backend OAuth URL
-  let oauthUrl = normalizeUrl(apiUrl, `/auth/${provider}`);
-  if (redirectUrl) {
-    oauthUrl += `?redirect=${encodeURIComponent(redirectUrl)}`;
+  const config = useRuntimeConfig();
+  const apiUrl = config.public?.enfyraSDK?.apiUrl;
+  if (!apiUrl) {
+    throw createError({ statusCode: 500, message: "API URL not configured" });
   }
 
-  return sendRedirect(event, oauthUrl, 302);
+  const backendUrl = `${apiUrl.replace(/\/+$/, "")}/auth/${provider}?redirect=${encodeURIComponent(redirectParam)}`;
+
+  return sendRedirect(event, backendUrl, 302);
 });

package/dist/runtime/server/api/auth/[provider]/callback.get.d.ts

@@ -1,3 +0,0 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;
-export default _default;
-//# sourceMappingURL=callback.get.d.ts.map

package/dist/runtime/server/api/auth/[provider]/callback.get.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"callback.get.d.ts","sourceRoot":"","sources":["../../../../../../src/runtime/server/api/auth/[provider]/callback.get.ts"],"names":[],"mappings":";AAQA,wBAYG"}

package/dist/runtime/server/api/auth/[provider]/callback.get.js

@@ -1,16 +0,0 @@
-import {
-  defineEventHandler,
-  getQuery,
-  sendRedirect
-} from "h3";
-import { useRuntimeConfig } from "#imports";
-import { normalizeUrl } from "../../../../utils/url.js";
-export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
-  const apiUrl = config.public.enfyraSDK?.apiUrl;
-  const provider = event.context.params?.provider;
-  const query = getQuery(event);
-  const queryString = new URLSearchParams(query).toString();
-  const backendUrl = normalizeUrl(apiUrl, `/auth/${provider}/callback?${queryString}`);
-  return sendRedirect(event, backendUrl, 302);
-});

package/src/runtime/server/api/auth/[provider]/callback.get.ts

@@ -1,21 +0,0 @@
-import {
-  defineEventHandler,
-  getQuery,
-  sendRedirect,
-} from "h3";
-import { useRuntimeConfig } from "#imports";
-import { normalizeUrl } from "../../../../utils/url";
-
-export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
-  const apiUrl = config.public.enfyraSDK?.apiUrl;
-  const provider = event.context.params?.provider;
-
-  const query = getQuery(event);
-  const queryString = new URLSearchParams(query as Record<string, string>).toString();
-
-  // Redirect to backend OAuth callback
-  const backendUrl = normalizeUrl(apiUrl, `/auth/${provider}/callback?${queryString}`);
-
-  return sendRedirect(event, backendUrl, 302);
-});