💥 updates throws on validation errors

src/about-me/person/updaters/__test/email-updater.test.ts

@@ -43,7 +43,7 @@ describe('emailUpdater', () => {
 			},
 		})
 	})
-	it('ignores malformed emails', async () => {
+	it('throws on malformed emails', async () => {
 		const updater = createEmailUpdater()
 
 		const initialEmail: Email = {
@@ -52,6 +52,14 @@ describe('emailUpdater', () => {
 			verifiedDate: '2020-02-02',
 		}
 
+		await expect(() => updater.updatePerson(
+			makePerson({ 
+				email: initialEmail,
+			}),
+			{ email: 'badly formattted email' }))
+			.rejects
+			.toThrow('Validation error')
+		/*
 		const updated = await updater.updatePerson(
 			makePerson({ 
 				email: initialEmail,
@@ -61,5 +69,6 @@ describe('emailUpdater', () => {
 		expect(updated).toMatchObject({
 			email: initialEmail,
 		})
+		*/
 	})
 })

src/about-me/person/updaters/__test/phone-updater.test.ts

@@ -45,10 +45,9 @@ describe('phoneUpdater', () => {
 	})
 
 	it.each([
-		[null],
 		['bad number'],
 		['123'],
-	])('ignores update on invalid number "%s"', async phoneNumber => {
+	])('throws on update with invalid number "%s"', async phoneNumber => {
 		const updater = createPhoneUpdater('SE')
 
 		const initialPhone: Phone = {
@@ -57,18 +56,16 @@ describe('phoneUpdater', () => {
 			verifiedDate: '2020-02-02',
 		}
 
-		const updated = await updater.updatePerson(
+		await expect(() => updater.updatePerson(
 			makePerson({ 
 				phone: initialPhone,
 			}),
-			{ phoneNumber })
-
-		expect(updated).toMatchObject({
-			phone: initialPhone,
-		})
+			{ phoneNumber }))
+			.rejects
+			.toThrow('Validation error')
 	})
 
-	it('ignores malformed phone numbers', async () => {
+	it('throws on malformed phone numbers', async () => {
 		const updater = createPhoneUpdater('SE')
 
 		const initialPhone: Phone = {
@@ -77,14 +74,12 @@ describe('phoneUpdater', () => {
 			verifiedDate: '2020-02-02',
 		}
 
-		const updated = await updater.updatePerson(
+		await expect(() => updater.updatePerson(
 			makePerson({ 
 				phone: initialPhone,
 			}),
-			{ phoneNumber: 'badly formattted phone number' })
-
-		expect(updated).toMatchObject({
-			phone: initialPhone,
-		})
+			{ phoneNumber: 'badly formattted phone number' }))
+			.rejects
+			.toThrow('Validation error')
 	})
 })

src/about-me/person/updaters/email-updater.ts

@@ -1,22 +1,33 @@
 import { randomUUID } from 'crypto'
 import * as EmailValidator from 'email-validator'
 import { Email, PersonUpdater } from '../types'
+import { throwValidationErrorForField } from './validation-error'
+
+const normalizeStringInput = (s?: string): string|null => (typeof s === 'string')
+	? s.trim()
+	: null
 
 export const createEmailUpdater = (): PersonUpdater => ({
 	updatePerson: async (person, update) => ({
 		...person,
-		email: patchEmail(person?.email, update?.email?.trim()),
+		email: patchEmail(person?.email || null, getValidatedEmail(normalizeStringInput(update?.email))),
 	}),
 })
 
-const patchEmail = (email?: Email, update?: string): Email | null => 
-	update === ''
-		? null
-		: update && EmailValidator.validate(update) && (update !== email?.address)
-			? ({
-				address: update,
-				isVerified: false,
-				verifiedDate: null,
-				verificationCode: randomUUID(),
-			})
-			: email
+const getValidatedEmail = (email: string): string|null|false => email && EmailValidator.validate(email) && email
+
+const patchEmail = (email: Email, update: string|null|false): Email | null => 
+	update === null
+		? email
+		: update === ''
+			? null
+			: !update
+				? (throwValidationErrorForField('email'), email)
+				: update !== email?.address
+					? ({
+						address: update,
+						isVerified: false,
+						verifiedDate: null,
+						verificationCode: randomUUID(),
+					})
+					: email

src/about-me/person/updaters/phone-updater.ts

@@ -2,32 +2,41 @@ import { getEnv } from '@helsingborg-stad/gdi-api-node'
 import { parsePhoneNumber } from 'awesome-phonenumber'
 import { randomUUID } from 'crypto'
 import { PersonUpdater, Phone } from '../types'
+import { throwValidationErrorForField } from './validation-error'
 
 export const createPhoneUpdaterFromEnv = (regionCode = 'SE'): PersonUpdater => createPhoneUpdater(getEnv('PHONENUMBER_REGION', { fallback: regionCode }))
 
+const normalizeStringInput = (s?: string): string|null => (typeof s === 'string')
+	? s.trim()
+	: null
+
 export const createPhoneUpdater = (regionCode: string): PersonUpdater => ({
 	updatePerson: async (person, update) => ({
 		...person,
-		phone: patchPhone(person?.phone, getValidatedPhoneNumber(update?.phoneNumber?.trim(), regionCode)),
+		phone: patchPhone(person?.phone || null, getValidatedPhoneNumber(normalizeStringInput(update?.phoneNumber), regionCode)),
 	}),
 })
 
 const getValidatedPhoneNumber = (number: string, regionCode: string): string => {
-	if (number === '') {
-		return ''
+	if (!number) {
+		return number
 	}
-	const parsed = parsePhoneNumber(number || '', regionCode)
+	const parsed = parsePhoneNumber(number.trim(), regionCode)
 	return parsed?.isPossible() && parsed?.getNumber('e164')
 }
 
 const patchPhone = (phone?: Phone, update?: string): Phone | null => 
-	update === ''
-		? null
-		: update && (update !== phone?.number)
-			? ({
-				number: update,
-				isVerified: false,
-				verifiedDate: null,
-				verificationCode: randomUUID(),
-			})
-			: phone
+	update === null
+		? phone
+		: update === ''
+			? null
+			: !update
+				? (throwValidationErrorForField('phoneNumber'), phone)
+				: (update !== phone?.number)
+					? ({
+						number: update,
+						isVerified: false,
+						verifiedDate: null,
+						verificationCode: randomUUID(),
+					})
+					: phone

src/about-me/person/updaters/validation-error.ts

@@ -0,0 +1,9 @@
+import { GraphQLError } from 'graphql'
+
+export const throwValidationErrorForField = (fieldName: string): void => {
+	throw new GraphQLError('Validation error', {
+		extensions: {
+			'validation-failed-for-field': fieldName,
+		},
+	})
+}