@monocloud/auth-nextjs 0.1.3 → 0.1.5

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-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-CsBjAJce.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";
@@ -268,8 +268,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 +308,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 +764,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 +777,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 +877,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

@@ -1,6 +1,6 @@
 import { MonoCloudAuthBaseError, MonoCloudCoreClient, MonoCloudHttpError, MonoCloudOPError, MonoCloudTokenError, MonoCloudValidationError, MonoCloudValidationError as MonoCloudValidationError$1 } from "@monocloud/auth-node-core";
 import { NextRequest, NextResponse } from "next/server.js";
-import { ensureLeadingSlash, isAbsoluteUrl } from "@monocloud/auth-node-core/internal";
+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";
@@ -221,11 +221,28 @@ const isMonoCloudResponse = (res) => res instanceof MonoCloudAppRouterResponse |
 const isAppRouter = (req) => req instanceof Request || req.headers instanceof Headers || typeof req.bodyUsed === "boolean";
 const getNextRequest = (req) => {
 	if (req instanceof NextRequest) return req;
-	return new NextRequest(req);
+	return new NextRequest(req.url, {
+		method: req.method,
+		headers: req.headers,
+		body: req.body,
+		duplex: req.duplex ?? "half"
+	});
 };
 const getNextResponse = (res) => {
 	if (res instanceof NextResponse) return res;
-	if (res instanceof Response) return new NextResponse(res.body, res);
+	if (res instanceof Response) {
+		const nextResponse = new NextResponse(res.body, {
+			status: res.status,
+			statusText: res.statusText,
+			headers: res.headers,
+			url: res.url
+		});
+		try {
+			/* v8 ignore else -- @preserve */
+			if (!isPresent(nextResponse.url)) nextResponse.url = res.url;
+		} catch {}
+		return nextResponse;
+	}
 	return new NextResponse();
 };
 const getMonoCloudCookieReqRes = (req, resOrCtx) => {
@@ -441,7 +458,7 @@ var MonoCloudNextClient = class {
 	constructor(options) {
 		const opt = {
 			...options ?? {},
-			userAgent: (options === null || options === void 0 ? void 0 : options.userAgent) ?? `@monocloud/auth-nextjs@0.1.3`,
+			userAgent: (options === null || options === void 0 ? void 0 : options.userAgent) ?? `@monocloud/auth-nextjs@0.1.5`,
 			debugger: (options === null || options === void 0 ? void 0 : options.debugger) ?? "@monocloud:auth-nextjs"
 		};
 		this.registerPublicEnvVariables();
@@ -560,7 +577,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
 				});
@@ -602,11 +619,11 @@ 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$1 = 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 ?? {} }
@@ -648,8 +665,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)]);
 			}
@@ -666,7 +683,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);
@@ -730,10 +747,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);