@axium/server 0.3.12 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.3.12",
+	"version": "0.4.1",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",
@@ -46,7 +46,8 @@
 		"kysely": "^0.27.5",
 		"logzen": "^0.6.2",
 		"pg": "^8.14.1",
-		"utilium": "^2.2.3"
+		"utilium": "^2.2.3",
+		"zod-validation-error": "^3.4.0"
 	},
 	"devDependencies": {
 		"@auth/sveltekit": "^1.8.0",

package/web/actions.ts

@@ -0,0 +1,57 @@
+import { Registration, User } from '@axium/core/schemas';
+import type { RequestEvent } from '@sveltejs/kit';
+import { fail, redirect } from '@sveltejs/kit';
+import { adapter, register } from '../dist/auth.js';
+import { web } from '../dist/config.js';
+import { parseForm } from './utils.js';
+
+export async function editEmail(event: RequestEvent) {
+	const session = await event.locals.auth();
+
+	const [{ email }, error] = await parseForm(event, User.pick({ email: true }));
+	if (error) return error;
+
+	const user = await adapter.getUserByEmail(session.user.email);
+	if (!user) return fail(401, { email, error: 'You are not signed in' });
+
+	try {
+		await adapter.updateUser({ id: user.id, email, image: user.image });
+	} catch (error: any) {
+		return fail(400, { email, error: typeof error === 'string' ? error : error.message });
+	}
+	redirect(303, web.prefix);
+}
+
+export async function editName(event: RequestEvent) {
+	const session = await event.locals.auth();
+
+	const [{ name }, error] = await parseForm(event, User.pick({ name: true }));
+	if (error) return error;
+
+	const user = await adapter.getUserByEmail(session.user.email);
+	if (!user) return fail(401, { name, error: 'You are not signed in' });
+
+	try {
+		await adapter.updateUser({ id: user.id, name, image: user.image });
+	} catch (error: any) {
+		return fail(400, { name, error: typeof error === 'string' ? error : error.message });
+	}
+	redirect(303, web.prefix);
+}
+
+export async function signup(event: RequestEvent) {
+	const [data, error] = await parseForm(event, Registration);
+	if (error) return error;
+
+	try {
+		const { session } = await register(data);
+		event.cookies.set('session', session.sessionToken, {
+			path: '/',
+			expires: session.expires,
+			httpOnly: true,
+		});
+		return { ...data, success: true, data: session.sessionToken };
+	} catch (error: any) {
+		return fail(400, { ...data, error: typeof error === 'string' ? error : error.message });
+	}
+}

package/web/index.server.ts

@@ -1,4 +1,2 @@
-export * as account from './routes/+page.server.js';
-export * as email from './routes/email/+page.server.js';
-export * as name from './routes/name/+page.server.js';
-export * as signup from './routes/signup/+page.server.js';
+export * from './actions.js';
+export * from './utils.js';

package/web/routes/+page.server.ts

@@ -1,15 +1,10 @@
-import { redirect } from '@sveltejs/kit';
 import { adapter } from '../../dist/auth.js';
-import type { PageServerLoadEvent } from './$types.js';
 import { web } from '../../dist/config.js';
+import { loadSession } from '../utils.js';
+import type { PageServerLoadEvent } from './$types.js';
 
 export async function load(event: PageServerLoadEvent) {
-	const session = await event.locals.auth();
-
-	if (!session) redirect(307, '/auth/signin');
-	if (!session.user.name) redirect(307, web.prefix + '/name');
-
+	const { session } = await loadSession(event);
 	const user = await adapter.getUserByEmail(session.user.email);
-
 	return { session, user, prefix: web.prefix };
 }

package/web/routes/+page.svelte

@@ -18,7 +18,7 @@
 	<title>Account</title>
 </svelte:head>
 
-<div class="flex-content">
+<div class="Account flex-content">
 	<img class="pfp" src={image} alt="User profile" />
 	<p class="greeting">Welcome, {user.name}</p>
 	<div class="account-section main">

package/web/routes/email/+page.server.ts

@@ -1,32 +1,5 @@
-import { fail, redirect, type Actions } from '@sveltejs/kit';
-import * as z from 'zod';
-import { adapter } from '../../../dist/auth.js';
-import { web } from '../../../dist/config.js';
-import { tryZod } from '../../utils.js';
-import type { PageServerLoadEvent } from './$types.js';
+import type { Actions } from '@sveltejs/kit';
+import { editEmail } from '../../actions.js';
 
-export async function load(event: PageServerLoadEvent) {
-	const session = await event.locals.auth();
-	if (!session) redirect(307, '/auth/signin');
-	return { session };
-}
-
-export const actions = {
-	async default(event) {
-		const session = await event.locals.auth();
-
-		const rawEmail = (await event.request.formData()).get('email');
-		const [email, error] = tryZod(z.string().email().safeParse(rawEmail));
-		if (error) return error;
-
-		const user = await adapter.getUserByEmail(session.user.email);
-		if (!user) return fail(500, { email, error: 'User does not exist' });
-
-		try {
-			await adapter.updateUser({ id: user.id, email, image: user.image });
-		} catch (error: any) {
-			return fail(400, { email, error: typeof error === 'string' ? error : error.message });
-		}
-		redirect(303, web.prefix);
-	},
-} satisfies Actions;
+export { loadSession as load } from '../../utils.js';
+export const actions = { default: editEmail } satisfies Actions;

package/web/routes/email/+page.svelte

@@ -2,14 +2,13 @@
 	import { enhance } from '$app/forms';
 	import '../../lib/styles.css';
 	let { form, data } = $props();
-	const { user } = data.session;
 </script>
 
 <svelte:head>
 	<title>Edit Email</title>
 </svelte:head>
 
-<div>
+<div class="EditEmail">
 	<form method="POST" class="main" use:enhance>
 		{#if form?.error}
 			<div class="error">
@@ -18,7 +17,7 @@
 		{/if}
 		<div>
 			<label for="email">Email Address</label>
-			<input name="email" type="email" value={form?.email || user.email || ''} required />
+			<input name="email" type="email" value={form?.email || data.session.user.email || ''} required />
 		</div>
 		<button type="submit">Continue</button>
 	</form>

package/web/routes/name/+page.server.ts

@@ -1,32 +1,5 @@
-import { Name } from '@axium/core/schemas';
-import { fail, redirect, type Actions } from '@sveltejs/kit';
-import { adapter } from '../../../dist/auth.js';
-import { web } from '../../../dist/config.js';
-import { tryZod } from '../../utils.js';
-import type { PageServerLoadEvent } from './$types.js';
+import type { Actions } from '@sveltejs/kit';
+import { editName } from '../../actions.js';
 
-export async function load(event: PageServerLoadEvent) {
-	const session = await event.locals.auth();
-	if (!session) redirect(307, '/auth/signin');
-	return { session };
-}
-
-export const actions = {
-	async default(event) {
-		const session = await event.locals.auth();
-
-		const rawName = (await event.request.formData()).get('name');
-		const [name, error] = tryZod(Name.safeParse(rawName));
-		if (error) error;
-
-		const user = await adapter.getUserByEmail(session.user.email);
-		if (!user) return fail(500, { name, error: 'User does not exist' });
-
-		try {
-			await adapter.updateUser({ id: user.id, name, image: user.image });
-		} catch (error: any) {
-			return fail(400, { name, error: typeof error === 'string' ? error : error.message });
-		}
-		redirect(303, web.prefix);
-	},
-} satisfies Actions;
+export { loadSession as load } from '../../utils.js';
+export const actions = { default: editName } satisfies Actions;

package/web/routes/name/+page.svelte

@@ -9,7 +9,7 @@
 	<title>Edit Name</title>
 </svelte:head>
 
-<div>
+<div class="EditName">
 	<form method="POST" class="main" use:enhance>
 		{#if form?.error}
 			<div class="error">

package/web/routes/signup/+page.server.ts

@@ -1,33 +1,10 @@
-import { Registration } from '@axium/core/schemas';
-import { fail, redirect } from '@sveltejs/kit';
-import * as auth from '../../../dist/auth.js';
+import { redirect } from '@sveltejs/kit';
 import * as config from '../../../dist/config.js';
+import { signup } from '../../actions.js';
 import type { Actions } from './$types.js';
 
 export function load() {
 	if (!config.auth.credentials) return redirect(307, '/auth/signin');
 }
 
-export const actions = {
-	async default(event) {
-		const { data, success, error } = Registration.safeParse(Object.fromEntries(await event.request.formData()));
-
-		if (!success)
-			return fail(400, {
-				...data,
-				error: error.flatten().formErrors[0] || Object.values(error.flatten().fieldErrors).flat()[0],
-			});
-
-		try {
-			const { session } = await auth.register(data);
-			event.cookies.set('session', session.sessionToken, {
-				path: '/',
-				expires: session.expires,
-				httpOnly: true,
-			});
-			return { ...data, success: true, data: session.sessionToken };
-		} catch (error: any) {
-			return fail(400, { ...data, error: typeof error === 'string' ? error : error.message });
-		}
-	},
-} satisfies Actions;
+export const actions = { default: signup } satisfies Actions;

package/web/routes/signup/+page.svelte

@@ -4,7 +4,7 @@
 	let { form } = $props();
 </script>
 
-<div>
+<div class="Signup">
 	<form method="POST" class="main" use:enhance>
 		{#if form?.error}
 			<div class="error">

package/web/utils.ts

@@ -1,14 +1,31 @@
-import { fail, type ActionFailure } from '@sveltejs/kit';
+import type { Session } from '@auth/sveltekit';
+import type { ActionFailure, RequestEvent } from '@sveltejs/kit';
+import { fail, redirect } from '@sveltejs/kit';
 import type * as z from 'zod';
+import { fromError } from 'zod-validation-error';
+import { web } from '../dist/config.js';
 
-export function failZod<T extends Record<string, unknown>>(error: z.ZodError, data: T = {} as T): ActionFailure<T & { error: string }> {
-	return fail(400, {
-		...data,
-		error: error.flatten().formErrors[0] || Object.values(error.flatten().fieldErrors).flat()[0],
-	});
+export async function loadSession(event: RequestEvent): Promise<{ session: Session }> {
+	const session = await event.locals.auth();
+	if (!session) redirect(307, '/auth/signin');
+	if (!session.user.name && event.url.pathname != web.prefix + '/name') redirect(307, web.prefix + '/name');
+	return { session };
 }
 
-export function tryZod<Input, Output>(result: z.SafeParseReturnType<Input, Output>): [Output, null] | [null, ActionFailure<Partial<Output> & { error: string }>] {
-	if (result.success) return [result.data, null];
-	return [null, failZod(result.error)];
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface FormFail<S extends z.AnyZodObject> extends ActionFailure<z.infer<S> & { error: string }> {}
+
+export async function parseForm<S extends z.AnyZodObject>(event: RequestEvent, schema: S): Promise<[z.infer<S>, FormFail<S> | null]> {
+	const formData = Object.fromEntries(await event.request.formData());
+	const { data, error, success } = schema.safeParse(formData);
+
+	if (success) return [data, null];
+
+	return [
+		data,
+		fail(400, {
+			...data,
+			error: fromError(error, { prefix: null }).toString(),
+		}),
+	];
 }