@monocloud/auth-nextjs 0.1.3 → 0.1.5

package/dist/components/index.d.mts

@@ -1,4 +1,4 @@
-import { i as ExtraAuthParams } from "../types-DOfZTKa6.mjs";
+import { i as ExtraAuthParams } from "../types-CsBjAJce.mjs";
 import React, { JSX } from "react";
 
 //#region src/components/signin.d.ts

package/dist/index.cjs

@@ -222,11 +222,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 next_server_js.NextRequest) return req;
-	return new next_server_js.NextRequest(req);
+	return new next_server_js.NextRequest(req.url, {
+		method: req.method,
+		headers: req.headers,
+		body: req.body,
+		duplex: req.duplex ?? "half"
+	});
 };
 const getNextResponse = (res) => {
 	if (res instanceof next_server_js.NextResponse) return res;
-	if (res instanceof Response) return new next_server_js.NextResponse(res.body, res);
+	if (res instanceof Response) {
+		const nextResponse = new next_server_js.NextResponse(res.body, {
+			status: res.status,
+			statusText: res.statusText,
+			headers: res.headers,
+			url: res.url
+		});
+		try {
+			/* v8 ignore else -- @preserve */
+			if (!(0, _monocloud_auth_node_core_internal.isPresent)(nextResponse.url)) nextResponse.url = res.url;
+		} catch {}
+		return nextResponse;
+	}
 	return new next_server_js.NextResponse();
 };
 const getMonoCloudCookieReqRes = (req, resOrCtx) => {
@@ -442,7 +459,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();
@@ -561,7 +578,7 @@ var MonoCloudNextClient = class {
 				return redirect(signInRoute.toString());
 			}
 			if ((options === null || options === void 0 ? void 0 : options.groups) && !(0, _monocloud_auth_node_core_utils.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
 				});
@@ -603,11 +620,11 @@ var MonoCloudNextClient = class {
 				} };
 			}
 			if ((options === null || options === void 0 ? void 0 : options.groups) && !(0, _monocloud_auth_node_core_utils.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 ?? {} }
@@ -649,8 +666,8 @@ var MonoCloudNextClient = class {
 			return mergeResponse([res, next_server_js.NextResponse.json({ message: "unauthorized" }, { status: 401 })]);
 		}
 		if ((options === null || options === void 0 ? void 0 : options.groups) && !(0, _monocloud_auth_node_core_utils.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 next_server_js.NextResponse) return mergeResponse([res, result]);
 				return mergeResponse([res, new next_server_js.NextResponse(result.body, result)]);
 			}
@@ -667,7 +684,7 @@ var MonoCloudNextClient = class {
 			return res.status(401).json({ message: "unauthorized" });
 		}
 		if ((options === null || options === void 0 ? void 0 : options.groups) && !(0, _monocloud_auth_node_core_utils.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);
@@ -731,10 +748,9 @@ var MonoCloudNextClient = class {
 			return mergeResponse([nxtResp, next_server_js.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 && !(0, _monocloud_auth_node_core_utils.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 next_server_js.NextResponse) return mergeResponse([nxtResp, result]);
 				if (result) return mergeResponse([nxtResp, new next_server_js.NextResponse(result.body, result)]);
 				return next_server_js.NextResponse.next(nxtResp);