fix: api v2 hotfix google calendar, exception details, billing check guard (#14967)

This commit is contained in:
Morgan
2024-05-10 07:36:51 +00:00
committed by GitHub
parent 816d31918d
commit c65dca9486
4 changed files with 5 additions and 10 deletions
+2 -7
View File
@@ -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
);
}
@@ -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() },
});
}
}
@@ -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>> {
+1 -1
View File
@@ -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 = {