feat: add email to users

migrations/006.do.user_email.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN email VARCHAR(255) NOT NULL;

migrations/006.undo.user_email.sql

@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN email;

scripts/seed-database.ts

@@ -47,25 +47,29 @@ async function truncateTables (connection: Connection) {
 }
 
 async function seedUsers (connection: Connection) {
-  const usernames = ['basic', 'moderator', 'admin']
+  const users = [
+    { username: 'basic', email: '[email protected]' },
+    { username: 'moderator', email: '[email protected]' },
+    { username: 'admin', email: '[email protected]' }
+  ]
   const hash = await scryptHash('password123$')
 
   // The goal here is to create a role hierarchy
   // E.g. an admin should have all the roles
   const rolesAccumulator: number[] = []
 
-  for (const username of usernames) {
+  for (const user of users) {
     const [userResult] = await connection.execute(`
-      INSERT INTO users (username, password)
-      VALUES (?, ?)
-    `, [username, hash])
+      INSERT INTO users (username, email, password)
+      VALUES (?, ?, ?)
+    `, [user.username, user.email, hash])
 
     const userId = (userResult as { insertId: number }).insertId
 
     const [roleResult] = await connection.execute(`
       INSERT INTO roles (name)
       VALUES (?)
-    `, [username])
+    `, [user.username])
 
     const newRoleId = (roleResult as { insertId: number }).insertId
 

src/routes/api/auth/index.ts

@@ -2,14 +2,17 @@ import {
   FastifyPluginAsyncTypebox,
   Type
 } from '@fastify/type-provider-typebox'
-import { CredentialsSchema, Credentials } from '../../../schemas/auth.js'
+import { Credentials } from '../../../schemas/auth.js'
 
 const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
   fastify.post(
     '/login',
     {
       schema: {
-        body: CredentialsSchema,
+        body: Type.Object({
+          username: Type.String(),
+          password: Type.String()
+        }),
         response: {
           200: Type.Object({
             success: Type.Boolean(),
@@ -27,7 +30,7 @@ const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
 
       return fastify.knex.transaction(async (trx) => {
         const user = await trx<Credentials>('users')
-          .select('username', 'password')
+          .select('username', 'email', 'password')
           .where({ username })
           .first()
 
@@ -45,6 +48,7 @@ const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
 
             request.session.user = {
               username,
+              email: user.email,
               roles: roles.map((role) => role.name)
             }
 

src/schemas/auth.ts

@@ -2,6 +2,7 @@ import { Static, Type } from '@sinclair/typebox'
 
 export const CredentialsSchema = Type.Object({
   username: Type.String(),
+  email: Type.String({ format: 'email' }),
   password: Type.String()
 })
 

test/helper.ts

@@ -27,6 +27,7 @@ async function login (this: FastifyInstance, username: string) {
     url: '/api/auth/login',
     payload: {
       username,
+      email: '[email protected]',
       password: 'password123$'
     }
   })

test/routes/api/tasks/tasks.test.ts

@@ -16,7 +16,7 @@ import os from 'os'
 
 async function createUser (
   app: FastifyInstance,
-  userData: Partial<{ username: string; password: string }>
+  userData: Partial<{ username: string; email: string; password: string }>
 ) {
   const [id] = await app.knex('users').insert(userData)
   return id
@@ -52,10 +52,12 @@ describe('Tasks api (logged user only)', () => {
 
       userId1 = await createUser(app, {
         username: 'user1',
+        email: '[email protected]',
         password: 'password1'
       })
       userId2 = await createUser(app, {
         username: 'user2',
+        email: '[email protected]',
         password: 'password2'
       })