From c65dca9486787d0b882d1ecc5c8162c2042186de Mon Sep 17 00:00:00 2001
From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date: Fri, 10 May 2024 10:36:51 +0300
Subject: [PATCH] fix: api v2 hotfix google calendar, exception details,
 billing check guard (#14967)

---
 apps/api/v2/src/ee/gcal/gcal.controller.ts               | 9 ++-------
 apps/api/v2/src/filters/http-exception.filter.ts         | 2 +-
 .../modules/billing/controllers/billing.controller.ts    | 2 +-
 packages/platform/types/api.ts                           | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/api/v2/src/ee/gcal/gcal.controller.ts b/apps/api/v2/src/ee/gcal/gcal.controller.ts
index acb7ac5510..6eff8d60eb 100644
--- a/apps/api/v2/src/ee/gcal/gcal.controller.ts
+++ b/apps/api/v2/src/ee/gcal/gcal.controller.ts
@@ -31,12 +31,7 @@ import { Request } from "express";
 import { google } from "googleapis";
 import { z } from "zod";
 
-import {
-  APPS_READ,
-  GOOGLE_CALENDAR_ID,
-  GOOGLE_CALENDAR_TYPE,
-  SUCCESS_STATUS,
-} from "@calcom/platform-constants";
+import { APPS_READ, GOOGLE_CALENDAR_TYPE, SUCCESS_STATUS } from "@calcom/platform-constants";
 
 const CALENDAR_SCOPES = [
   "https://www.googleapis.com/auth/calendar.readonly",
@@ -131,7 +126,7 @@ export class GcalController {
         primaryCal.id,
         credential.id,
         ownerId,
-        GOOGLE_CALENDAR_ID
+        GOOGLE_CALENDAR_TYPE
       );
     }
 
diff --git a/apps/api/v2/src/filters/http-exception.filter.ts b/apps/api/v2/src/filters/http-exception.filter.ts
index ef3eefd4df..2aa35ba002 100644
--- a/apps/api/v2/src/filters/http-exception.filter.ts
+++ b/apps/api/v2/src/filters/http-exception.filter.ts
@@ -28,7 +28,7 @@ export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
       status: ERROR_STATUS,
       timestamp: new Date().toISOString(),
       path: request.url,
-      error: { code: exception.name, message: exception.message },
+      error: { code: exception.name, message: exception.message, details: exception.getResponse() },
     });
   }
 }
diff --git a/apps/api/v2/src/modules/billing/controllers/billing.controller.ts b/apps/api/v2/src/modules/billing/controllers/billing.controller.ts
index 00319098f3..f22d9a5441 100644
--- a/apps/api/v2/src/modules/billing/controllers/billing.controller.ts
+++ b/apps/api/v2/src/modules/billing/controllers/billing.controller.ts
@@ -46,7 +46,7 @@ export class BillingController {
 
   @Get("/:teamId/check")
   @UseGuards(NextAuthGuard, OrganizationRolesGuard)
-  @Roles(["OWNER", "ADMIN"])
+  @Roles(["OWNER", "ADMIN", "MEMBER"])
   async checkTeamBilling(
     @Param("teamId") teamId: number
   ): Promise<ApiResponse<CheckPlatformBillingResponseDto>> {
diff --git a/packages/platform/types/api.ts b/packages/platform/types/api.ts
index 402bcc40e7..76d576b6f6 100644
--- a/packages/platform/types/api.ts
+++ b/packages/platform/types/api.ts
@@ -17,7 +17,7 @@ export type API_ERROR_CODES_TYPE = (typeof API_ERROR_CODES)[number];
 export type ErrorType = {
   code: API_ERROR_CODES_TYPE | string;
   message?: string;
-  details?: string | string[];
+  details?: string | string[] | object;
 };
 
 export type ApiErrorResponse = {