Merge branch 'master' into feat/conf-d

ethanwu10 · ethanwu10 · commit 31aa2c269fcf · 2020-08-04T23:56:27.000-04:00
diff --git a/docs/content/providers/index.md b/docs/content/providers/index.md
@@ -1,3 +1,3 @@
-## Providers
+# Providers
 
 The provider system allows for flexible configuration of backends. Each provider provides a different option for how certain functionality should be implemented. As opposed to a generic plugin system, this allows for more defined customizations. 
diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "lint": "sh -c \"tsc --noEmit ; eslint .\"",
     "lint:strict": "sh -c \"tsc --noEmit -p tsconfig.strict.json ; eslint .\"",
-    "start": "node --enable-source-maps dist/server/index.js",
-    "migrate": "sh -c \"yarn build:ts && RCTF_DATABASE_MIGRATE=only yarn start\"",
+    "start": "node --enable-source-maps --unhandled-rejections=strict dist/server/index.js",
+    "migrate": "yarn build:ts && cross-env RCTF_DATABASE_MIGRATE=only yarn start",
     "build:client": "preact build --src client/src --template client/index.html --dest dist/build --no-prerender --no-inline-css",
     "build:ts": "tsc && yarn copy-static",
     "build": "yarn build:ts && yarn build:client",
diff --git a/server/challenges/index.ts b/server/challenges/index.ts
@@ -35,7 +35,7 @@ const onUpdate = (newChallenges: Challenge[]): void => {
 }
 
 void import(path.join('../providers', config.challengeProvider.name))
