* Implement secondary email * Fix already existing tests failing * Added tests for secondary email feature * Skip email verification if user is changing the primary email to a verified secondary email * Fix type errors in tests * Fix email becoming unverified when switched between primary and secondary email * Added a check to prevent prisma error from throwing up due to duplicate records * Improved error handling when adding a secondary email * Add test for resend verification email flow for secondary emails and validation of invite link * Add a new column to link secondary emails with verification tokens * Fix failing to update email to an unverified secondary email of the same user * Fix failing tests * Change text of resend verification email * Add ability to use the verified secondary emails to get the event details to * Fix type errors * Fix failing e2e tests * Fix failing unit tests * Fix failing type checks * Fix secondary verification email subject * Fix failing e2e tests --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com>
140 lines
3.7 KiB
TypeScript
140 lines
3.7 KiB
TypeScript
import { randomBytes, createHash } from "crypto";
|
|
import { totp } from "otplib";
|
|
|
|
import {
|
|
sendEmailVerificationCode,
|
|
sendEmailVerificationLink,
|
|
sendChangeOfEmailVerificationLink,
|
|
} from "@calcom/emails/email-manager";
|
|
import { getFeatureFlag } from "@calcom/features/flags/server/utils";
|
|
import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
|
|
import { WEBAPP_URL } from "@calcom/lib/constants";
|
|
import logger from "@calcom/lib/logger";
|
|
import { getTranslation } from "@calcom/lib/server/i18n";
|
|
import { prisma } from "@calcom/prisma";
|
|
|
|
const log = logger.getSubLogger({ prefix: [`[[Auth] `] });
|
|
|
|
interface VerifyEmailType {
|
|
username?: string;
|
|
email: string;
|
|
language?: string;
|
|
secondaryEmailId?: number;
|
|
}
|
|
|
|
export const sendEmailVerification = async ({
|
|
email,
|
|
language,
|
|
username,
|
|
secondaryEmailId,
|
|
}: VerifyEmailType) => {
|
|
const token = randomBytes(32).toString("hex");
|
|
const translation = await getTranslation(language ?? "en", "common");
|
|
const emailVerification = await getFeatureFlag(prisma, "email-verification");
|
|
|
|
if (!emailVerification) {
|
|
log.warn("Email verification is disabled - Skipping");
|
|
return { ok: true, skipped: true };
|
|
}
|
|
|
|
await checkRateLimitAndThrowError({
|
|
rateLimitingType: "core",
|
|
identifier: email,
|
|
});
|
|
|
|
await prisma.verificationToken.create({
|
|
data: {
|
|
identifier: email,
|
|
token,
|
|
expires: new Date(Date.now() + 24 * 3600 * 1000), // +1 day
|
|
secondaryEmailId: secondaryEmailId || null,
|
|
},
|
|
});
|
|
|
|
const params = new URLSearchParams({
|
|
token,
|
|
});
|
|
|
|
await sendEmailVerificationLink({
|
|
language: translation,
|
|
verificationEmailLink: `${WEBAPP_URL}/api/auth/verify-email?${params.toString()}`,
|
|
user: {
|
|
email,
|
|
name: username,
|
|
},
|
|
isSecondaryEmailVerification: !!secondaryEmailId,
|
|
});
|
|
|
|
return { ok: true, skipped: false };
|
|
};
|
|
|
|
export const sendEmailVerificationByCode = async ({ email, language, username }: VerifyEmailType) => {
|
|
const translation = await getTranslation(language ?? "en", "common");
|
|
const secret = createHash("md5")
|
|
.update(email + process.env.CALENDSO_ENCRYPTION_KEY)
|
|
.digest("hex");
|
|
|
|
totp.options = { step: 900 };
|
|
const code = totp.generate(secret);
|
|
|
|
await sendEmailVerificationCode({
|
|
language: translation,
|
|
verificationEmailCode: code,
|
|
user: {
|
|
email,
|
|
name: username,
|
|
},
|
|
});
|
|
|
|
return { ok: true, skipped: false };
|
|
};
|
|
|
|
interface ChangeOfEmail {
|
|
user: {
|
|
username: string;
|
|
emailFrom: string;
|
|
emailTo: string;
|
|
};
|
|
language?: string;
|
|
}
|
|
|
|
export const sendChangeOfEmailVerification = async ({ user, language }: ChangeOfEmail) => {
|
|
const token = randomBytes(32).toString("hex");
|
|
const translation = await getTranslation(language ?? "en", "common");
|
|
const emailVerification = await getFeatureFlag(prisma, "email-verification");
|
|
|
|
if (!emailVerification) {
|
|
log.warn("Email verification is disabled - Skipping");
|
|
return { ok: true, skipped: true };
|
|
}
|
|
|
|
await checkRateLimitAndThrowError({
|
|
rateLimitingType: "core",
|
|
identifier: user.emailFrom,
|
|
});
|
|
|
|
await prisma.verificationToken.create({
|
|
data: {
|
|
identifier: user.emailFrom, // We use from as this is the email use to get the metadata from
|
|
token,
|
|
expires: new Date(Date.now() + 24 * 3600 * 1000), // +1 day
|
|
},
|
|
});
|
|
|
|
const params = new URLSearchParams({
|
|
token,
|
|
});
|
|
|
|
await sendChangeOfEmailVerificationLink({
|
|
language: translation,
|
|
verificationEmailLink: `${WEBAPP_URL}/auth/verify-email-change?${params.toString()}`,
|
|
user: {
|
|
emailFrom: user.emailFrom,
|
|
emailTo: user.emailTo,
|
|
name: user.username,
|
|
},
|
|
});
|
|
|
|
return { ok: true, skipped: false };
|
|
};
|