studiocms 0.1.0-beta.24 → 0.1.0-beta.26

package/src/routes/api/dashboard/create-reset-link.ts

@@ -2,67 +2,76 @@ import { developerConfig } from 'studiocms:config';
 import { apiResponseLogger } from 'studiocms:logger';
 import { Notifications } from 'studiocms:notifier';
 import { SDKCore } from 'studiocms:sdk';
-import type { APIContext, APIRoute } from 'astro';
-import { Effect } from 'effect';
-import { convertToVanilla, genLogger } from '../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../lib/endpointResponses.js';
-
-export const POST: APIRoute = async (context: APIContext): Promise<Response> =>
-	await convertToVanilla(
-		genLogger('studiocms/routes/api/dashboard/create-reset-link.POST')(function* () {
-			const notify = yield* Notifications;
-			const sdk = yield* SDKCore;
-
-			// Check if demo mode is enabled
-			if (developerConfig.demoMode !== false) {
-				return apiResponseLogger(403, 'Demo mode is enabled, this action is not allowed.');
-			}
-
-			// Get user data
-			const userData = context.locals.userSessionData;
-
-			// Check if user is logged in
-			if (!userData.isLoggedIn) {
-				return apiResponseLogger(403, 'Unauthorized');
-			}
-
-			// Check if user has permission
-			const isAuthorized = context.locals.userPermissionLevel.isAdmin;
-			if (!isAuthorized) {
-				return apiResponseLogger(403, 'Unauthorized');
-			}
-
-			const jsonData = yield* Effect.tryPromise(() => context.request.json());
-
-			const { userId } = jsonData;
-
-			if (!userId) {
-				return apiResponseLogger(400, 'Invalid form data, userId is required');
-			}
-
-			const token = yield* sdk.resetTokenBucket.new(userId);
-
-			if (!token) {
-				return apiResponseLogger(500, 'Failed to create reset link');
-			}
-
-			const user = yield* sdk.GET.users.byId(userId);
-
-			if (!user) {
-				return apiResponseLogger(404, 'User not found');
-			}
-
-			yield* notify.sendAdminNotification('user_updated', user.username);
-
-			return new Response(JSON.stringify(token), {
-				headers: {
-					'content-type': 'application/json',
-				},
-				status: 200,
-			});
-		}).pipe(Notifications.Provide)
-	);
-
-export const OPTIONS: APIRoute = async () => OptionsResponse(['POST']);
-
-export const ALL: APIRoute = async () => AllResponse();
+import {
+	AllResponse,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+	readAPIContextJson,
+} from '../../../effect.js';
+
+export const { POST, OPTIONS, ALL } = createEffectAPIRoutes(
+	{
+		POST: (ctx) =>
+			genLogger('studiocms/routes/api/dashboard/create-reset-link.POST')(function* () {
+				const [notify, sdk] = yield* Effect.all([Notifications, SDKCore]);
+
+				// Check if demo mode is enabled
+				if (developerConfig.demoMode !== false) {
+					return apiResponseLogger(403, 'Demo mode is enabled, this action is not allowed.');
+				}
+
+				// Get user data
+				const userData = ctx.locals.StudioCMS.security?.userSessionData;
+
+				// Check if user is logged in
+				if (!userData?.isLoggedIn) {
+					return apiResponseLogger(403, 'Unauthorized');
+				}
+
+				// Check if user has permission
+				const isAuthorized = ctx.locals.StudioCMS.security?.userPermissionLevel.isAdmin;
+				if (!isAuthorized) {
+					return apiResponseLogger(403, 'Unauthorized');
+				}
+
+				const { userId } = yield* readAPIContextJson<{ userId: string }>(ctx);
+
+				if (!userId) {
+					return apiResponseLogger(400, 'Invalid form data, userId is required');
+				}
+
+				const token = yield* sdk.resetTokenBucket.new(userId);
+
+				if (!token) {
+					return apiResponseLogger(500, 'Failed to create reset link');
+				}
+
+				const user = yield* sdk.GET.users.byId(userId);
+
+				if (!user) {
+					return apiResponseLogger(404, 'User not found');
+				}
+
+				yield* notify.sendAdminNotification('user_updated', user.username);
+
+				return createJsonResponse(token);
+			}).pipe(Notifications.Provide),
+		OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ['POST'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['POST', 'OPTIONS'] },
+		onError: (error) => {
+			console.error('API Error:', error);
+			return createJsonResponse(
+				{ error: 'Internal Server Error' },
+				{
+					status: 500,
+				}
+			);
+		},
+	}
+);

