02/05: drop persona, seed user and verification directly

Author: kettanaito

exercises/02.authentication/02.solution.passkeys/tests/db-utils.ts

@@ -34,10 +34,11 @@ export function generateUserInfo() {
 
 export async function createUser() {
 	const userInfo = generateUserInfo()
+	const password = 'supersecret'
 	const user = await prisma.user.create({
 		data: {
 			...userInfo,
-			password: { create: { hash: await getPasswordHash('supersecret') } },
+			password: { create: { hash: await getPasswordHash(password) } },
 		},
 	})
 
@@ -48,6 +49,7 @@ export async function createUser() {
 			})
 		},
 		...user,
+		password,
 	}
 }
 

exercises/02.authentication/05.solution.2fa/tests/db-utils.ts

@@ -1,10 +1,14 @@
+import { type generateTOTP } from '@epic-web/totp'
 import { faker } from '@faker-js/faker'
 import bcrypt from 'bcryptjs'
 import { UniqueEnforcer } from 'enforce-unique'
+import { twoFAVerifyVerificationType } from '#app/routes/settings+/profile.two-factor.verify.tsx'
+import { getPasswordHash } from '#app/utils/auth.server.ts'
+import { prisma } from '#app/utils/db.server.ts'
 
 const uniqueUsernameEnforcer = new UniqueEnforcer()
 
-export function createUser() {
+export function generateUserInfo() {
 	const firstName = faker.person.firstName()
 	const lastName = faker.person.lastName()
 
@@ -22,13 +26,57 @@ export function createUser() {
 		.slice(0, 20)
 		.toLowerCase()
 		.replace(/[^a-z0-9_]/g, '_')
+
 	return {
 		username,
 		name: `${firstName} ${lastName}`,
 		email: `${username}@example.com`,
 	}
 }
 
+export async function createUser() {
+	const userInfo = generateUserInfo()
+	const password = 'supersecret'
+	const user = await prisma.user.create({
+		data: {
+			...userInfo,
+			password: { create: { hash: await getPasswordHash(password) } },
+		},
+	})
+
+	return {
+		async [Symbol.asyncDispose]() {
+			await prisma.user.deleteMany({
+				where: { id: user.id },
+			})
+		},
+		...user,
+		password,
+	}
+}
+
+export async function createVerification(input: {
+	totp: Awaited<ReturnType<typeof generateTOTP>>
+	userId: string
+}) {
+	const verification = await prisma.verification.create({
+		data: {
+			...input.totp,
+			type: twoFAVerifyVerificationType,
+			target: input.userId,
+		},
+	})
+
+	return {
+		async [Symbol.asyncDispose]() {
+			await prisma.verification.deleteMany({
+				where: { id: verification.id },
+			})
+		},
+		...verification,
+	}
+}
+
 export function createPassword(password: string = faker.internet.password()) {
 	return {
 		hash: bcrypt.hashSync(password, 10),

exercises/02.authentication/05.solution.2fa/tests/e2e/authentication-2fa.test.ts

@@ -0,0 +1,31 @@
+import { generateTOTP } from '@epic-web/totp'
+import { createUser, createVerification } from '#tests/db-utils.ts'
+import { test, expect } from '#tests/test-extend.ts'
+
+test('authenticates using two-factor authentication (setup)', async ({
+	navigate,
+	page,
+}) => {
+	// Create a test user and enable 2FA for them directly in the database.
+	await using user = await createUser()
+	const totp = await generateTOTP()
+	await using _ = await createVerification({
+		totp,
+		userId: user.id,
+	})
+
+	// Log in as the created user.
+	await navigate('/login')
+
+	await page.getByLabel('Username').fill(user.username)
+	await page.getByLabel('Password').fill(user.password)
+	await page.getByRole('button', { name: 'Log in' }).click()
+
+	await page
+		.getByRole('textbox', { name: /code/i })
+		.fill((await generateTOTP()).otp)
+
+	await page.getByRole('button', { name: 'Submit' }).click()
+
+	await expect(page.getByRole('link', { name: user.name! })).toBeVisible()
+})

exercises/02.authentication/05.solution.2fa/tests/e2e/authentication-2fa.ts

@@ -1,36 +1,27 @@
-import { generateTOTP } from '@epic-web/totp'
 import { test as testBase, expect } from '@playwright/test'
 import {
 	definePersona,
 	combinePersonas,
 	type AuthenticateFunction,
 } from 'playwright-persona'
 import { href, type Register } from 'react-router'
-import { twoFAVerifyVerificationType } from '#app/routes/settings+/profile.two-factor.verify.tsx'
-import { getPasswordHash } from '#app/utils/auth.server.ts'
 import { prisma } from '#app/utils/db.server.ts'
 import { createUser } from '#tests/db-utils'
 
 interface Fixtures {
 	navigate: <T extends keyof Register['pages']>(
 		...args: Parameters<typeof href<T>>
 	) => Promise<void>
-	authenticate: AuthenticateFunction<[typeof user, typeof userWith2fa]>
+	authenticate: AuthenticateFunction<[typeof user]>
 }
 
 const user = definePersona('user', {
 	async createSession({ page }) {
-		const user = await prisma.user.create({
-			data: {
-				...createUser(),
-				roles: { connect: { name: 'user' } },
-				password: { create: { hash: await getPasswordHash('supersecret') } },
-			},
-		})
+		const user = await createUser()
 
 		await page.goto('/login')
 		await page.getByLabel('Username').fill(user.username)
-		await page.getByLabel('Password').fill('supersecret')
+		await page.getByLabel('Password').fill(user.password)
 		await page.getByRole('button', { name: 'Log in' }).click()
 		await page.getByText(user.name!).waitFor({ state: 'visible' })
 
@@ -47,44 +38,13 @@ const user = definePersona('user', {
 	},
 })
 
-const userWith2fa = definePersona('user-with-2fa', {
-	async createSession({ page }, testInfo) {
-		const defaultUserPersona = await user.createSession({ page }, testInfo)
-
-		const totp = await generateTOTP()
-		const verification = await prisma.verification.create({
-			data: {
-				...totp,
-				type: twoFAVerifyVerificationType,
-				target: defaultUserPersona.user.id,
-			},
-		})
-
-		return {
-			user: defaultUserPersona.user,
-			verification,
-		}
-	},
-	verifySession: user.verifySession,
-	async destroySession({ session }) {
-		await Promise.allSettled([
-			prisma.user.deleteMany({
-				where: { id: session.user.id },
-			}),
-			prisma.verification.deleteMany({
-				where: { id: session.verification.id },
-			}),
-		])
-	},
-})
-
 export const test = testBase.extend<Fixtures>({
 	async navigate({ page }, use) {
 		await use(async (...args) => {
 			await page.goto(href(...args))
 		})
 	},
-	authenticate: combinePersonas(user, userWith2fa),
+	authenticate: combinePersonas(user),
 })
 
 export { expect }