sveltekit-auth-example 5.1.3 → 5.5.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 - Add password complexity checking on /register and /profile pages (only checks for length currently despite what the pages say)
 
+# 5.5.0
+
+- Extract email templates into dedicated files under `src/lib/server/email/` (`password-reset.ts`, `verify-email.ts`)
+- `src/lib/server/email/index.ts` re-exports all templates for clean imports
+
 # 5.1.3
 
 - Session timeout: automatically redirect to /login on session expiry via fetch interceptor (`src/lib/fetch-interceptor.ts`)

package/README.md

@@ -1,6 +1,5 @@
 # SvelteKit Authentication and Authorization Example
 
-[![GitHub release](https://img.shields.io/github/v/release/nstuyvesant/sveltekit-auth-example)](https://github.com/nstuyvesant/sveltekit-auth-example/releases)
 [![License](https://img.shields.io/github/license/nstuyvesant/sveltekit-auth-example)](https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE)
 [![Node](https://img.shields.io/node/v/sveltekit-auth-example)](https://nodejs.org)
 [![Svelte](https://img.shields.io/badge/Svelte-5-orange)](https://svelte.dev)

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "sveltekit-auth-example",
 	"description": "SvelteKit Authentication Example",
-	"version": "5.1.3",
+	"version": "5.5.0",
 	"author": "Nate Stuyvesant",
 	"license": "https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE",
 	"repository": {

package/src/lib/server/email/index.ts

@@ -0,0 +1,2 @@
+export { sendPasswordResetEmail } from './password-reset'
+export { sendVerificationEmail } from './verify-email'

package/src/lib/server/email/password-reset.ts

@@ -0,0 +1,15 @@
+import { DOMAIN, SENDGRID_SENDER } from '$env/static/private'
+import { sendMessage } from '$lib/server/sendgrid'
+
+export const sendPasswordResetEmail = async (toEmail: string, token: string) => {
+	await sendMessage({
+		to: { email: toEmail },
+		from: SENDGRID_SENDER,
+		subject: 'Password reset',
+		categories: ['account'],
+		html: `
+      <p><a href="${DOMAIN}/auth/reset/${token}">Reset my password</a>. Your browser will open and ask you to
+      provide a new password with a confirmation then redirect you to your login page.</p>
+    `
+	})
+}

package/src/lib/server/email/verify-email.ts

@@ -0,0 +1,16 @@
+import { DOMAIN, SENDGRID_SENDER } from '$env/static/private'
+import { sendMessage } from '$lib/server/sendgrid'
+
+export const sendVerificationEmail = async (toEmail: string, token: string) => {
+	await sendMessage({
+		to: { email: toEmail },
+		from: SENDGRID_SENDER,
+		subject: 'Verify your email address',
+		categories: ['account'],
+		html: `
+      <p>Thanks for registering! Please verify your email address by clicking the link below:</p>
+      <p><a href="${DOMAIN}/auth/verify/${token}">Verify my email address</a></p>
+      <p>This link expires in 24 hours. If you did not register, you can safely ignore this email.</p>
+    `
+	})
+}

package/src/routes/auth/forgot/+server.ts

@@ -1,10 +1,9 @@
 import type { Secret } from 'jsonwebtoken'
-import type { MailDataRequired } from '@sendgrid/mail'
 import type { RequestHandler } from './$types'
 import jwt from 'jsonwebtoken'
-import { JWT_SECRET, DOMAIN, SENDGRID_SENDER } from '$env/static/private'
+import { JWT_SECRET } from '$env/static/private'
 import { query } from '$lib/server/db'
-import { sendMessage } from '$lib/server/sendgrid'
+import { sendPasswordResetEmail } from '$lib/server/email'
 
 export const POST: RequestHandler = async event => {
 	const body = await event.request.json()
@@ -12,26 +11,13 @@ export const POST: RequestHandler = async event => {
 	const { rows } = await query(sql, [body.email])
 
 	if (rows.length > 0) {
-		const { userId } = rows[0]
-		// Create JWT with userId expiring in 30 mins
-		const secret = JWT_SECRET
-		const token = jwt.sign({ subject: userId, purpose: 'reset-password' }, <Secret>secret, {
-			expiresIn: '30m'
-		})
-
-		// Email URL with token to user
-		const message: MailDataRequired = {
-			to: { email: body.email },
-			from: SENDGRID_SENDER,
-			subject: 'Password reset',
-			categories: ['account'],
-			html: `
-        <a href="${DOMAIN}/auth/reset/${token}">Reset my password</a>. Your browser will open and ask you to provide a
-        new password with a confirmation then redirect you to your login page.
-      `
-		}
+		const token = jwt.sign(
+			{ subject: rows[0].userId, purpose: 'reset-password' },
+			JWT_SECRET as Secret,
+			{ expiresIn: '30m' }
+		)
 		try {
-			await sendMessage(message)
+			await sendPasswordResetEmail(body.email, token)
 		} catch (err) {
 			console.error('Failed to send password reset email:', err)
 			// Still return 204 to avoid leaking whether the email exists in our system

package/src/routes/auth/register/+server.ts

@@ -1,10 +1,9 @@
 import { error, json } from '@sveltejs/kit'
 import type { RequestHandler } from './$types'
-import type { MailDataRequired } from '@sendgrid/mail'
 import jwt from 'jsonwebtoken'
-import { JWT_SECRET, DOMAIN, SENDGRID_SENDER } from '$env/static/private'
+import { JWT_SECRET } from '$env/static/private'
 import { query } from '$lib/server/db'
-import { sendMessage } from '$lib/server/sendgrid'
+import { sendVerificationEmail } from '$lib/server/email'
 
 export const POST: RequestHandler = async event => {
 	let body: { email?: string; password?: string; firstName?: string; lastName?: string }
@@ -47,19 +46,7 @@ export const POST: RequestHandler = async event => {
 		{ expiresIn: '24h' }
 	)
 
-	const message: MailDataRequired = {
-		to: { email: body.email },
-		from: SENDGRID_SENDER,
-		subject: 'Verify your email address',
-		categories: ['account'],
-		html: `
-      <p>Thanks for registering! Please verify your email address by clicking the link below:</p>
-      <p><a href="${DOMAIN}/auth/verify/${token}">Verify my email address</a></p>
-      <p>This link expires in 24 hours. If you did not register, you can safely ignore this email.</p>
-    `
-	}
-
-	await sendMessage(message)
+	await sendVerificationEmail(body.email, token)
 
 	return json({
 		message: 'Registration successful. Please check your email to verify your account.',