@monocloud/auth-nextjs 0.1.4 → 0.1.6

package/dist/index.d.mts

@@ -1,12 +1,11 @@
-import { _ as ProtectPagePageOptions, a as GroupOptions, b as RedirectToSignInOptions, c as MonoCloudAuthOptions, d as PageRouterApiOnAccessDeniedHandler, f as ProtectApiAppOptions, g as ProtectPagePageOnAccessDeniedType, h as ProtectOptions, i as ExtraAuthParams, l as MonoCloudMiddlewareOptions, m as ProtectAppPageOptions, n as AppRouterApiOnAccessDeniedHandler, o as IsUserInGroupOptions, p as ProtectApiPageOptions, r as AppRouterPageHandler, s as MonoCloudAuthHandler, t as AppRouterApiHandlerFn, u as NextMiddlewareResult, v as ProtectPagePageReturnType, x as RedirectToSignOutOptions, y as ProtectedAppServerComponent } from "./types-DOfZTKa6.mjs";
+import { _ as ProtectPagePageOptions, a as GroupOptions, b as RedirectToSignInOptions, c as MonoCloudAuthOptions, d as PageRouterApiOnAccessDeniedHandler, f as ProtectApiAppOptions, g as ProtectPagePageOnAccessDeniedType, h as ProtectOptions, i as ExtraAuthParams, l as MonoCloudMiddlewareOptions, m as ProtectAppPageOptions, n as AppRouterApiOnAccessDeniedHandler, o as IsUserInGroupOptions, p as ProtectApiPageOptions, r as AppRouterPageHandler, s as MonoCloudAuthHandler, t as AppRouterApiHandlerFn, u as NextMiddlewareResult, v as ProtectPagePageReturnType, x as RedirectToSignOutOptions, y as ProtectedAppServerComponent } from "./types-Cx32VRoI.mjs";
 import { AccessToken, GetTokensOptions, GetTokensOptions as GetTokensOptions$1, MonoCloudAuthBaseError, MonoCloudCoreClient, MonoCloudHttpError, MonoCloudOPError, MonoCloudOidcClient, MonoCloudOptions, MonoCloudOptions as MonoCloudOptions$1, MonoCloudSession, MonoCloudSession as MonoCloudSession$1, MonoCloudTokenError, MonoCloudTokens, MonoCloudTokens as MonoCloudTokens$1, MonoCloudUser, MonoCloudValidationError } from "@monocloud/auth-node-core";
 import { NextFetchEvent, NextMiddleware, NextProxy, NextRequest, NextResponse } from "next/server.js";
-import { IncomingMessage, ServerResponse } from "node:http";
 import { NextApiHandler, NextApiRequest, NextApiResponse } from "next/types";
 import { ParsedUrlQuery } from "node:querystring";
+import { IncomingMessage, ServerResponse } from "node:http";
 
 //#region src/monocloud-next-client.d.ts
