public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Skipping totp code for org dev (#10403)

pull/9836/head
Leo Giovanetti 2023-07-26 13:15:37 -03:00 committed by GitHub
parent 83d98a1ac4
commit dae4627ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/constants.ts
View File

@ -34,10 +34,12 @@ export const IS_CALCOM =
WEBAPP_URL &&
(new URL(WEBAPP_URL).hostname.endsWith("cal.com") ||
new URL(WEBAPP_URL).hostname.endsWith("cal.dev") ||
new URL(WEBAPP_URL).hostname.endsWith("cal.qa") ||
new URL(WEBAPP_URL).hostname.endsWith("cal-staging.com"));
export const CONSOLE_URL =
new URL(WEBAPP_URL).hostname.endsWith(".cal.dev") ||
new URL(WEBAPP_URL).hostname.endsWith(".cal.qa") ||
new URL(WEBAPP_URL).hostname.endsWith(".cal-staging.com") ||
process.env.NODE_ENV !== "production"
? `https://console.cal.dev`

6
packages/trpc/server/routers/viewer/organizations/create.handler.ts
View File

@ -5,7 +5,7 @@ import { sendOrganizationEmailVerification } from "@calcom/emails";
import { hashPassword } from "@calcom/features/auth/lib/hashPassword";
import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
import { IS_PRODUCTION, IS_TEAM_BILLING_ENABLED, RESERVED_SUBDOMAINS } from "@calcom/lib/constants";
import { IS_CALCOM, IS_TEAM_BILLING_ENABLED, RESERVED_SUBDOMAINS } from "@calcom/lib/constants";
import { getTranslation } from "@calcom/lib/server/i18n";
import { prisma } from "@calcom/prisma";
import { MembershipRole } from "@calcom/prisma/enums";
@ -82,6 +82,8 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {
const availability = getAvailabilityFromSchedule(DEFAULT_SCHEDULE);
if (check === false) {
if (IS_CALCOM) await vercelCreateDomain(slug);
const createOwnerOrg = await prisma.user.create({
data: {
username: adminUsername,
@ -118,8 +120,6 @@ export const createHandler = async ({ input, ctx }: CreateOptions) => {
},
});
if (IS_PRODUCTION) await vercelCreateDomain(slug);
await prisma.membership.create({
data: {
userId: createOwnerOrg.id,

3
packages/trpc/server/routers/viewer/organizations/verifyCode.handler.ts
View File

@ -1,6 +1,7 @@
import { createHash } from "crypto";
import { totp } from "otplib";
import { IS_PRODUCTION } from "@calcom/lib/constants";
import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
import { TRPCError } from "@trpc/server";
@ -20,6 +21,8 @@ export const verifyCodeHandler = async ({ ctx, input }: VerifyCodeOptions) => {
if (!user || !email || !code) throw new TRPCError({ code: "BAD_REQUEST" });
if (!IS_PRODUCTION) return true;
const secret = createHash("md5")
.update(email + process.env.CALENDSO_ENCRYPTION_KEY)
.digest("hex");