-  .then(({ default: Provider }: { default: ProviderConstructor }) => {
+  .then(({ default: Provider }: { default: ProviderConstructor }): void => {
     provider = new Provider(config.challengeProvider.options ?? {})
 
     provider.on('update', onUpdate)
@@ -53,11 +53,11 @@ export function getCleanedChallenges (): CleanedChallenge[] {
   return cleanedChallenges
 }
 
-export function getChallenge (id: string): Challenge {
+export function getChallenge (id: string): Challenge | undefined {
   return challengesMap.get(id)
 }
 
-export function getCleanedChallenge (id: string): CleanedChallenge {
+export function getCleanedChallenge (id: string): CleanedChallenge | undefined {
   return cleanedChallengesMap.get(id)
 }
 
diff --git a/server/database/challenges.ts b/server/database/challenges.ts
@@ -11,7 +11,7 @@ export const getAllChallenges = (): Promise<DatabaseChallenge[]> => {
     .then(res => res.rows)
 }
 
-export const getChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge> => {
+export const getChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge | undefined> => {
   return db.query('SELECT * FROM challenges WHERE id = $1', [id])
     .then(res => res.rows[0])
 }
@@ -23,7 +23,7 @@ export const createChallenge = ({ id, data }: DatabaseChallenge): Promise<Databa
     .then(res => res.rows[0])
 }
 
-export const removeChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge> => {
+export const removeChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge | undefined> => {
   return db.query('DELETE FROM challenges WHERE id = $1 RETURNING *', [id])
     .then(res => res.rows[0])
 }
diff --git a/server/database/index.ts b/server/database/index.ts
diff --git a/server/database/members.ts b/server/database/members.ts
@@ -18,7 +18,7 @@ export const makeMember = ({ id, userid, email }: UserMember): Promise<UserMembe
     .then(res => res.rows[0])
 }
 
-export const removeMember = ({ id, userid }: Pick<UserMember, 'id' | 'userid'>): Promise<UserMember> => {
+export const removeMember = ({ id, userid }: Pick<UserMember, 'id' | 'userid'>): Promise<UserMember | undefined> => {
   return db.query('DELETE FROM user_members WHERE id = $1 and userid = $2 RETURNING *', [id, userid])
     .then(res => res.rows[0])
 }
diff --git a/server/database/migrate.ts b/server/database/migrate.ts
@@ -2,16 +2,17 @@ import path from 'path'
 import pgMigrate from 'node-pg-migrate'
 import config from '../config/server'
 
-const sleep = (time) => new Promise(resolve => setTimeout(resolve, time))
+const sleep = (time: number) => new Promise(resolve => setTimeout(resolve, time))
 
-const migrate = async (attempt) => {
+const migrate = async (attempt: number): Promise<void> => {
   try {
     await pgMigrate({
       databaseUrl: config.database.sql,
       dir: path.join(__dirname, '../../migrations'),
       direction: 'up',
       migrationsTable: 'pgmigrations',
-      verbose: true
+      verbose: true,
+      count: Infinity
     })
   } catch (e) {
     if (attempt > 10) {
@@ -23,4 +24,4 @@ const migrate = async (attempt) => {
   }
 }
 
-export default () => migrate(0)
+export default (): Promise<void> => migrate(0)
diff --git a/server/database/solves.ts b/server/database/solves.ts
@@ -29,7 +29,7 @@ export const getSolveByUserIdAndChallId = ({ userid, challengeid }: Pick<Solve,
     .then(res => res.rows[0])
 }
 
-export const newSolve = ({ id, userid, challengeid, createdat }: Solve): Promise<Solve | undefined> => {
+export const newSolve = ({ id, userid, challengeid, createdat }: Solve): Promise<Solve> => {
   return db.query('INSERT INTO solves (id, challengeid, userid, createdat) VALUES ($1, $2, $3, $4) RETURNING *', [id, challengeid, userid, createdat])
     .then(res => res.rows[0])
 }
diff --git a/server/database/users.ts b/server/database/users.ts
@@ -17,42 +17,42 @@ export const getAllUsers = (): Promise<Pick<User, 'id' | 'name' | 'division'>[]>
     .then(res => res.rows)
 }
 
-export const getUserById = ({ id }: Pick<User, 'id'>): Promise<User> => {
+export const getUserById = ({ id }: Pick<User, 'id'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE id = $1', [id])
     .then(res => res.rows[0])
 }
 
-export const getUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User> => {
+export const getUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE email = $1', [email])
     .then(res => res.rows[0])
 }
 
-export const getUserByCtftimeId = ({ ctftimeId }: Pick<User, 'ctftimeId'>): Promise<User> => {
+export const getUserByCtftimeId = ({ ctftimeId }: Pick<User, 'ctftimeId'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE ctftime_id = $1', [ctftimeId])
     .then(res => res.rows[0])
 }
 
-export const getUserByIdAndEmail = ({ id, email }: Pick<User, 'id' | 'email'>): Promise<User> => {
+export const getUserByIdAndEmail = ({ id, email }: Pick<User, 'id' | 'email'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE id = $1 AND email = $2', [id, email])
     .then(res => res.rows[0])
 }
 
-export const getUserByNameOrEmail = ({ name, email }: Pick<User, 'name' | 'email'>): Promise<User> => {
+export const getUserByNameOrEmail = ({ name, email }: Pick<User, 'name' | 'email'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE name = $1 OR email = $2', [name, email])
     .then(res => res.rows[0])
 }
 
-export const getUserByNameOrCtftimeId = ({ name, ctftimeId }: Pick<User, 'name' | 'ctftimeId'>): Promise<User> => {
+export const getUserByNameOrCtftimeId = ({ name, ctftimeId }: Pick<User, 'name' | 'ctftimeId'>): Promise<User | undefined> => {
   return db.query('SELECT * FROM users WHERE name = $1 OR ctftime_id = $2', [name, ctftimeId])
     .then(res => res.rows[0])
 }
 
-export const removeUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User> => {
+export const removeUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User | undefined> => {
   return db.query('DELETE FROM users WHERE email = $1 RETURNING *', [email])
     .then(res => res.rows[0])
 }
 
-export const removeUserById = ({ id }: Pick<User, 'id'>): Promise<User> => {
+export const removeUserById = ({ id }: Pick<User, 'id'>): Promise<User | undefined> => {
   return db.query('DELETE FROM users WHERE id = $1 RETURNING *', [id])
     .then(res => res.rows[0])
 }
@@ -67,20 +67,24 @@ export const makeUser = ({ id, name, email, division, ctftimeId, perms }: User):
     .then(res => res.rows[0])
 }
 
-export const removeCtftimeId = ({ id }: Pick<User, 'id'>): Promise<User> => {
+export const removeCtftimeId = ({ id }: Pick<User, 'id'>): Promise<User | undefined> => {
   return db.query('UPDATE users SET ctftime_id = NULL WHERE id = $1 AND ctftime_id IS NOT NULL RETURNING *', [id])
     .then(res => res.rows[0])
 }
 
-export const removeEmail = ({ id }: Pick<User, 'id'>): Promise<User> => {
+export const removeEmail = ({ id }: Pick<User, 'id'>): Promise<User | undefined> => {
   return db.query('UPDATE users SET email = NULL WHERE id = $1 AND email IS NOT NULL RETURNING *', [id])
     .then(res => res.rows[0])
 }
 
-export const updateUser = async ({ id, name, email, division, ctftimeId, perms }: Partial<User>): Promise<User> => {
+export const updateUser = async ({ id, name, email, division, ctftimeId, perms }: Pick<User, 'id'> & Partial<User>): Promise<User | undefined> => {
   if (config.email && config.divisionACLs) {
     if (!email || !division) {
       const user = await getUserById({ id })
+      if (user === undefined) {
+        // User does not exist, bail
+        return undefined
+      }
       email = email || user.email
       division = division || user.division
     }
diff --git a/server/providers/challenges/database/index.ts b/server/providers/challenges/database/index.ts
@@ -17,7 +17,7 @@ class DatabaseProvider extends EventEmitter implements Provider {
 
   private async update (): Promise<void> {
     try {
-      const dbchallenges = await db.challenges.getAllChallenges() as DatabaseChallenge[]
+      const dbchallenges = await db.challenges.getAllChallenges()
 
       this.challenges = dbchallenges.map(({ id, data }) => {
         return {
@@ -52,7 +52,7 @@ class DatabaseProvider extends EventEmitter implements Provider {
   async updateChallenge (chall: Challenge): Promise<void> {
     const originalData = await db.challenges.getChallengeById({
       id: chall.id
-    }) as DatabaseChallenge
+    })
 
     // If we're inserting, have sane defaults
     if (originalData === undefined) {
diff --git a/server/providers/emails/mailgun/index.ts b/server/providers/emails/mailgun/index.ts
@@ -8,10 +8,16 @@ interface MailgunProviderOptions {
 
 export default class MailgunProvider implements Provider {
   private mailer: mg.Messages
-  constructor (options: MailgunProviderOptions) {
+  constructor (_options: Partial<MailgunProviderOptions>) {
+    const options: Required<MailgunProviderOptions> = {
+      apiKey: _options.apiKey || process.env.RCTF_MAILGUN_API_KEY,
+      domain: _options.domain || process.env.RCTF_MAILGUN_DOMAIN
+    } as Required<MailgunProviderOptions>
+    // TODO: validate that all options are indeed provided
+
     this.mailer = mg({
-      apiKey: options.apiKey || process.env.RCTF_MAILGUN_API_KEY,
-      domain: options.domain || process.env.RCTF_MAILGUN_DOMAIN
+      apiKey: options.apiKey,
+      domain: options.domain
     }).messages()
   }
 
diff --git a/server/providers/emails/ses/index.ts b/server/providers/emails/ses/index.ts
@@ -19,14 +19,21 @@ export class SesError extends Error {
 export default class SesProvider implements Provider {
   private sesSend: (params: AWS.SES.Types.SendEmailRequest) => Promise<AWS.SES.Types.SendEmailResponse>
 
-  constructor (options: SesProviderOptions) {
+  constructor (_options: Partial<SesProviderOptions>) {
+    const options: Required<SesProviderOptions> = {
+      awsKeyId: _options.awsKeyId || process.env.RCTF_SES_KEY_ID,
+      awsKeySecret: _options.awsKeySecret || process.env.RCTF_SES_KEY_SECRET,
+      awsRegion: _options.awsRegion || process.env.RCTF_SES_REGION
+    } as Required<SesProviderOptions>
+    // TODO: validate that all options are indeed provided
+
     const credentials = new AWS.Credentials({
-      accessKeyId: options.awsKeyId || process.env.RCTF_SES_KEY_ID,
-      secretAccessKey: options.awsKeySecret || process.env.RCTF_SES_KEY_SECRET
+      accessKeyId: options.awsKeyId,
+      secretAccessKey: options.awsKeySecret
     })
     const ses = new AWS.SES({
       credentials,
-      region: options.awsRegion || process.env.RCTF_SES_REGION
+      region: options.awsRegion
     })
     this.sesSend = promisify(ses.sendEmail.bind(ses))
   }
diff --git a/server/providers/emails/smtp/index.ts b/server/providers/emails/smtp/index.ts
@@ -8,8 +8,13 @@ interface SmtpProviderOptions {
 
 export default class SmtpProvider implements Provider {
   private mailer: Mailer
-  constructor (options: SmtpProviderOptions) {
-    this.mailer = nodemailer.createTransport(options.smtpUrl || process.env.RCTF_SMTP_URL)
+  constructor (_options: Partial<SmtpProviderOptions>) {
+    const options: Required<SmtpProviderOptions> = {
+      smtpUrl: _options.smtpUrl || process.env.RCTF_SMTP_URL
+    } as Required<SmtpProviderOptions>
+    // TODO: validate that all options are indeed provided
+
+    this.mailer = nodemailer.createTransport(options.smtpUrl)
   }
 
   send (mail: Mail): Promise<void> {
diff --git a/server/providers/uploads/gcs/index.ts b/server/providers/uploads/gcs/index.ts
@@ -11,9 +11,12 @@ export default class GcsProvider implements Provider {
   private bucket: Bucket
   private bucketName: string
 
-  constructor (options: GcsProviderOptions) {
-    options.credentials = options.credentials || JSON.parse(process.env.RCTF_GCS_CREDENTIALS)
-    options.bucketName = options.bucketName || process.env.RCTF_GCS_BUCKET
+  constructor (_options: Partial<GcsProviderOptions>) {
+    const options: Required<GcsProviderOptions> = {
+      credentials: _options.credentials || JSON.parse(process.env.RCTF_GCS_CREDENTIALS as string),
+      bucketName: _options.bucketName || process.env.RCTF_GCS_BUCKET as string
+    }
+    // TODO: validate that all options are indeed provided
 
     const storage = new Storage({
       credentials: options.credentials
diff --git a/server/providers/uploads/local/index.ts b/server/providers/uploads/local/index.ts
@@ -68,9 +68,8 @@ export default class LocalProvider implements Provider {
       }, async (request, reply) => {
         const key = request.query.key.toString()
 
-        if (this.uploadMap.has(key)) {
-          const upload = this.uploadMap.get(key)
-
+        const upload = this.uploadMap.get(key)
+        if (upload != null) {
           reply.header('Cache-Control', 'public, max-age=31557600, immutable')
           reply.header('Content-Disposition', contentDisposition(upload.name))
           reply.sendFile(path.relative(this.uploadDirectory, upload.filePath))
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,6 +4,7 @@
     "target": "es2019",
     "moduleResolution": "node",
     "noImplicitAny": true,
+    "strict": true,
     "allowJs": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-## Providers`
	`1`	`+# Providers`
`2`	`2`
`3`	`3`	`The provider system allows for flexible configuration of backends. Each provider provides a different option for how certain functionality should be implemented. As opposed to a generic plugin system, this allows for more defined customizations.`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const onUpdate = (newChallenges: Challenge[]): void => {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`void import(path.join('../providers', config.challengeProvider.name))`
`38`		`- .then(({ default: Provider }: { default: ProviderConstructor }) => {`
	`38`	`+ .then(({ default: Provider }: { default: ProviderConstructor }): void => {`
`39`	`39`	`provider = new Provider(config.challengeProvider.options ?? {})`
`40`	`40`
`41`	`41`	`provider.on('update', onUpdate)`
`@@ -53,11 +53,11 @@ export function getCleanedChallenges (): CleanedChallenge[] {`
`53`	`53`	`return cleanedChallenges`
`54`	`54`	`}`
`55`	`55`
`56`		`-export function getChallenge (id: string): Challenge {`
	`56`	`+export function getChallenge (id: string): Challenge \| undefined {`
`57`	`57`	`return challengesMap.get(id)`
`58`	`58`	`}`
`59`	`59`
`60`		`-export function getCleanedChallenge (id: string): CleanedChallenge {`
	`60`	`+export function getCleanedChallenge (id: string): CleanedChallenge \| undefined {`
`61`	`61`	`return cleanedChallengesMap.get(id)`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export const getAllChallenges = (): Promise<DatabaseChallenge[]> => {`
`11`	`11`	`.then(res => res.rows)`
`12`	`12`	`}`
`13`	`13`
`14`		`-export const getChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge> => {`
	`14`	`+export const getChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge \| undefined> => {`
`15`	`15`	`return db.query('SELECT * FROM challenges WHERE id = $1', [id])`
`16`	`16`	`.then(res => res.rows[0])`
`17`	`17`	`}`
`@@ -23,7 +23,7 @@ export const createChallenge = ({ id, data }: DatabaseChallenge): Promise<Databa`
`23`	`23`	`.then(res => res.rows[0])`
`24`	`24`	`}`
`25`	`25`
`26`		`-export const removeChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge> => {`
	`26`	`+export const removeChallengeById = ({ id }: Pick<DatabaseChallenge, 'id'>): Promise<DatabaseChallenge \| undefined> => {`
`27`	`27`	`return db.query('DELETE FROM challenges WHERE id = $1 RETURNING *', [id])`
`28`	`28`	`.then(res => res.rows[0])`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const makeMember = ({ id, userid, email }: UserMember): Promise<UserMembe`
`18`	`18`	`.then(res => res.rows[0])`
`19`	`19`	`}`
`20`	`20`
`21`		`-export const removeMember = ({ id, userid }: Pick<UserMember, 'id' \| 'userid'>): Promise<UserMember> => {`
	`21`	`+export const removeMember = ({ id, userid }: Pick<UserMember, 'id' \| 'userid'>): Promise<UserMember \| undefined> => {`
`22`	`22`	`return db.query('DELETE FROM user_members WHERE id = $1 and userid = $2 RETURNING *', [id, userid])`
`23`	`23`	`.then(res => res.rows[0])`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export const getSolveByUserIdAndChallId = ({ userid, challengeid }: Pick<Solve,`
`29`	`29`	`.then(res => res.rows[0])`
`30`	`30`	`}`
`31`	`31`
`32`		`-export const newSolve = ({ id, userid, challengeid, createdat }: Solve): Promise<Solve \| undefined> => {`
	`32`	`+export const newSolve = ({ id, userid, challengeid, createdat }: Solve): Promise<Solve> => {`
`33`	`33`	`return db.query('INSERT INTO solves (id, challengeid, userid, createdat) VALUES ($1, $2, $3, $4) RETURNING *', [id, challengeid, userid, createdat])`
`34`	`34`	`.then(res => res.rows[0])`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,42 +17,42 @@ export const getAllUsers = (): Promise<Pick<User, 'id' \| 'name' \| 'division'>[]>`
`17`	`17`	`.then(res => res.rows)`
`18`	`18`	`}`
`19`	`19`
`20`		`-export const getUserById = ({ id }: Pick<User, 'id'>): Promise<User> => {`
	`20`	`+export const getUserById = ({ id }: Pick<User, 'id'>): Promise<User \| undefined> => {`
`21`	`21`	`return db.query('SELECT * FROM users WHERE id = $1', [id])`
`22`	`22`	`.then(res => res.rows[0])`
`23`	`23`	`}`
`24`	`24`
`25`		`-export const getUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User> => {`
	`25`	`+export const getUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User \| undefined> => {`
`26`	`26`	`return db.query('SELECT * FROM users WHERE email = $1', [email])`
`27`	`27`	`.then(res => res.rows[0])`
`28`	`28`	`}`
`29`	`29`
`30`		`-export const getUserByCtftimeId = ({ ctftimeId }: Pick<User, 'ctftimeId'>): Promise<User> => {`
	`30`	`+export const getUserByCtftimeId = ({ ctftimeId }: Pick<User, 'ctftimeId'>): Promise<User \| undefined> => {`
`31`	`31`	`return db.query('SELECT * FROM users WHERE ctftime_id = $1', [ctftimeId])`
`32`	`32`	`.then(res => res.rows[0])`
`33`	`33`	`}`
`34`	`34`
`35`		`-export const getUserByIdAndEmail = ({ id, email }: Pick<User, 'id' \| 'email'>): Promise<User> => {`
	`35`	`+export const getUserByIdAndEmail = ({ id, email }: Pick<User, 'id' \| 'email'>): Promise<User \| undefined> => {`
`36`	`36`	`return db.query('SELECT * FROM users WHERE id = $1 AND email = $2', [id, email])`
`37`	`37`	`.then(res => res.rows[0])`
`38`	`38`	`}`
`39`	`39`
`40`		`-export const getUserByNameOrEmail = ({ name, email }: Pick<User, 'name' \| 'email'>): Promise<User> => {`
	`40`	`+export const getUserByNameOrEmail = ({ name, email }: Pick<User, 'name' \| 'email'>): Promise<User \| undefined> => {`
`41`	`41`	`return db.query('SELECT * FROM users WHERE name = $1 OR email = $2', [name, email])`
`42`	`42`	`.then(res => res.rows[0])`
`43`	`43`	`}`
`44`	`44`
`45`		`-export const getUserByNameOrCtftimeId = ({ name, ctftimeId }: Pick<User, 'name' \| 'ctftimeId'>): Promise<User> => {`
	`45`	`+export const getUserByNameOrCtftimeId = ({ name, ctftimeId }: Pick<User, 'name' \| 'ctftimeId'>): Promise<User \| undefined> => {`
`46`	`46`	`return db.query('SELECT * FROM users WHERE name = $1 OR ctftime_id = $2', [name, ctftimeId])`
`47`	`47`	`.then(res => res.rows[0])`
`48`	`48`	`}`
`49`	`49`
`50`		`-export const removeUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User> => {`
	`50`	`+export const removeUserByEmail = ({ email }: Pick<User, 'email'>): Promise<User \| undefined> => {`
`51`	`51`	`return db.query('DELETE FROM users WHERE email = $1 RETURNING *', [email])`
`52`	`52`	`.then(res => res.rows[0])`
`53`	`53`	`}`
`54`	`54`
`55`		`-export const removeUserById = ({ id }: Pick<User, 'id'>): Promise<User> => {`
	`55`	`+export const removeUserById = ({ id }: Pick<User, 'id'>): Promise<User \| undefined> => {`
`56`	`56`	`return db.query('DELETE FROM users WHERE id = $1 RETURNING *', [id])`
`57`	`57`	`.then(res => res.rows[0])`
`58`	`58`	`}`
`@@ -67,20 +67,24 @@ export const makeUser = ({ id, name, email, division, ctftimeId, perms }: User):`
`67`	`67`	`.then(res => res.rows[0])`
`68`	`68`	`}`
`69`	`69`
`70`		`-export const removeCtftimeId = ({ id }: Pick<User, 'id'>): Promise<User> => {`
	`70`	`+export const removeCtftimeId = ({ id }: Pick<User, 'id'>): Promise<User \| undefined> => {`
`71`	`71`	`return db.query('UPDATE users SET ctftime_id = NULL WHERE id = $1 AND ctftime_id IS NOT NULL RETURNING *', [id])`
`72`	`72`	`.then(res => res.rows[0])`
`73`	`73`	`}`
`74`	`74`
`75`		`-export const removeEmail = ({ id }: Pick<User, 'id'>): Promise<User> => {`
	`75`	`+export const removeEmail = ({ id }: Pick<User, 'id'>): Promise<User \| undefined> => {`
`76`	`76`	`return db.query('UPDATE users SET email = NULL WHERE id = $1 AND email IS NOT NULL RETURNING *', [id])`
`77`	`77`	`.then(res => res.rows[0])`
`78`	`78`	`}`
`79`	`79`
`80`		`-export const updateUser = async ({ id, name, email, division, ctftimeId, perms }: Partial<User>): Promise<User> => {`
	`80`	`+export const updateUser = async ({ id, name, email, division, ctftimeId, perms }: Pick<User, 'id'> & Partial<User>): Promise<User \| undefined> => {`
`81`	`81`	`if (config.email && config.divisionACLs) {`
`82`	`82`	`if (!email \|\| !division) {`
`83`	`83`	`const user = await getUserById({ id })`
	`84`	`+ if (user === undefined) {`
	`85`	`+ // User does not exist, bail`
	`86`	`+ return undefined`
	`87`	`+ }`
`84`	`88`	`email = email \|\| user.email`
`85`	`89`	`division = division \|\| user.division`
`86`	`90`	`}`