@enfyra/sdk-nuxt 0.7.4 → 0.7.5

package/dist/module.cjs

@@ -98,11 +98,6 @@ declare module '#imports' {
       handler: resolve("./runtime/server/api/logout.post"),
       method: "post"
     });
-    kit.addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
-      method: "get"
-    });
     kit.addServerHandler({
       route: "/assets/**",
       handler: resolve("./runtime/server/api/all")

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,wBAmIG"}
+{"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.7.4",
+  "version": "0.7.5",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -95,11 +95,6 @@ declare module '#imports' {
       handler: resolve("./runtime/server/api/logout.post"),
       method: "post"
     });
-    addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
-      method: "get"
-    });
     addServerHandler({
       route: "/assets/**",
       handler: resolve("./runtime/server/api/all")

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":";AAoBA,wBA+BG"}
+{"version":3,"file":"all.d.ts","sourceRoot":"","sources":["../../../../src/runtime/server/api/all.ts"],"names":[],"mappings":";AAsBA,wBAmDG"}

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

@@ -6,6 +6,7 @@ import {
   setResponseHeaders
 } from "h3";
 import { useRuntimeConfig } from "#imports";
+import { ENFYRA_API_PREFIX } from "../../constants/config.js";
 import { proxyToAPI } from "../../utils/server/proxy.js";
 const CORS_HEADERS = {
   "Access-Control-Allow-Origin": "*",
@@ -14,13 +15,33 @@ const CORS_HEADERS = {
   "Access-Control-Max-Age": "86400"
 };
 const OAUTH_PROVIDERS = ["google", "facebook", "github"];
-const OAUTH_INIT_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})(?:/|$|\\?)`);
+const OAUTH_INIT_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})/?$`);
+const OAUTH_CALLBACK_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})/callback$`);
 export default defineEventHandler(async (event) => {
   setResponseHeaders(event, CORS_HEADERS);
   if (event.method === "OPTIONS") {
     return "";
   }
-  const path = (event.path || event.node?.req?.url || "").split("?")[0];
+  const config = useRuntimeConfig();
+  const apiUrl = config.public?.enfyraSDK?.apiUrl;
+  const fullUrl = event.node?.req?.url || event.path || "";
+  const [path, queryString] = fullUrl.split("?");
+  const apiPrefix = config.public?.enfyraSDK?.apiPrefix || ENFYRA_API_PREFIX;
+  const pathWithoutPrefix = path.replace(new RegExp(`^${apiPrefix}`), "") || "/";
+  const oauthCallbackMatch = pathWithoutPrefix.match(OAUTH_CALLBACK_PATTERN);
+  if (event.method === "GET" && oauthCallbackMatch) {
+    if (!apiUrl) {
+      throw createError({ statusCode: 500, message: "API URL not configured" });
+    }
+    const backendPath = pathWithoutPrefix.startsWith("/") ? pathWithoutPrefix : `/${pathWithoutPrefix}`;
+    const backendUrl = `${apiUrl.replace(/\/+$/, "")}${backendPath}${queryString ? `?${queryString}` : ""}`;
+    const response = await fetch(backendUrl, { redirect: "manual" });
+    const location = response.headers.get("location") || response.headers.get("Location");
+    if (location && response.status >= 300 && response.status < 400) {
+      return sendRedirect(event, location, response.status);
+    }
+    throw createError({ statusCode: 502, message: "OAuth callback failed" });
+  }
   const oauthMatch = path.match(OAUTH_INIT_PATTERN);
   if (event.method === "GET" && oauthMatch) {
     const provider = oauthMatch[1];
@@ -29,8 +50,6 @@ export default defineEventHandler(async (event) => {
     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" });
     }
@@ -38,6 +57,7 @@ export default defineEventHandler(async (event) => {
     const response = await fetch(backendUrl, { redirect: "manual" });
     const location = response.headers.get("location") || response.headers.get("Location");
     if (location && response.status >= 300 && response.status < 400) {
+      console.log("[Enfyra OAuth] Redirecting to:", location);
       return sendRedirect(event, location, 302);
     }
     throw createError({ statusCode: 502, message: "Failed to get OAuth URL from backend" });

package/package.json

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

package/src/module.ts

@@ -130,12 +130,6 @@ declare module '#imports' {
       method: "post",
     });
 
-    addServerHandler({
-      route: `${apiPrefix}/auth/callback`,
-      handler: resolve("./runtime/server/api/auth/callback.get"),
-      method: "get",
-    });
-
     addServerHandler({
       route: "/assets/**",
       handler: resolve("./runtime/server/api/all"),

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

@@ -6,6 +6,7 @@ import {
   setResponseHeaders,
 } from "h3";
 import { useRuntimeConfig } from "#imports";
+import { ENFYRA_API_PREFIX } from "../../constants/config";
 import { proxyToAPI } from "../../utils/server/proxy";
 
 const CORS_HEADERS = {
@@ -16,7 +17,8 @@ const CORS_HEADERS = {
 };
 
 const OAUTH_PROVIDERS = ["google", "facebook", "github"];
-const OAUTH_INIT_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})(?:/|$|\\?)`);
+const OAUTH_INIT_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})/?$`);
+const OAUTH_CALLBACK_PATTERN = new RegExp(`/auth/(${OAUTH_PROVIDERS.join("|")})/callback$`);
 
 export default defineEventHandler(async (event) => {
   setResponseHeaders(event, CORS_HEADERS);
@@ -25,7 +27,28 @@ export default defineEventHandler(async (event) => {
     return '';
   }
 
-  const path = (event.path || event.node?.req?.url || "").split("?")[0];
+  const config = useRuntimeConfig();
+  const apiUrl = config.public?.enfyraSDK?.apiUrl;
+  const fullUrl = event.node?.req?.url || event.path || "";
+  const [path, queryString] = fullUrl.split("?");
+
+  const apiPrefix = config.public?.enfyraSDK?.apiPrefix || ENFYRA_API_PREFIX;
+  const pathWithoutPrefix = path.replace(new RegExp(`^${apiPrefix}`), "") || "/";
+  const oauthCallbackMatch = pathWithoutPrefix.match(OAUTH_CALLBACK_PATTERN);
+  if (event.method === "GET" && oauthCallbackMatch) {
+    if (!apiUrl) {
+      throw createError({ statusCode: 500, message: "API URL not configured" });
+    }
+    const backendPath = pathWithoutPrefix.startsWith("/") ? pathWithoutPrefix : `/${pathWithoutPrefix}`;
+    const backendUrl = `${apiUrl.replace(/\/+$/, "")}${backendPath}${queryString ? `?${queryString}` : ""}`;
+    const response = await fetch(backendUrl, { redirect: "manual" });
+    const location = response.headers.get("location") || response.headers.get("Location");
+    if (location && response.status >= 300 && response.status < 400) {
+      return sendRedirect(event, location, response.status as 301 | 302 | 307 | 308);
+    }
+    throw createError({ statusCode: 502, message: "OAuth callback failed" });
+  }
+
   const oauthMatch = path.match(OAUTH_INIT_PATTERN);
   if (event.method === "GET" && oauthMatch) {
     const provider = oauthMatch[1];
@@ -34,8 +57,6 @@ export default defineEventHandler(async (event) => {
     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" });
     }
@@ -43,6 +64,7 @@ export default defineEventHandler(async (event) => {
     const response = await fetch(backendUrl, { redirect: "manual" });
     const location = response.headers.get("location") || response.headers.get("Location");
     if (location && response.status >= 300 && response.status < 400) {
+      console.log("[Enfyra OAuth] Redirecting to:", location);
       return sendRedirect(event, location, 302);
     }
     throw createError({ statusCode: 502, message: "Failed to get OAuth URL from backend" });

package/dist/runtime/server/api/auth/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/callback.get.d.ts.map

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

package/dist/runtime/server/api/auth/callback.get.js

@@ -1,29 +0,0 @@
-import {
-  defineEventHandler,
-  getQuery,
-  setCookie,
-  sendRedirect
-} from "h3";
-import {
-  ACCESS_TOKEN_KEY,
-  REFRESH_TOKEN_KEY,
-  EXP_TIME_KEY
-} from "../../../constants/auth.js";
-export default defineEventHandler(async (event) => {
-  const query = getQuery(event);
-  const { accessToken, refreshToken, expTime, redirect } = query;
-  if (!accessToken || !refreshToken || !expTime) {
-    return sendRedirect(event, "/login?error=oauth_callback_failed");
-  }
-  const cookieOptions = {
-    httpOnly: true,
-    secure: true,
-    sameSite: "lax",
-    path: "/"
-  };
-  setCookie(event, ACCESS_TOKEN_KEY, accessToken, cookieOptions);
-  setCookie(event, REFRESH_TOKEN_KEY, refreshToken, cookieOptions);
-  setCookie(event, EXP_TIME_KEY, expTime, cookieOptions);
-  const redirectUrl = redirect || "/";
-  return sendRedirect(event, redirectUrl);
-});

package/src/runtime/server/api/auth/callback.get.ts

@@ -1,36 +0,0 @@
-import {
-  defineEventHandler,
-  getQuery,
-  setCookie,
-  sendRedirect,
-} from "h3";
-import { useRuntimeConfig } from "#imports";
-import {
-  ACCESS_TOKEN_KEY,
-  REFRESH_TOKEN_KEY,
-  EXP_TIME_KEY,
-} from "../../../constants/auth";
-
-export default defineEventHandler(async (event) => {
-  const query = getQuery(event);
-
-  const { accessToken, refreshToken, expTime, redirect } = query;
-
-  if (!accessToken || !refreshToken || !expTime) {
-    return sendRedirect(event, "/login?error=oauth_callback_failed");
-  }
-
-  const cookieOptions = {
-    httpOnly: true,
-    secure: true,
-    sameSite: "lax" as const,
-    path: "/",
-  };
-
-  setCookie(event, ACCESS_TOKEN_KEY, accessToken as string, cookieOptions);
-  setCookie(event, REFRESH_TOKEN_KEY, refreshToken as string, cookieOptions);
-  setCookie(event, EXP_TIME_KEY, expTime as string, cookieOptions);
-
-  const redirectUrl = (redirect as string) || "/";
-  return sendRedirect(event, redirectUrl);
-});