Merge branch 'master' into fix/cdn-proxy-path

2 files changed, 10 insertions, 6 deletions

diff --git a/src/api/Server.ts b/src/api/Server.ts

index 472ab1d6f..40d2b6dcb 100644
--- a/src/api/Server.ts
+++ b/src/api/Server.ts
@@ -18,15 +18,15 @@
 
 import {
 	Config,
+	ConnectionConfig,
+	ConnectionLoader,
 	Email,
-	initDatabase,
-	initEvent,
 	JSONReplacer,
-	registerRoutes,
 	Sentry,
 	WebAuthn,
-	ConnectionConfig,
-	ConnectionLoader,
+	initDatabase,
+	initEvent,
+	registerRoutes,
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { Server, ServerOptions } from "lambert-server";
@@ -141,6 +141,10 @@ export class SpacebarServer extends Server {
 			res.sendFile(path.join(PUBLIC_ASSETS_FOLDER, "index.html")),
 		);
 
+		app.get("/verify", (req, res) =>
+			res.sendFile(path.join(PUBLIC_ASSETS_FOLDER, "verify.html")),
+		);
+
 		this.app.use(ErrorHandler);
 
 		Sentry.errorHandler(this.app);
diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts

index 49f742778..32c3f3058 100644
--- a/src/api/routes/auth/verify/index.ts
+++ b/src/api/routes/auth/verify/index.ts
@@ -85,7 +85,7 @@ router.post(
 			user = userTokenData.user;
 		} catch {
 			throw FieldErrors({
-				password: {
+				token: {
 					message: req.t("auth:password_reset.INVALID_TOKEN"),
 					code: "INVALID_TOKEN",
 				},