fix: emails must be verified before account can be used

ThatConference · Oct 19, 2023 · 32a3d5c · 32a3d5c
1 parent 832e381
commit 32a3d5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "that-us",
-	"version": "3.15.0",
+	"version": "3.15.1",
 	"description": "THAT.us website",
 	"main": "index.js",
 	"type": "module",

diff --git a/src/hooks.server.js b/src/hooks.server.js
@@ -49,6 +49,10 @@ async function authorization({ event, resolve }) {
 			}
 			throw redirect(303, `/login-redirect?returnTo=${toPath}`);
 		}
+
+		if (!session.user.sub.startsWith('twitter') && session.user?.emailVerified === false) {
+			throw redirect(307, `/verify-account`);
+		}
 	}
 
 	return resolve(event);
@@ -85,11 +89,14 @@ const authConfig = {
 			return baseUrl;
 		},
 		jwt(jwtGoo) {
-			const { account, token } = jwtGoo;
+			const { account, token, profile } = jwtGoo;
 			if (account) {
 				token.accessToken = account.access_token;
 				token.idToken = account.id_token;
 			}
+			if (profile) {
+				token.emailVerified = profile.email_verified;
+			}
 			return token;
 		},
 		session(sessionGoo) {
@@ -98,6 +105,7 @@ const authConfig = {
 			session.idToken = token.idToken;
 			session.user.id = token.sub;
 			session.user.sub = token.sub;
+			session.user.emailVerified = token.emailVerified;
 			const payload = parseOnly(token.accessToken);
 			if (payload) {
 				const { permissions } = payload;