From 7a80a5f92910a7a9b28f9b4ab746a4099b9d3870 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Sat, 28 Dec 2024 02:29:53 +0530 Subject: [PATCH 01/11] fix: localized date (#18388) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- packages/features/ee/payments/components/PaymentPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/features/ee/payments/components/PaymentPage.tsx b/packages/features/ee/payments/components/PaymentPage.tsx index 626acdafcd3210..136d7fdf585645 100644 --- a/packages/features/ee/payments/components/PaymentPage.tsx +++ b/packages/features/ee/payments/components/PaymentPage.tsx @@ -113,7 +113,7 @@ const PaymentPage: FC = (props) => {
{eventName}
{t("when")}
- {date.format("dddd, DD MMMM YYYY")} + {date.locale(i18n.language).format("dddd, DD MMMM YYYY")}
{date.format(is24h ? "H:mm" : "h:mma")} - {props.eventType.length} mins{" "} ({timezone}) From cc1101ac43dd1f76dbbf9f8dbfa68d54a4e80d2c Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Sat, 28 Dec 2024 02:32:05 +0530 Subject: [PATCH 02/11] refactor: email handler (#18391) Co-authored-by: Bailey Pumfleet --- .../viewer/auth/resendVerifyEmail.handler.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts index 7ddece6c1dd5a6..bf0a2ed8a17b4a 100644 --- a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts +++ b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts @@ -1,14 +1,20 @@ +import type { NextApiRequest } from "next"; + import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail"; +import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; +import getIP from "@calcom/lib/getIP"; import logger from "@calcom/lib/logger"; import { prisma } from "@calcom/prisma"; import { TRPCError } from "@calcom/trpc/server"; +import type { TRPCContext } from "../../../createContext"; import type { TrpcSessionUser } from "../../../trpc"; import type { TResendVerifyEmailSchema } from "./resendVerifyEmail.schema"; type ResendEmailOptions = { ctx: { user: NonNullable; + req: TRPCContext["req"] | undefined; }; input: TResendVerifyEmailSchema; }; @@ -17,6 +23,13 @@ const log = logger.getSubLogger({ prefix: [`[[Auth] `] }); export const resendVerifyEmail = async ({ input, ctx }: ResendEmailOptions) => { let emailToVerify = ctx.user.email; + const identifer = ctx.req ? getIP(ctx.req as NextApiRequest) : emailToVerify; + + await checkRateLimitAndThrowError({ + rateLimitingType: "core", + identifier: `resendVerifyEmail.${identifer}`, + }); + 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 From 8ffebdba4401eee31cbaae125ec879d22d2d1df1 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 27 Dec 2024 21:07:33 +0000 Subject: [PATCH 03/11] chore: release v4.8.10 --- .yarn/versions/6e890e70.yml | 0 apps/web/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .yarn/versions/6e890e70.yml diff --git a/.yarn/versions/6e890e70.yml b/.yarn/versions/6e890e70.yml new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/apps/web/package.json b/apps/web/package.json index 8e672d2b7d3780..46fbad8bd05be7 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@calcom/web", - "version": "4.8.9", + "version": "4.8.10", "private": true, "scripts": { "analyze": "ANALYZE=true next build", From 3f0a6718bc3aa2611a89753766d35ef604364397 Mon Sep 17 00:00:00 2001 From: "devin-ai-integration[bot]" <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2024 12:30:14 +0100 Subject: [PATCH 04/11] fix: reduce mobile navigation bottom margin from 0.625rem to 0.25rem (#18398) --- packages/features/shell/navigation/Navigation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/features/shell/navigation/Navigation.tsx b/packages/features/shell/navigation/Navigation.tsx index 7d71117f19fff0..101734fbc5db0f 100644 --- a/packages/features/shell/navigation/Navigation.tsx +++ b/packages/features/shell/navigation/Navigation.tsx @@ -219,7 +219,7 @@ const MobileNavigation = ({ isPlatformNavigation = false }: { isPlatformNavigati <>