From 9a87af4c3c1d098405cd8d5fd82e03d16bc3027e Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Sat, 17 Feb 2024 00:10:19 -0800
Subject: [PATCH] Fix seeder and fix the schema for password and confirm
 password.

---
 src/lib/components/signup.svelte          | 12 +----
 src/lib/config/zod-schemas.ts             | 57 +++++++++--------------
 src/routes/(auth)/sign-up/+page.server.ts | 22 +--------
 src/seed.ts                               |  3 ++
 4 files changed, 28 insertions(+), 66 deletions(-)

diff --git a/src/lib/components/signup.svelte b/src/lib/components/signup.svelte
index efd6473..69f15f0 100644
--- a/src/lib/components/signup.svelte
+++ b/src/lib/components/signup.svelte
@@ -1,17 +1,9 @@
 <script lang="ts">
 	import { superForm } from 'sveltekit-superforms/client';
-	import { userSchema } from '$lib/config/zod-schemas';
+	import { signUpSchema } from '$lib/config/zod-schemas';
 	export let data;
 
-	const signUpSchema = userSchema.pick({
-		firstName: true,
-		lastName: true,
-		username: true,
-		email: true,
-		password: true
-	});
-
-	const { form, errors, enhance, delayed } = superForm(data.form, {
+	const { form, errors, enhance } = superForm(data.form, {
 		taintedMessage: null,
 		validators: signUpSchema,
 		delayMs: 0
diff --git a/src/lib/config/zod-schemas.ts b/src/lib/config/zod-schemas.ts
index 436cf2e..e00f59b 100644
--- a/src/lib/config/zod-schemas.ts
+++ b/src/lib/config/zod-schemas.ts
@@ -29,13 +29,10 @@ export const userSchema = z.object({
 		.max(50, { message: 'Username must be less than 50 characters' }),
 	password: z
 		.string({ required_error: 'Password is required' })
-		.trim()
-		.min(8, { message: 'Password must be at least 8 characters' })
-		.max(128, { message: 'Password must be less than 128 characters' }),
+		.trim(),
 	confirm_password: z
 		.string({ required_error: 'Confirm Password is required' })
-		.trim()
-		.min(8, { message: 'Confirm Password must be at least 8 characters' }),
+		.trim(),
 	role: z.enum(['USER', 'ADMIN'], { required_error: 'You must have a role' }).default('USER'),
 	verified: z.boolean().default(false),
 	token: z.string().optional(),
@@ -111,54 +108,44 @@ const checkPasswordStrength = async function (password: string, ctx: z.Refinemen
 		countOfSpecialChar = 0;
 	for (let i = 0; i < password.length; i++) {
 		const char = password.charAt(i);
-		if (!isNaN(+char)) countOfNumbers++;
-		else if (containsUppercase(char)) countOfUpperCase++;
-		else if (containsLowercase(char)) countOfLowerCase++;
-		else if (containsSpecialChar(char)) countOfSpecialChar++;
+		if (!isNaN(+char)) {
+			countOfNumbers++;
+		} else if (containsUppercase(char)) {
+			countOfUpperCase++;
+		} else if (containsLowercase(char)) {
+			countOfLowerCase++;
+		} else if (containsSpecialChar(char)) {
+			countOfSpecialChar++;
+		}
 	}
 
-	let errors = {
-		upperCase: { pass: true, message: "At least one upper case." },
-		lowerCase: { pass: true, message: "At least one lower case." },
-		specialCharacter: { pass: true, message: "At least one special character." },
-		totalNumber: { pass: true, message: "At least one number." },
-		minimumLength: { pass: true, message: "At least 8 characters." },
-		maximumLength: { pass: true, message: "At most 128 characters." },
-	};
+	let errorMessage = 'Your password:';
 
 	if (countOfLowerCase < 1) {
-		errors = { ...errors, lowerCase: { ...errors.lowerCase, pass: false } };
+		errorMessage = ' Must have at least one lowercase letter. ';
 	}
 	if (countOfNumbers < 1) {
-		errors = {
-			...errors,
-			totalNumber: { ...errors.totalNumber, pass: false },
-		};
+		errorMessage += ' Must have at least one number. ';
 	}
 	if (countOfUpperCase < 1) {
-		errors = { ...errors, upperCase: { ...errors.upperCase, pass: false } };
+		errorMessage += ' Must have at least one uppercase letter. ';
 	}
 	if (countOfSpecialChar < 1) {
-		errors = { ...errors, specialCharacter: { ...errors.specialCharacter, pass: false } };
+		errorMessage += ' Must have at least one special character.';
 	}
 	if (minimumLength) {
-		errors = { ...errors, minimumLength: { ...errors.minimumLength, pass: false } };
+		errorMessage += ' Be at least 8 characters long.';
 	}
 	if (maximumLength) {
-		errors = { ...errors, maximumLength: { ...errors.maximumLength, pass: false } };
+		errorMessage += ' Be less than 128 characters long.';
 	}
 
 
-	if (
-		countOfLowerCase < 1 ||
-		countOfUpperCase < 1 ||
-		countOfSpecialChar < 1 ||
-		countOfNumbers < 1
-	) {
+	if (errorMessage.length > 'Your password:'.length) {
 		ctx.addIssue({
-			code: "custom",
-			message: JSON.stringify(errors),
-			path: ["password"]
+			code: 'custom',
+			message: errorMessage,
+			path: ['password']
 		});
 	}
 }
\ No newline at end of file
diff --git a/src/routes/(auth)/sign-up/+page.server.ts b/src/routes/(auth)/sign-up/+page.server.ts
index 0b51f11..74f4992 100644
--- a/src/routes/(auth)/sign-up/+page.server.ts
+++ b/src/routes/(auth)/sign-up/+page.server.ts
@@ -5,32 +5,12 @@ import { nanoid } from 'nanoid';
 import { setError, superValidate } from 'sveltekit-superforms/server';
 import type { PageServerLoad } from './$types';
 import { lucia } from '$lib/server/auth';
-import { userSchema } from '$lib/config/zod-schemas';
+import { signUpSchema } from '$lib/config/zod-schemas';
 import { add_user_to_role } from '$server/roles';
 import type { Message } from '$lib/types.js';
 import db from '$lib/drizzle';
 import { collections, users, wishlists } from '../../../schema';
 
-const signUpSchema = userSchema
-	.pick({
-		firstName: true,
-		lastName: true,
-		email: true,
-		username: true,
-		password: true,
-		confirm_password: true,
-		terms: true
-	})
-	.superRefine(({ confirm_password, password }, ctx) => {
-		if (confirm_password !== password) {
-			ctx.addIssue({
-				code: 'custom',
-				message: 'Password and Confirm Password must match',
-				path: ['confirm_password']
-			});
-		}
-	});
-
 export const load: PageServerLoad = async (event) => {
 	console.log('sign up load event', event);
 	// const session = await event.locals.auth.validate();
diff --git a/src/seed.ts b/src/seed.ts
index d035833..3d51106 100644
--- a/src/seed.ts
+++ b/src/seed.ts
@@ -27,3 +27,6 @@ if (existingRoles.length === 0) {
 } else {
 	console.log('Roles already exist. No action taken.');
 }
+
+await pool.end();
+process.exit();