-
 /**
  * The MonoCloud Next.js Client.
  *
@@ -268,8 +267,8 @@ declare class MonoCloudNextClient {
    *
    * Restricts access to server-rendered pages in your Next.js App Router application, ensures that only authenticated (and optionally authorized) users can view the page.
    *
-   * **Note⚠️ - When using groups to protect a page, 'Access Denied' is rendered by default when the user does not have
-   * enough permissions. To display a custom component, pass the `onAccessDenied` parameter.**
+   * **Note⚠️ - When using groups to protect a page, 'Access Denied' is rendered by default when the user does not belong to the groups.
+   *  To display a custom component, pass the `onGroupAccessDenied` parameter.**
    *
    * @param component The App Router server component that protectPage wraps and secures
    * @param options App Router `protectPage()` configuration options
@@ -308,9 +307,9 @@ declare class MonoCloudNextClient {
    *
    * Restricts access to server-rendered pages in your Next.js Pages Router application, ensures that only authenticated (and optionally authorized) users can view the page.
    *
-   * **Note⚠️ - When using groups to protect a page, the page will be rendered even if the user does not have
-   * enough permissions. You should check the props for `accessDenied` boolean value to determine whether the user is
-   * allowed to accesss the page. Alternatively, you can pass `onAccessDenied` parameter to return custom props.**
+   * **Note⚠️ - When using groups to protect a page, the page will be rendered even if the user does not belong to the groups.
+   * You should check the props for `groupAccessDenied` boolean value to determine whether the user is
+   * allowed to access the page. Alternatively, you can pass `onGroupAccessDenied` parameter to return custom props.**
    *
    * @param options Pages Router `protectPage()` configuration options
    *
@@ -764,8 +763,12 @@ declare class MonoCloudNextClient {
    * @example SSR Component
    *
    * ```typescript
-   * import { monoCloud } from "@/lib/monocloud";
-   * import type { GetServerSideProps, InferGetServerSidePropsType } from "next";
+   * import { monoCloud } from "@/monocloud";
+   * import type {
+   *   GetServerSideProps,
+   *   GetServerSidePropsContext,
+   *   InferGetServerSidePropsType,
+   * } from "next";
    *
    * type HomeProps = InferGetServerSidePropsType<typeof getServerSideProps>;
    *
@@ -773,15 +776,20 @@ declare class MonoCloudNextClient {
    *   return <pre>Session: {JSON.stringify(session, null, 2)}</pre>;
    * }
    *
-   * export const getServerSideProps: GetServerSideProps = async (context) => {
-   *   const session = await monoCloud.getSession(context.req, context.res);
+   * export const getServerSideProps = (async (
+   *   context: GetServerSidePropsContext,
+   * ) => {
+   *   const session = await monoCloud.getSession(
+   *     context.req,
+   *     context.res,
+   *   );
    *
    *   return {
    *     props: {
    *       session: session ?? null,
    *     },
    *   };
-   * };
+   * }) satisfies GetServerSideProps;
    * ```
    */
   getSession(req: NextApiRequest | IncomingMessage, res: NextApiResponse | ServerResponse<IncomingMessage>): Promise<MonoCloudSession$1 | undefined>;
