From a831a7d848eca3a57c76788bc26c223bc314f196 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 22 Feb 2024 15:35:09 -0500 Subject: [PATCH] small typos and update migration timestamp --- ...up-control.ts => 20240222201806_admin-signup-control.ts} | 0 backend/src/server/routes/v3/signup-router.ts | 6 +++--- backend/src/services/auth/auth-login-service.ts | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) rename backend/src/db/migrations/{20240222073748_admin-signup-control.ts => 20240222201806_admin-signup-control.ts} (100%) diff --git a/backend/src/db/migrations/20240222073748_admin-signup-control.ts b/backend/src/db/migrations/20240222201806_admin-signup-control.ts similarity index 100% rename from backend/src/db/migrations/20240222073748_admin-signup-control.ts rename to backend/src/db/migrations/20240222201806_admin-signup-control.ts diff --git a/backend/src/server/routes/v3/signup-router.ts b/backend/src/server/routes/v3/signup-router.ts index d1ec800f95..24387d2f5f 100644 --- a/backend/src/server/routes/v3/signup-router.ts +++ b/backend/src/server/routes/v3/signup-router.ts @@ -30,7 +30,7 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => { const serverCfg = await getServerCfg(); if (!serverCfg.allowSignUp) { throw new BadRequestError({ - message: "Sign up is disabled!" + message: "Sign up is disabled" }); } @@ -71,7 +71,7 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => { const serverCfg = await getServerCfg(); if (!serverCfg.allowSignUp) { throw new BadRequestError({ - message: "Sign up is disabled!" + message: "Sign up is disabled" }); } @@ -120,7 +120,7 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => { const serverCfg = await getServerCfg(); if (!serverCfg.allowSignUp) { throw new BadRequestError({ - message: "Sign up is disabled!" + message: "Sign up is disabled" }); } diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts index ee2cc59954..11ce577351 100644 --- a/backend/src/services/auth/auth-login-service.ts +++ b/backend/src/services/auth/auth-login-service.ts @@ -270,7 +270,7 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }: if (!user) { // Create a new user based on oAuth - if (!serverCfg?.allowSignUp) throw new BadRequestError({ message: "Sign Up disabled", name: "Oauth 2 login" }); + if (!serverCfg?.allowSignUp) throw new BadRequestError({ message: "Sign up disabled", name: "Oauth 2 login" }); if (serverCfg?.allowedSignUpDomain) { const domain = email.split("@")[1]; @@ -281,9 +281,8 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }: name: "Oauth 2 login" }); } - + user = await userDAL.create({ email, firstName, lastName, authMethods: [authMethod], isGhost: false }); - } const isLinkingRequired = !user?.authMethods?.includes(authMethod); const isUserCompleted = user.isAccepted;