From 55cf3b4b02bdc673048820e39172d406fd72b134 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sun, 23 May 2021 12:44:02 -0500
Subject: [PATCH] Update: Update fosscord-server-util to latest and fix issues
 with NULL and undefined

---
 package-lock.json           | 14 +++++++-------
 package.json                |  2 +-
 src/routes/auth/register.ts |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc6731a8..21c011ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
-				"@fosscord/server-util": "^1.2.8",
+				"@fosscord/server-util": "^1.3.0",
 				"@types/jest": "^26.0.22",
 				"@types/json-schema": "^7.0.7",
 				"ajv": "^8.4.0",
@@ -498,9 +498,9 @@
 			}
 		},
 		"node_modules/@fosscord/server-util": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.2.8.tgz",
-			"integrity": "sha512-akw6J6E+XxMn+diBRQbXn49QDkE3okgX5qEr0UjzRjaw/eE5+OieE/y9f9v8VhBQYYkNWFrdRt23QBRREQuqUg==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
+			"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
 			"dependencies": {
 				"@types/jsonwebtoken": "^8.5.0",
 				"@types/mongoose-autopopulate": "^0.10.1",
@@ -12664,9 +12664,9 @@
 			}
 		},
 		"@fosscord/server-util": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.2.8.tgz",
-			"integrity": "sha512-akw6J6E+XxMn+diBRQbXn49QDkE3okgX5qEr0UjzRjaw/eE5+OieE/y9f9v8VhBQYYkNWFrdRt23QBRREQuqUg==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.0.tgz",
+			"integrity": "sha512-GBU1XLAQKylr76Vb5kGEkYInj0qPkz/D9oAVSPISMIWbYeo6RIfARVneg6FdreWC+WK7UNcpGr+JFJpvMfSeOA==",
 			"requires": {
 				"@types/jsonwebtoken": "^8.5.0",
 				"@types/mongoose-autopopulate": "^0.10.1",
diff --git a/package.json b/package.json
index 78305e42..76fdcb8a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 	},
 	"homepage": "https://github.com/fosscord/fosscord-api#readme",
 	"dependencies": {
-		"@fosscord/server-util": "^1.2.8",
+		"@fosscord/server-util": "^1.3.0",
 		"@types/jest": "^26.0.22",
 		"@types/json-schema": "^7.0.7",
 		"ajv": "^8.4.0",
diff --git a/src/routes/auth/register.ts b/src/routes/auth/register.ts
index b52b5cf3..eeef961e 100644
--- a/src/routes/auth/register.ts
+++ b/src/routes/auth/register.ts
@@ -40,7 +40,7 @@ router.post(
 		// TODO: check password strength
 
 		// adjusted_email will be slightly modified version of the user supplied email -> e.g. protection against GMail Trick
-		let adjusted_email: string | undefined = adjustEmail(email);
+		let adjusted_email: string | null = adjustEmail(email);
 
 		// adjusted_password will be the hash of the password
 		let adjusted_password: string = "";
@@ -181,7 +181,7 @@ router.post(
 			mobile: false,
 			premium: false,
 			premium_type: 0,
-			phone: undefined,
+			phone: null,
 			mfa_enabled: false,
 			verified: false,
 			presence: {
@@ -253,7 +253,7 @@ router.post(
 	}
 );
 
-export function adjustEmail(email: string): string | undefined {
+export function adjustEmail(email: string): string | null {
 	// body parser already checked if it is a valid email
 	const parts = <RegExpMatchArray>email.match(EMAIL_REGEX);
 	// @ts-ignore