@@ -868,7 +876,7 @@ declare class MonoCloudNextClient {
    *
    *  The default token is an access token with scopes set through `MONOCLOUD_AUTH_SCOPES` or
    * `options.defaultAuthParams.scopes`, and resources set through `MONOCLOUD_AUTH_RESOURCE` or
-   * `options.defaultAuthParams.resource`. This token is refreshed when calling getTokens without parameters.
+   * `options.defaultAuthParams.resource`. This token is refreshed when calling getTokens without resource and scopes parameters.
    *
    * ```typescript
    * import { NextResponse } from "next/server";

package/dist/index.mjs

@@ -3,7 +3,6 @@ import { NextRequest, NextResponse } from "next/server.js";
 import { ensureLeadingSlash, isAbsoluteUrl, isPresent } from "@monocloud/auth-node-core/internal";
 import { isUserInGroup } from "@monocloud/auth-node-core/utils";
 import { serialize } from "cookie";
-import { IncomingMessage, ServerResponse } from "node:http";
 
 //#region src/requests/monocloud-app-router-request.ts
 var MonoCloudAppRouterRequest = class {
@@ -219,6 +218,12 @@ var MonoCloudCookieRequest = class {
 const isMonoCloudRequest = (req) => req instanceof MonoCloudAppRouterRequest || req instanceof MonoCloudPageRouterRequest || req instanceof MonoCloudCookieRequest;
 const isMonoCloudResponse = (res) => res instanceof MonoCloudAppRouterResponse || res instanceof MonoCloudPageRouterResponse || res instanceof MonoCloudCookieResponse;
 const isAppRouter = (req) => req instanceof Request || req.headers instanceof Headers || typeof req.bodyUsed === "boolean";
+const isNodeRequest = (req) => {
+	return !!(req && typeof req === "object" && "headers" in req && !("bodyUsed" in req) && typeof req.on === "function");
+};
+const isNodeResponse = (res) => {
+	return !!(res && typeof res === "object" && "setHeader" in res && typeof res.setHeader === "function" && "end" in res && typeof res.end === "function");
+};
 const getNextRequest = (req) => {
 	if (req instanceof NextRequest) return req;
 	return new NextRequest(req.url, {
@@ -252,7 +257,7 @@ const getMonoCloudCookieReqRes = (req, resOrCtx) => {
 		request = new MonoCloudAppRouterRequest(getNextRequest(req));
 		response = resOrCtx instanceof Response ? new MonoCloudAppRouterResponse(getNextResponse(resOrCtx)) : new MonoCloudCookieResponse();
 	} else {
-		if (!(req instanceof IncomingMessage) || !(resOrCtx instanceof ServerResponse)) throw new MonoCloudValidationError$1("Invalid pages router request and response");
+		if (!isNodeRequest(req) || !isNodeResponse(resOrCtx)) throw new MonoCloudValidationError$1("Invalid pages router request and response");
 		request = new MonoCloudPageRouterRequest(req);
 		response = new MonoCloudPageRouterResponse(resOrCtx);
 	}
@@ -458,7 +463,7 @@ var MonoCloudNextClient = class {
 	constructor(options) {
 		const opt = {
 			...options ?? {},
-			userAgent: (options === null || options === void 0 ? void 0 : options.userAgent) ?? `@monocloud/auth-nextjs@0.1.4`,
+			userAgent: (options === null || options === void 0 ? void 0 : options.userAgent) ?? `@monocloud/auth-nextjs@0.1.6`,
 			debugger: (options === null || options === void 0 ? void 0 : options.debugger) ?? "@monocloud:auth-nextjs"
 		};
 		this.registerPublicEnvVariables();
@@ -577,7 +582,7 @@ var MonoCloudNextClient = class {
 				return redirect(signInRoute.toString());
 			}
 			if ((options === null || options === void 0 ? void 0 : options.groups) && !isUserInGroup(session.user, options.groups, options.groupsClaim ?? process.env.MONOCLOUD_AUTH_GROUPS_CLAIM, options.matchAll)) {
-				if (options.onAccessDenied) return options.onAccessDenied({
+				if (options.onGroupAccessDenied) return options.onGroupAccessDenied({
 					...params,
 					user: session.user
 				});
@@ -595,10 +600,10 @@ var MonoCloudNextClient = class {
 			if (!session) {
 				var _options$authParams10, _options$authParams11, _options$authParams12, _options$authParams13, _options$authParams14, _options$authParams15, _options$authParams16, _options$authParams17, _options$authParams18;
 				if (options === null || options === void 0 ? void 0 : options.onAccessDenied) {
-					const customProps$1 = await options.onAccessDenied({ ...context });
+					const customProps = await options.onAccessDenied({ ...context });
 					return {
-						...customProps$1 ?? {},
-						props: { ...(customProps$1 === null || customProps$1 === void 0 ? void 0 : customProps$1.props) ?? {} }
+						...customProps ?? {},
+						props: { ...(customProps === null || customProps === void 0 ? void 0 : customProps.props) ?? {} }
 					};
 				}
 				const { routes, appUrl } = this.getOptions();
@@ -619,14 +624,14 @@ var MonoCloudNextClient = class {
 				} };
 			}
 			if ((options === null || options === void 0 ? void 0 : options.groups) && !isUserInGroup(session.user, options.groups, options.groupsClaim ?? process.env.MONOCLOUD_AUTH_GROUPS_CLAIM, options.matchAll)) {
-				var _options$onAccessDeni;
-				const customProps$1 = await ((_options$onAccessDeni = options.onAccessDenied) === null || _options$onAccessDeni === void 0 ? void 0 : _options$onAccessDeni.call(options, {
+				var _options$onGroupAcces;
+				const customProps = await ((_options$onGroupAcces = options.onGroupAccessDenied) === null || _options$onGroupAcces === void 0 ? void 0 : _options$onGroupAcces.call(options, {
 					...context,
 					user: session.user
-				})) ?? { props: { accessDenied: true } };
+				})) ?? { props: { groupAccessDenied: true } };
 				return {
-					...customProps$1,
-					props: { ...customProps$1.props ?? {} }
+					...customProps,
+					props: { ...customProps.props ?? {} }
 				};
 			}
 			const customProps = (options === null || options === void 0 ? void 0 : options.getServerSideProps) ? await options.getServerSideProps(context) : {};
@@ -665,8 +670,8 @@ var MonoCloudNextClient = class {
 			return mergeResponse([res, NextResponse.json({ message: "unauthorized" }, { status: 401 })]);
 		}
 		if ((options === null || options === void 0 ? void 0 : options.groups) && !isUserInGroup(session.user, options.groups, options.groupsClaim ?? process.env.MONOCLOUD_AUTH_GROUPS_CLAIM, options.matchAll)) {
-			if (options.onAccessDenied) {
-				const result = await options.onAccessDenied(req, ctx);
+			if (options.onGroupAccessDenied) {
+				const result = await options.onGroupAccessDenied(req, ctx, session.user);
 				if (result instanceof NextResponse) return mergeResponse([res, result]);
 				return mergeResponse([res, new NextResponse(result.body, result)]);
 			}
@@ -683,7 +688,7 @@ var MonoCloudNextClient = class {
 			return res.status(401).json({ message: "unauthorized" });
 		}
 		if ((options === null || options === void 0 ? void 0 : options.groups) && !isUserInGroup(session.user, options.groups, options.groupsClaim ?? process.env.MONOCLOUD_AUTH_GROUPS_CLAIM, options.matchAll)) {
-			if (options.onAccessDenied) return options.onAccessDenied(req, res, session.user);
+			if (options.onGroupAccessDenied) return options.onGroupAccessDenied(req, res, session.user);
 			return res.status(403).json({ message: "forbidden" });
 		}
 		return handler(req, res);
@@ -747,10 +752,9 @@ var MonoCloudNextClient = class {
 			return mergeResponse([nxtResp, NextResponse.redirect(signInRoute)]);
 		}
 		const groupsClaim = (options === null || options === void 0 ? void 0 : options.groupsClaim) ?? process.env.MONOCLOUD_AUTH_GROUPS_CLAIM;
-		const onAccessDenied = options === null || options === void 0 ? void 0 : options.onAccessDenied;
 		if (allowedGroups && !isUserInGroup(session.user, allowedGroups, groupsClaim)) {
-			if (onAccessDenied) {
-				const result = await onAccessDenied(req, evt, session.user);
+			if (options === null || options === void 0 ? void 0 : options.onGroupAccessDenied) {
+				const result = await options.onGroupAccessDenied(req, evt, session.user);
 				if (result instanceof NextResponse) return mergeResponse([nxtResp, result]);
 				if (result) return mergeResponse([nxtResp, new NextResponse(result.body, result)]);
 				return NextResponse.next(nxtResp);
@@ -800,7 +804,7 @@ var MonoCloudNextClient = class {
 			({request, response} = getMonoCloudCookieReqRes(args[0], void 0));
 			options = args[1];
 		}
-		else if (args.length === 2 && args[0] instanceof IncomingMessage && args[1] instanceof ServerResponse) ({request, response} = getMonoCloudCookieReqRes(args[0], args[1]));
+		else if (args.length === 2 && isNodeRequest(args[0]) && isNodeResponse(args[1])) ({request, response} = getMonoCloudCookieReqRes(args[0], args[1]));
 		else {
 			({request, response} = getMonoCloudCookieReqRes(args[0], args[1]));
 			options = args[2];
@@ -913,7 +917,7 @@ var MonoCloudNextClient = class {
 				groups = args[1];
 				options = args[2];
 			}
-			if (args[0] instanceof IncomingMessage && args[1] instanceof ServerResponse) {
+			if (isNodeRequest(args[0]) && isNodeResponse(args[1])) {
 				({request, response} = getMonoCloudCookieReqRes(args[0], args[1]));
 				groups = args[2];
 			}