[pull] main from calcom:main

apps/web/modules/auth/login-view.tsx

@@ -218,7 +218,7 @@ export default function Login({
                 <div className="flex flex-col gap-2">
                   {isGoogleLoginEnabled && (
                     <Button
-                      className="w-full"
+                      className="w-full py-1"
                       disabled={formState.isSubmitting}
                       data-testid="google"
                       onClick={async (e) => {
@@ -236,7 +236,7 @@ export default function Login({
                   {isOutlookLoginEnabled && (
                     <Button
                       variant="outline"
-                      className="w-full"
+                      className="w-full py-1"
                       data-testid="microsoft"
                       onClick={async (e) => {
                         e.preventDefault();

packages/features/bookings/lib/service/InstantBookingCreateService.test.ts

@@ -22,6 +22,10 @@ vi.mock("@calcom/features/notifications/sendNotification", () => ({
   sendNotification: vi.fn(),
 }));
 
+vi.mock("@calcom/app-store/feishucalendar/lib/CalendarService", () => ({
+  default: class MockFeishuCalendarService {},
+}));
+
 vi.mock("@calcom/features/conferencing/lib/videoClient", () => ({
   createInstantMeetingWithCalVideo: vi.fn().mockResolvedValue({
     type: "daily_video",

packages/lib/checkRateLimitAndThrowError.test.ts

@@ -67,4 +67,21 @@ describe("checkRateLimitAndThrowError", () => {
 
     await expect(checkRateLimitAndThrowError({ rateLimitingType, identifier })).resolves.not.toThrow();
   });
+  it("should not return negative wait time when reset is in the past", async () => {
+    vi.mocked(rateLimiter).mockReturnValue(() => {
+      return {
+        limit: 10,
+        remaining: -1,
+        reset: Date.now() - 5000, // past time
+        success: false,
+      } as RatelimitResponse;
+    });
+
+    const identifier = "test-identifier";
+    const rateLimitingType = "core";
+
+    await expect(
+      checkRateLimitAndThrowError({ rateLimitingType, identifier })
+    ).rejects.toThrow("0 seconds");
+  });
 });

packages/lib/checkRateLimitAndThrowError.ts

@@ -13,7 +13,7 @@ export async function checkRateLimitAndThrowError({
   const { success, reset } = response;
   if (!success) {
     const convertToSeconds = (ms: number) => Math.floor(ms / 1000);
-    const secondsToWait = convertToSeconds(reset - Date.now());
+    const secondsToWait = Math.max(0, convertToSeconds(reset - Date.now()));
     throw new HttpError({
       statusCode: 429,
       message: `Rate limit exceeded. Try again in ${secondsToWait} seconds.`,