* feat: add toggle to opt out of booking title translation in instant meetings (#25547) * feat: add toggle to opt out of booking title translation in instant meetings Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: add autoTranslateTitleEnabled to test builder Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: respect autoTranslateTitleEnabled toggle in InstantBookingCreateService Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: fetch autoTranslateTitleEnabled directly in InstantBookingCreateService Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * refactor: rename autoTranslateTitleEnabled to autoTranslateInstantMeetingTitleEnabled - Renamed field to clarify it only applies to instant meeting title translation - Moved Prisma query to EventTypeRepository.findInstantMeetingConfigById() - Removed title translation logic from update.handler.ts (flag only controls instant meeting title) - Updated all references across the codebase - Added new i18n translation keys for the renamed field Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: add autoTranslateInstantMeetingTitleEnabled to test destructuring patterns Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: use Prisma.TeamCreateInput type for metadata in test helper Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: add autoTranslateInstantMeetingTitleEnabled to mockUpdatedEventType in test Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * refactor: use generic findByIdMinimal instead of business-specific method - Add autoTranslateInstantMeetingTitleEnabled to eventTypeSelect constant - Remove findInstantMeetingConfigById from EventTypeRepository - Update InstantBookingCreateService to use findByIdMinimal Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * refactor: remove autoTranslateInstantMeetingTitleEnabled from eventTypeSelect (not needed for findByIdMinimal) Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * feat: add autoTranslateInstantMeetingTitleEnabled to event type form defaults - Rename shouldTranslateTitle to shouldAutoTranslateInstantMeetingTitle for clarity - Add autoTranslateInstantMeetingTitleEnabled to findById and findByIdForOrgAdmin selects - Add autoTranslateInstantMeetingTitleEnabled to useEventTypeForm defaultValues Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: only update autoTranslateInstantMeetingTitleEnabled when explicitly provided Fixes issue where omitting the field in update requests would overwrite the saved opt-out setting with the default value (true). Now the field is only included in the update payload when explicitly provided. Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Create standard for rate limits --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
69 lines
1.9 KiB
TypeScript
69 lines
1.9 KiB
TypeScript
import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";
|
|
import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
|
|
import logger from "@calcom/lib/logger";
|
|
import { prisma } from "@calcom/prisma";
|
|
|
|
import { TRPCError } from "@trpc/server";
|
|
|
|
import type { TRPCContext } from "../../../createContext";
|
|
import type { TrpcSessionUser } from "../../../types";
|
|
import type { TResendVerifyEmailSchema } from "./resendVerifyEmail.schema";
|
|
|
|
type ResendEmailOptions = {
|
|
ctx: {
|
|
user: NonNullable<TrpcSessionUser>;
|
|
req: TRPCContext["req"] | undefined;
|
|
};
|
|
input: TResendVerifyEmailSchema;
|
|
};
|
|
|
|
const log = logger.getSubLogger({ prefix: [`[[Auth] `] });
|
|
|
|
export const resendVerifyEmail = async ({ input, ctx }: ResendEmailOptions) => {
|
|
let emailToVerify = ctx.user.email;
|
|
|
|
await checkRateLimitAndThrowError({
|
|
rateLimitingType: "core",
|
|
identifier: `resendVerifyEmail:${ctx.user.id}`,
|
|
});
|
|
|
|
let emailVerified = Boolean(ctx.user.emailVerified);
|
|
let secondaryEmail;
|
|
// If the input which is coming is not the current user's email, it could be a secondary email
|
|
if (input?.email && input?.email !== ctx.user.email) {
|
|
secondaryEmail = await prisma.secondaryEmail.findUnique({
|
|
where: {
|
|
email: input.email,
|
|
userId: ctx.user.id,
|
|
},
|
|
});
|
|
|
|
if (!secondaryEmail) {
|
|
throw new TRPCError({ code: "BAD_REQUEST", message: "Email not found" });
|
|
}
|
|
|
|
if (secondaryEmail.emailVerified) {
|
|
emailVerified = true;
|
|
} else {
|
|
emailToVerify = input.email;
|
|
emailVerified = false;
|
|
}
|
|
}
|
|
if (emailVerified) {
|
|
log.info(`User ${ctx.user.id} already verified email`);
|
|
return {
|
|
ok: true,
|
|
skipped: true,
|
|
};
|
|
}
|
|
|
|
const email = await sendEmailVerification({
|
|
email: emailToVerify,
|
|
username: ctx.user?.username ?? undefined,
|
|
language: ctx.user.locale,
|
|
secondaryEmailId: secondaryEmail?.id,
|
|
});
|
|
|
|
return email;
|
|
};
|