@auditauth/next 0.2.0-beta.5 → 0.2.0-beta.7

package/dist/facade/createAuditAuth.d.cts

@@ -1,28 +1,28 @@
-import { NextRequest, NextResponse } from 'next/server.js';
+import { NextResponse } from 'next/server.js';
 import { SessionUser, AuditAuthConfig } from '@auditauth/core';
 import { AuditAuthTokenPayload } from '@auditauth/node';
 
 type AuditAuthNextFacade = {
     handlers: {
-        GET: (req: NextRequest, ctx: {
+        GET: (req: Request, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
-        POST: (req: NextRequest, ctx: {
+        POST: (req: Request, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
     };
-    middleware: (req: NextRequest) => Promise<NextResponse>;
+    middleware: (req: Request) => Promise<NextResponse>;
     getSession: () => Promise<SessionUser | null>;
     hasSession: () => Promise<boolean>;
     fetch: (url: string, init?: RequestInit) => Promise<Response>;
     getLoginUrl: () => URL;
     getLogoutUrl: () => URL;
     getPortalUrl: () => URL;
-    withAuthRequest: <C>(handler: (req: NextRequest, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>) => (req: NextRequest, ctx: C) => Promise<Response>;
+    withAuthRequest: <C, R extends Request = Request>(handler: (req: R, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>) => (req: R, ctx: C) => Promise<Response>;
 };
 declare function createAuditAuthNext(config: AuditAuthConfig): AuditAuthNextFacade;
 

package/dist/facade/createAuditAuth.d.ts

@@ -1,28 +1,28 @@
-import { NextRequest, NextResponse } from 'next/server.js';
+import { NextResponse } from 'next/server.js';
 import { SessionUser, AuditAuthConfig } from '@auditauth/core';
 import { AuditAuthTokenPayload } from '@auditauth/node';
 
 type AuditAuthNextFacade = {
     handlers: {
-        GET: (req: NextRequest, ctx: {
+        GET: (req: Request, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
-        POST: (req: NextRequest, ctx: {
+        POST: (req: Request, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
     };
-    middleware: (req: NextRequest) => Promise<NextResponse>;
+    middleware: (req: Request) => Promise<NextResponse>;
     getSession: () => Promise<SessionUser | null>;
     hasSession: () => Promise<boolean>;
     fetch: (url: string, init?: RequestInit) => Promise<Response>;
     getLoginUrl: () => URL;
     getLogoutUrl: () => URL;
     getPortalUrl: () => URL;
-    withAuthRequest: <C>(handler: (req: NextRequest, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>) => (req: NextRequest, ctx: C) => Promise<Response>;
+    withAuthRequest: <C, R extends Request = Request>(handler: (req: R, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>) => (req: R, ctx: C) => Promise<Response>;
 };
 declare function createAuditAuthNext(config: AuditAuthConfig): AuditAuthNextFacade;
 

package/dist/guard.cjs

@@ -25,47 +25,72 @@ __export(guard_exports, {
 module.exports = __toCommonJS(guard_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_navigation = require("next/navigation");
 var import_settings = require("./settings.cjs");
 const AuthContext = (0, import_react.createContext)(null);
 const useAuditAuth = () => {
   const ctx = (0, import_react.useContext)(AuthContext);
   if (!ctx) {
-    throw new Error("useAuditAuth must be used within AuditAuthProvider");
+    throw new Error("useAuditAuth must be used within AuditAuthGuard");
   }
   return ctx;
 };
-const AuditAuthGuard = (props) => {
-  const [user, setUser] = (0, import_react.useState)({});
+const defaultFallback = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: "Verificando sesion..." });
+const AuditAuthGuard = ({
+  children,
+  fallback,
+  unauthenticatedFallback,
+  mode = "redirect"
+}) => {
+  const router = (0, import_navigation.useRouter)();
+  const [state, setState] = (0, import_react.useState)({
+    status: "loading",
+    user: null
+  });
   (0, import_react.useEffect)(() => {
-    let cancelled = false;
+    const controller = new AbortController();
     const checkSession = async () => {
       try {
         const response = await fetch(import_settings.SETTINGS.bff.paths.session, {
           credentials: "include",
-          cache: "no-store"
+          cache: "no-store",
+          signal: controller.signal
         });
-        if (cancelled) return;
         if (!response.ok) {
-          window.location.href = import_settings.SETTINGS.bff.paths.login;
+          setState({ status: "unauthenticated", user: null });
+          if (mode === "redirect") router.replace(import_settings.SETTINGS.bff.paths.login);
           return;
         }
         const data = await response.json();
-        setUser(data.user);
+        if (!data?.user || typeof data.user !== "object") {
+          setState({ status: "unauthenticated", user: null });
+          if (mode === "redirect") router.replace(import_settings.SETTINGS.bff.paths.login);
+          return;
+        }
+        setState({ status: "authenticated", user: data.user });
       } catch {
-        window.location.href = import_settings.SETTINGS.bff.paths.login;
+        if (controller.signal.aborted) return;
+        setState({ status: "unauthenticated", user: null });
+        if (mode === "redirect") router.replace(import_settings.SETTINGS.bff.paths.login);
         return;
       }
     };
     checkSession();
     return () => {
-      cancelled = true;
+      controller.abort();
     };
-  }, []);
-  const value = (0, import_react.useMemo)(() => ({
-    user
-  }), [user]);
-  if (!user.name) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthContext.Provider, { value, children: props.children });
+  }, [mode, router]);
+  const value = (0, import_react.useMemo)(() => {
+    if (state.status !== "authenticated") return null;
+    return { user: state.user };
+  }, [state]);
+  if (!value) {
+    if (state.status === "unauthenticated") {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: unauthenticatedFallback ?? fallback ?? defaultFallback });
+    }
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: fallback ?? defaultFallback });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AuthContext.Provider, { value, children });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/guard.d.cts

@@ -1,4 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
+import { ReactNode } from 'react';
 import { SessionUser } from '@auditauth/core';
 
 type AuthContextValue = {
@@ -6,8 +7,11 @@ type AuthContextValue = {
 };
 declare const useAuditAuth: () => AuthContextValue;
 type AuditAuthGuardProps = {
-    children: React.ReactNode;
+    children: ReactNode;
+    fallback?: ReactNode;
+    unauthenticatedFallback?: ReactNode;
+    mode?: 'redirect' | 'fallback';
 };
-declare const AuditAuthGuard: (props: AuditAuthGuardProps) => react_jsx_runtime.JSX.Element | null;
+declare const AuditAuthGuard: ({ children, fallback, unauthenticatedFallback, mode, }: AuditAuthGuardProps) => react_jsx_runtime.JSX.Element;
 
 export { AuditAuthGuard, useAuditAuth };

package/dist/guard.d.ts

@@ -1,4 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
+import { ReactNode } from 'react';
 import { SessionUser } from '@auditauth/core';
 
 type AuthContextValue = {
@@ -6,8 +7,11 @@ type AuthContextValue = {
 };
 declare const useAuditAuth: () => AuthContextValue;
 type AuditAuthGuardProps = {
-    children: React.ReactNode;
+    children: ReactNode;
+    fallback?: ReactNode;
+    unauthenticatedFallback?: ReactNode;
+    mode?: 'redirect' | 'fallback';
 };
-declare const AuditAuthGuard: (props: AuditAuthGuardProps) => react_jsx_runtime.JSX.Element | null;
+declare const AuditAuthGuard: ({ children, fallback, unauthenticatedFallback, mode, }: AuditAuthGuardProps) => react_jsx_runtime.JSX.Element;
 
 export { AuditAuthGuard, useAuditAuth };

package/dist/guard.js

@@ -1,47 +1,72 @@
 "use client";
-import { jsx } from "react/jsx-runtime";
+import { Fragment, jsx } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useMemo, useState } from "react";
+import { useRouter } from "next/navigation";
 import { SETTINGS } from "./settings.js";
 const AuthContext = createContext(null);
 const useAuditAuth = () => {
   const ctx = useContext(AuthContext);
   if (!ctx) {
-    throw new Error("useAuditAuth must be used within AuditAuthProvider");
+    throw new Error("useAuditAuth must be used within AuditAuthGuard");
   }
   return ctx;
 };
-const AuditAuthGuard = (props) => {
-  const [user, setUser] = useState({});
+const defaultFallback = /* @__PURE__ */ jsx("div", { children: "Verificando sesion..." });
+const AuditAuthGuard = ({
+  children,
+  fallback,
+  unauthenticatedFallback,
+  mode = "redirect"
+}) => {
+  const router = useRouter();
+  const [state, setState] = useState({
+    status: "loading",
+    user: null
+  });
   useEffect(() => {
-    let cancelled = false;
+    const controller = new AbortController();
     const checkSession = async () => {
       try {
         const response = await fetch(SETTINGS.bff.paths.session, {
           credentials: "include",
-          cache: "no-store"
+          cache: "no-store",
+          signal: controller.signal
         });
-        if (cancelled) return;
         if (!response.ok) {
-          window.location.href = SETTINGS.bff.paths.login;
+          setState({ status: "unauthenticated", user: null });
+          if (mode === "redirect") router.replace(SETTINGS.bff.paths.login);
           return;
         }
         const data = await response.json();
-        setUser(data.user);
+        if (!data?.user || typeof data.user !== "object") {
+          setState({ status: "unauthenticated", user: null });
+          if (mode === "redirect") router.replace(SETTINGS.bff.paths.login);
+          return;
+        }
+        setState({ status: "authenticated", user: data.user });
       } catch {
-        window.location.href = SETTINGS.bff.paths.login;
+        if (controller.signal.aborted) return;
+        setState({ status: "unauthenticated", user: null });
+        if (mode === "redirect") router.replace(SETTINGS.bff.paths.login);
         return;
       }
     };
     checkSession();
     return () => {
-      cancelled = true;
+      controller.abort();
     };
-  }, []);
-  const value = useMemo(() => ({
-    user
-  }), [user]);
-  if (!user.name) return null;
-  return /* @__PURE__ */ jsx(AuthContext.Provider, { value, children: props.children });
+  }, [mode, router]);
+  const value = useMemo(() => {
+    if (state.status !== "authenticated") return null;
+    return { user: state.user };
+  }, [state]);
+  if (!value) {
+    if (state.status === "unauthenticated") {
+      return /* @__PURE__ */ jsx(Fragment, { children: unauthenticatedFallback ?? fallback ?? defaultFallback });
+    }
+    return /* @__PURE__ */ jsx(Fragment, { children: fallback ?? defaultFallback });
+  }
+  return /* @__PURE__ */ jsx(AuthContext.Provider, { value, children });
 };
 export {
   AuditAuthGuard,

package/dist/index.d.cts

@@ -8,3 +8,4 @@ import 'next/server.js';
 import '@auditauth/core';
 import '@auditauth/node';
 import 'react/jsx-runtime';
+import 'react';

package/dist/index.d.ts

@@ -8,3 +8,4 @@ import 'next/server.js';
 import '@auditauth/core';
 import '@auditauth/node';
 import 'react/jsx-runtime';
+import 'react';

package/dist/sdk.cjs

@@ -257,7 +257,7 @@ class AuditAuthNext {
   }
   async middleware(request) {
     const { access, refresh } = this.getCookieTokens();
-    const url = request.nextUrl;
+    const url = new URL(request.url);
     if (access && refresh) {
       const sid = this.cookies.get(import_settings.SETTINGS.storage_keys.session_id);
       if (!sid) {
@@ -294,19 +294,31 @@ class AuditAuthNext {
     return {
       GET: async (req, ctx) => {
         const action = (await ctx.params).auditauth[0];
-        const redirectUrl = req.nextUrl.searchParams.get("redirectUrl");
+        const redirectUrl = new URL(req.url).searchParams.get("redirectUrl");
         switch (action) {
           case "login":
             {
-              const url = await (0, import_core.buildAuthUrl)({ apiKey: this.config.apiKey, redirectUrl: `${this.config.baseUrl}/api/auditauth/callback` });
-              return import_server.NextResponse.redirect(url);
+              try {
+                const url = await (0, import_core.buildAuthUrl)({
+                  apiKey: this.config.apiKey,
+                  redirectUrl: `${this.config.baseUrl}/api/auditauth/callback`,
+                  cancelUrl: this.config.baseUrl
+                });
+                return import_server.NextResponse.redirect(url);
+              } catch (err) {
+                return new Response("Invalid session", { status: 401 });
+              }
             }
             ;
           case "refresh":
             {
               const { ok } = await this.refresh();
               if (ok) return import_server.NextResponse.redirect(redirectUrl || this.config.redirectUrl);
-              const url = await (0, import_core.buildAuthUrl)({ apiKey: this.config.apiKey, redirectUrl: `${this.config.baseUrl}/api/auditauth/callback` });
+              const url = await (0, import_core.buildAuthUrl)({
+                apiKey: this.config.apiKey,
+                redirectUrl: `${this.config.baseUrl}/api/auditauth/callback`,
+                cancelUrl: this.config.baseUrl
+              });
               return import_server.NextResponse.redirect(url);
             }
             ;
@@ -319,7 +331,7 @@ class AuditAuthNext {
           case "logout":
             {
               await this.logout();
-              return import_server.NextResponse.redirect(this.config.redirectUrl);
+              return import_server.NextResponse.redirect(this.config.baseUrl);
             }
             ;
           case "portal":
@@ -337,8 +349,30 @@ class AuditAuthNext {
           case "session":
             {
               const user = this.getSession();
-              if (!user) return new import_server.NextResponse(null, { status: 401 });
-              return import_server.NextResponse.json({ user });
+              if (user) return import_server.NextResponse.json({ user });
+              try {
+                const { access } = this.getCookieTokens();
+                if (!access) throw new Error("Not auth token");
+                const refreshedUser = await (0, import_core.getSessionUser)({ access_token: access });
+                const session = {
+                  user: refreshedUser
+                };
+                const isSecure = this.isSecureCookie();
+                this.cookies.set(
+                  import_settings.SETTINGS.storage_keys.session,
+                  JSON.stringify(session),
+                  {
+                    httpOnly: true,
+                    sameSite: "lax",
+                    secure: isSecure,
+                    path: "/",
+                    maxAge: 24 * 60 * 60 * 1e3 * 3
+                  }
+                );
+                return import_server.NextResponse.json({ user: refreshedUser });
+              } catch (err) {
+                return new import_server.NextResponse(null, { status: 401 });
+              }
             }
             ;
           default:
@@ -364,7 +398,7 @@ class AuditAuthNext {
             ;
           case "refresh":
             {
-              const redirectUrl = req.nextUrl.searchParams.get("redirectUrl");
+              const redirectUrl = new URL(req.url).searchParams.get("redirectUrl");
               const { ok } = await this.refresh();
               if (ok) return import_server.NextResponse.redirect(redirectUrl || this.config.redirectUrl);
               return new Response("Session expired", { status: 401 });

package/dist/sdk.d.cts

@@ -1,8 +1,9 @@
-import { NextRequest, NextResponse } from 'next/server.js';
+import { NextResponse } from 'next/server.js';
 import { CookieAdapter } from './types.cjs';
 import { AuditAuthConfig, SessionUser } from '@auditauth/core';
 import { AuditAuthTokenPayload } from '@auditauth/node';
 
+type RouteRequest = Request;
 declare class AuditAuthNext {
     private config;
     private cookies;
@@ -22,17 +23,17 @@ declare class AuditAuthNext {
     getPortalUrl(): URL;
     private callback;
     private logout;
-    withAuthRequest<C>(handler: (req: NextRequest, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>): (req: NextRequest, ctx: C) => Promise<Response>;
+    withAuthRequest<C, R extends Request = Request>(handler: (req: R, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>): (req: R, ctx: C) => Promise<Response>;
     fetch(url: string, init?: RequestInit): Promise<Response>;
     private refresh;
-    middleware(request: NextRequest): Promise<NextResponse<unknown>>;
+    middleware(request: RouteRequest): Promise<NextResponse<unknown>>;
     getHandlers(): {
-        GET: (req: NextRequest, ctx: {
+        GET: (req: RouteRequest, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
-        POST: (req: NextRequest, ctx: {
+        POST: (req: RouteRequest, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;

package/dist/sdk.d.ts

@@ -1,8 +1,9 @@
-import { NextRequest, NextResponse } from 'next/server.js';
+import { NextResponse } from 'next/server.js';
 import { CookieAdapter } from './types.js';
 import { AuditAuthConfig, SessionUser } from '@auditauth/core';
 import { AuditAuthTokenPayload } from '@auditauth/node';
 
+type RouteRequest = Request;
 declare class AuditAuthNext {
     private config;
     private cookies;
@@ -22,17 +23,17 @@ declare class AuditAuthNext {
     getPortalUrl(): URL;
     private callback;
     private logout;
-    withAuthRequest<C>(handler: (req: NextRequest, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>): (req: NextRequest, ctx: C) => Promise<Response>;
+    withAuthRequest<C, R extends Request = Request>(handler: (req: R, ctx: C, session: AuditAuthTokenPayload) => Promise<Response>): (req: R, ctx: C) => Promise<Response>;
     fetch(url: string, init?: RequestInit): Promise<Response>;
     private refresh;
-    middleware(request: NextRequest): Promise<NextResponse<unknown>>;
+    middleware(request: RouteRequest): Promise<NextResponse<unknown>>;
     getHandlers(): {
-        GET: (req: NextRequest, ctx: {
+        GET: (req: RouteRequest, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;
         }) => Promise<Response>;
-        POST: (req: NextRequest, ctx: {
+        POST: (req: RouteRequest, ctx: {
             params: Promise<{
                 auditauth: string[];
             }>;

package/dist/sdk.js

@@ -7,7 +7,8 @@ import {
   revokeSession,
   buildPortalUrl,
   refreshTokens,
-  sendMetrics
+  sendMetrics,
+  getSessionUser
 } from "@auditauth/core";
 import { verifyRequest } from "@auditauth/node";
 const CALLBACK_CODE_COOKIE = "auditauth_last_code";
@@ -241,7 +242,7 @@ class AuditAuthNext {
   }
   async middleware(request) {
     const { access, refresh } = this.getCookieTokens();
-    const url = request.nextUrl;
+    const url = new URL(request.url);
     if (access && refresh) {
       const sid = this.cookies.get(SETTINGS.storage_keys.session_id);
       if (!sid) {
@@ -278,19 +279,31 @@ class AuditAuthNext {
     return {
       GET: async (req, ctx) => {
         const action = (await ctx.params).auditauth[0];
-        const redirectUrl = req.nextUrl.searchParams.get("redirectUrl");
+        const redirectUrl = new URL(req.url).searchParams.get("redirectUrl");
         switch (action) {
           case "login":
             {
-              const url = await buildAuthUrl({ apiKey: this.config.apiKey, redirectUrl: `${this.config.baseUrl}/api/auditauth/callback` });
-              return NextResponse.redirect(url);
+              try {
+                const url = await buildAuthUrl({
+                  apiKey: this.config.apiKey,
+                  redirectUrl: `${this.config.baseUrl}/api/auditauth/callback`,
+                  cancelUrl: this.config.baseUrl
+                });
+                return NextResponse.redirect(url);
+              } catch (err) {
+                return new Response("Invalid session", { status: 401 });
+              }
             }
             ;
           case "refresh":
             {
               const { ok } = await this.refresh();
               if (ok) return NextResponse.redirect(redirectUrl || this.config.redirectUrl);
-              const url = await buildAuthUrl({ apiKey: this.config.apiKey, redirectUrl: `${this.config.baseUrl}/api/auditauth/callback` });
+              const url = await buildAuthUrl({
+                apiKey: this.config.apiKey,
+                redirectUrl: `${this.config.baseUrl}/api/auditauth/callback`,
+                cancelUrl: this.config.baseUrl
+              });
               return NextResponse.redirect(url);
             }
             ;
@@ -303,7 +316,7 @@ class AuditAuthNext {
           case "logout":
             {
               await this.logout();
-              return NextResponse.redirect(this.config.redirectUrl);
+              return NextResponse.redirect(this.config.baseUrl);
             }
             ;
           case "portal":
@@ -321,8 +334,30 @@ class AuditAuthNext {
           case "session":
             {
               const user = this.getSession();
-              if (!user) return new NextResponse(null, { status: 401 });
-              return NextResponse.json({ user });
+              if (user) return NextResponse.json({ user });
+              try {
+                const { access } = this.getCookieTokens();
+                if (!access) throw new Error("Not auth token");
+                const refreshedUser = await getSessionUser({ access_token: access });
+                const session = {
+                  user: refreshedUser
+                };
+                const isSecure = this.isSecureCookie();
+                this.cookies.set(
+                  SETTINGS.storage_keys.session,
+                  JSON.stringify(session),
+                  {
+                    httpOnly: true,
+                    sameSite: "lax",
+                    secure: isSecure,
+                    path: "/",
+                    maxAge: 24 * 60 * 60 * 1e3 * 3
+                  }
+                );
+                return NextResponse.json({ user: refreshedUser });
+              } catch (err) {
+                return new NextResponse(null, { status: 401 });
+              }
             }
             ;
           default:
@@ -348,7 +383,7 @@ class AuditAuthNext {
             ;
           case "refresh":
             {
-              const redirectUrl = req.nextUrl.searchParams.get("redirectUrl");
+              const redirectUrl = new URL(req.url).searchParams.get("redirectUrl");
               const { ok } = await this.refresh();
               if (ok) return NextResponse.redirect(redirectUrl || this.config.redirectUrl);
               return new Response("Session expired", { status: 401 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auditauth/next",
-  "version": "0.2.0-beta.5",
+  "version": "0.2.0-beta.7",
   "description": "AuditAuth NextJS SDK",
   "license": "MIT",
   "author": "Nimibyte",
@@ -53,8 +53,8 @@
     "react-dom": ">=18"
   },
   "dependencies": {
-    "@auditauth/core": "^0.2.0-beta.5",
-    "@auditauth/node": "^0.2.0-beta.5"
+    "@auditauth/core": "^0.2.0-beta.7",
+    "@auditauth/node": "^0.2.0-beta.7"
   },
   "devDependencies": {
     "typescript": "^5.9.0",