package/src/routes/api/dashboard/create-user-invite.ts

@@ -4,18 +4,26 @@ import { Mailer } from 'studiocms:mailer';
 import getTemplate from 'studiocms:mailer/templates';
 import { Notifications } from 'studiocms:notifier';
 import { SDKCore } from 'studiocms:sdk';
-import type { APIContext, APIRoute } from 'astro';
+import type { AvailablePermissionRanks } from '@withstudiocms/auth-kit/types';
+import type { APIContext } from 'astro';
 import { z } from 'astro/zod';
-import { Effect, pipe } from 'effect';
-import { dual } from 'effect/Function';
-import { convertToVanilla, genLogger } from '../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../lib/endpointResponses.js';
+import {
+	AllResponse,
+	appendSearchParamsToUrl,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+	pipe,
+	readAPIContextJson,
+} from '../../../effect.js';
 
 type JSONData = {
 	username: string | undefined;
 	email: string | undefined;
 	displayname: string | undefined;
-	rank: 'owner' | 'admin' | 'editor' | 'visitor' | undefined;
+	rank: AvailablePermissionRanks | undefined;
 	originalUrl: string;
 };
 
@@ -25,19 +33,13 @@ type Token = {
 	token: string;
 };
 
-const appendParams = dual<
-	(name: string, value: string) => (url: URL) => URL,
-	(url: URL, name: string, value: string) => URL
->(3, (url, name, value) => {
-	url.searchParams.append(name, value);
-	return url;
-});
-
 const generateResetUrl = (
 	{
 		locals: {
-			routeMap: {
-				mainLinks: { dashboardIndex },
+			StudioCMS: {
+				routeMap: {
+					mainLinks: { dashboardIndex },
+				},
 			},
 		},
 	}: APIContext,
@@ -47,155 +49,171 @@ const generateResetUrl = (
 	const resetURL = new URL(`${dashboardIndex}/password-reset`, baseUrl);
 	return pipe(
 		resetURL,
-		appendParams('userid', userId),
-		appendParams('token', token),
-		appendParams('id', id)
+		appendSearchParamsToUrl('userid', userId),
+		appendSearchParamsToUrl('token', token),
+		appendSearchParamsToUrl('id', id)
 	);
 };
 
 const noMailerError = (message: string, resetLink: URL) =>
 	`Failed to send email: ${message}. You can provide the following Reset link to your User: ${resetLink}`;
 
-export const POST: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studiocms/routes/api/dashboard/create-user-invite.POST')(function* () {
-			const userHelper = yield* User;
-			const mailer = yield* Mailer;
-			const notify = yield* Notifications;
-			const sdk = yield* SDKCore;
-
-			const siteConfig = context.locals.siteConfig.data;
-
-			if (!siteConfig) {
-				return apiResponseLogger(500, 'Failed to get site config');
-			}
-
-			// Get user data
-			const userData = context.locals.userSessionData;
-
-			// Check if user is logged in
-			if (!userData.isLoggedIn) {
-				return apiResponseLogger(403, 'Unauthorized');
-			}
-
-			// Check if user has permission
-			const isAuthorized = context.locals.userPermissionLevel.isAdmin;
-			if (!isAuthorized) {
-				return apiResponseLogger(403, 'Unauthorized');
-			}
-
-			const jsonData: JSONData = yield* Effect.tryPromise(() => context.request.json());
-
-			const { username, email, displayname, rank, originalUrl } = jsonData;
-
-			// If the username, password, email, or display name is missing, return an error
-			if (!username) {
-				return apiResponseLogger(400, 'Missing field: Username is required');
-			}
-
-			if (!email) {
-				return apiResponseLogger(400, 'Missing field: Email is required');
-			}
-
-			if (!displayname) {
-				return apiResponseLogger(400, 'Missing field: Display name is required');
-			}
-
-			if (!rank) {
-				return apiResponseLogger(400, 'Missing field: Rank is required');
-			}
-
-			// If the username is invalid, return an error
-			const verifyUsernameResponse = yield* userHelper.verifyUsernameInput(username);
-			if (verifyUsernameResponse !== true) {
-				return apiResponseLogger(400, verifyUsernameResponse);
-			}
-
-			// If the email is invalid, return an error
-			const checkEmail = z.coerce
-				.string()
-				.email({ message: 'Email address is invalid' })
-				.safeParse(email);
-
-			if (!checkEmail.success) {
-				return apiResponseLogger(400, `Invalid email: ${checkEmail.error.message}`);
-			}
-
-			const { usernameSearch, emailSearch } = yield* sdk.AUTH.user.searchUsersForUsernameOrEmail(
-				username,
-				checkEmail.data
-			);
+export const { POST, OPTIONS, ALL } = createEffectAPIRoutes(
+	{
+		POST: (ctx) =>
+			genLogger('studiocms/routes/api/dashboard/create-user-invite.POST')(function* () {
+				const [userHelper, mailer, notify, sdk] = yield* Effect.all([
+					User,
+					Mailer,
+					Notifications,
+					SDKCore,
+				]);
+
+				const siteConfig = ctx.locals.StudioCMS.siteConfig.data;
+
+				if (!siteConfig) {
+					return apiResponseLogger(500, 'Failed to get site config');
+				}
 
-			if (usernameSearch.length > 0) {
-				return apiResponseLogger(400, 'Invalid username: Username is already in use');
-			}
+				// Get user data
+				const userData = ctx.locals.StudioCMS.security?.userSessionData;
 
-			if (emailSearch.length > 0) {
-				return apiResponseLogger(400, 'Invalid email: Email is already in use');
-			}
+				// Check if user is logged in
+				if (!userData?.isLoggedIn) {
+					return apiResponseLogger(403, 'Unauthorized');
+				}
 
-			// Creates a new user invite
-			const newUser = yield* sdk.AUTH.user.create(
-				{
-					username,
-					email: checkEmail.data,
-					name: displayname,
-					createdAt: new Date(),
-					id: crypto.randomUUID(),
-				},
-				rank
-			);
+				// Check if user has permission
+				const isAuthorized = ctx.locals.StudioCMS.security?.userPermissionLevel.isAdmin;
+				if (!isAuthorized) {
+					return apiResponseLogger(403, 'Unauthorized');
+				}
 
-			const token = yield* sdk.resetTokenBucket.new(newUser.id);
+				const { username, email, displayname, rank, originalUrl } =
+					yield* readAPIContextJson<JSONData>(ctx);
 
-			if (!token) {
-				return apiResponseLogger(500, 'Failed to create reset token');
-			}
+				// If the username, password, email, or display name is missing, return an error
+				if (!username) {
+					return apiResponseLogger(400, 'Missing field: Username is required');
+				}
 
-			const resetLink = generateResetUrl(context, originalUrl, token);
+				if (!email) {
+					return apiResponseLogger(400, 'Missing field: Email is required');
+				}
 
-			yield* notify.sendAdminNotification('new_user', newUser.username);
+				if (!displayname) {
+					return apiResponseLogger(400, 'Missing field: Display name is required');
+				}
 
-			if (siteConfig.enableMailer) {
-				const checkMailConnection = yield* mailer.verifyMailConnection;
+				if (!rank) {
+					return apiResponseLogger(400, 'Missing field: Rank is required');
+				}
 
-				if (!checkMailConnection) {
-					return apiResponseLogger(
-						500,
-						noMailerError('Failed to connect to mail server', resetLink)
-					);
+				const userPerms = ctx.locals.StudioCMS.security?.userPermissionLevel;
+				if (rank === 'owner' && !userPerms?.isOwner) {
+					return apiResponseLogger(403, 'Unauthorized');
 				}
 
-				if ('error' in checkMailConnection) {
-					return apiResponseLogger(
-						500,
-						noMailerError('Failed to connect to mail server', resetLink)
-					);
+				// If the email is invalid, return an error
+				const checkEmail = z.coerce
+					.string()
+					.email({ message: 'Email address is invalid' })
+					.safeParse(email);
+
+				if (!checkEmail.success) {
+					return apiResponseLogger(400, `Invalid email: ${checkEmail.error.message}`);
 				}
 
-				const htmlTemplate = getTemplate('userInvite');
+				const [verifyUsernameResponse, { usernameSearch, emailSearch }] = yield* Effect.all([
+					userHelper.verifyUsernameInput(username),
+					sdk.AUTH.user.searchUsersForUsernameOrEmail(username, checkEmail.data),
+				]);
+
+				if (verifyUsernameResponse !== true) {
+					return apiResponseLogger(400, verifyUsernameResponse);
+				}
 
-				const mailResponse = yield* mailer.sendMail({
-					to: checkEmail.data,
-					subject: `You have been invited to join ${siteConfig.title}!`,
-					html: htmlTemplate({ title: siteConfig.title, link: resetLink }),
-				});
+				if (usernameSearch.length > 0) {
+					return apiResponseLogger(400, 'Invalid username: Username is already in use');
+				}
 
-				if (!mailResponse) {
-					return apiResponseLogger(500, noMailerError('Failed to send email', resetLink));
+				if (emailSearch.length > 0) {
+					return apiResponseLogger(400, 'Invalid email: Email is already in use');
 				}
 
-				if ('error' in mailResponse) {
-					return apiResponseLogger(500, noMailerError(mailResponse.error, resetLink));
+				// Creates a new user invite
+				const token = yield* sdk.AUTH.user
+					.create(
+						{
+							username,
+							email: checkEmail.data,
+							name: displayname,
+							createdAt: new Date(),
+							id: crypto.randomUUID(),
+						},
+						rank
+					)
+					.pipe(Effect.flatMap((newUser) => sdk.resetTokenBucket.new(newUser.id)));
+
+				if (!token) {
+					return apiResponseLogger(500, 'Failed to create reset token');
 				}
 
-				return apiResponseLogger(200, 'User invite created and email sent');
-			}
+				const resetLink = generateResetUrl(ctx, originalUrl, token);
 
-			return apiResponseLogger(200, resetLink.toString());
-		}).pipe(User.Provide, Mailer.Provide, Notifications.Provide)
-	);
+				yield* notify.sendAdminNotification('new_user', username);
+
+				if (siteConfig.enableMailer) {
+					const checkMailConnection = yield* mailer.verifyMailConnection;
+
+					if (!checkMailConnection) {
+						return apiResponseLogger(
+							500,
+							noMailerError('Failed to connect to mail server', resetLink)
+						);
+					}
+
+					if ('error' in checkMailConnection) {
+						return apiResponseLogger(
+							500,
+							noMailerError('Failed to connect to mail server', resetLink)
+						);
+					}
+
+					const htmlTemplate = getTemplate('userInvite');
+
+					const mailResponse = yield* mailer.sendMail({
+						to: checkEmail.data,
+						subject: `You have been invited to join ${siteConfig.title}!`,
+						html: htmlTemplate({ title: siteConfig.title, link: resetLink }),
+					});
 
-export const OPTIONS: APIRoute = async () => OptionsResponse(['POST']);
+					if (!mailResponse) {
+						return apiResponseLogger(500, noMailerError('Failed to send email', resetLink));
+					}
 
-export const ALL: APIRoute = async () => AllResponse();
+					if ('error' in mailResponse) {
+						return apiResponseLogger(500, noMailerError(mailResponse.error, resetLink));
+					}
+
+					return apiResponseLogger(200, 'User invite created and email sent');
+				}
+
+				return apiResponseLogger(200, resetLink.toString());
+			}).pipe(Mailer.Provide, Notifications.Provide),
+		OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ['POST'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['POST', 'OPTIONS'] },
+		onError: (error) => {
+			console.error('API Error:', error);
+			return createJsonResponse(
+				{ error: 'Internal Server Error' },
+				{
+					status: 500,
+				}
+			);
+		},
+	}
+);