From b4811b5e0133fc275bf5ec5017b2a765482987a6 Mon Sep 17 00:00:00 2001 From: Hugues Chocart Date: Mon, 6 May 2024 16:48:00 -0300 Subject: [PATCH] fix: skip email verify for self hosting (#272) --- packages/backend/src/api/v1/auth/index.ts | 3 ++- packages/backend/src/api/v1/users.ts | 3 ++- packages/backend/src/index.ts | 2 +- packages/backend/src/utils/config.ts | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/api/v1/auth/index.ts b/packages/backend/src/api/v1/auth/index.ts index af77615e..20a1d8ce 100644 --- a/packages/backend/src/api/v1/auth/index.ts +++ b/packages/backend/src/api/v1/auth/index.ts @@ -15,6 +15,7 @@ import { verifyJWT, verifyPassword, } from "./utils" +import config from "@/src/utils/config" const auth = new Router({ prefix: "/auth", @@ -104,7 +105,7 @@ auth.post("/signup", async (ctx: Context) => { email, orgId: org.id, role: "owner", - verified: !process.env.RESEND_KEY ? true : false, + verified: config.skipEmailVerify, lastLoginAt: new Date(), } diff --git a/packages/backend/src/api/v1/users.ts b/packages/backend/src/api/v1/users.ts index 78b3ea03..d2eab6d8 100644 --- a/packages/backend/src/api/v1/users.ts +++ b/packages/backend/src/api/v1/users.ts @@ -12,6 +12,7 @@ import { signJWT } from "./auth/utils" import { roles } from "shared" import { checkAccess } from "@/src/utils/authorization" import Context from "@/src/utils/koa" +import config from "@/src/utils/config" const users = new Router({ prefix: "/users", @@ -192,7 +193,7 @@ users.post("/", checkAccess("teamMembers", "create"), async (ctx: Context) => { email, orgId, role, - verified: false, + verified: config.skipEmailVerify, singleUseToken: token, } diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 1b971c67..24fe378f 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -44,7 +44,7 @@ app.use(ratelimit) app.use(bodyParser({ jsonLimit: "5mb", textLimit: "5mb" })) app.use(setDefaultBody) -if (config.IS_SELF_HOSTED) { +if (config.isSelfHosted) { app.use(licenseMiddleware) } diff --git a/packages/backend/src/utils/config.ts b/packages/backend/src/utils/config.ts index 83da6412..467eef2f 100644 --- a/packages/backend/src/utils/config.ts +++ b/packages/backend/src/utils/config.ts @@ -1,5 +1,6 @@ const config = { - IS_SELF_HOSTED: process.env.IS_SELF_HOSTED === "true" ? true : false, + isSelfHosted: process.env.IS_SELF_HOSTED === "true" ? true : false, + skipEmailVerify: process.env.SKIP_EMAIL_VERIFY === "true" ? true : false, } export default config