diff --git a/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts b/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts index 1ad339e1e9..c0e2d0575b 100644 --- a/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts @@ -113,7 +113,7 @@ describe("Platform Calendars Endpoints", () => { }); // TODO: Uncomment this once CI is ready to run proper Office365 tests - // it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar oauth with valid access token `, async () => { + // it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar OAuth with valid access token `, async () => { // const response = await request(app.getHttpServer()) // .get(`/v2/calendars/${OFFICE_365_CALENDAR}/connect`) // .set("Authorization", `Bearer ${accessTokenSecret}`) @@ -123,7 +123,7 @@ describe("Platform Calendars Endpoints", () => { // expect(data.authUrl).toBeDefined(); // }); - it(`/GET/v2/calendars/${GOOGLE_CALENDAR}/connect: it should redirect to auth-url for google calendar oauth with valid access token `, async () => { + it(`/GET/v2/calendars/${GOOGLE_CALENDAR}/connect: it should redirect to auth-url for google calendar OAuth with valid access token `, async () => { const response = await request(app.getHttpServer()) .get(`/v2/calendars/${GOOGLE_CALENDAR}/connect`) .set("Authorization", `Bearer ${accessTokenSecret}`) diff --git a/apps/api/v2/src/ee/calendars/services/gcal.service.ts b/apps/api/v2/src/ee/calendars/services/gcal.service.ts index 8ddc8555a6..95d7dd7c37 100644 --- a/apps/api/v2/src/ee/calendars/services/gcal.service.ts +++ b/apps/api/v2/src/ee/calendars/services/gcal.service.ts @@ -4,6 +4,7 @@ import { AppsRepository } from "@/modules/apps/apps.repository"; import { CredentialsRepository } from "@/modules/credentials/credentials.repository"; import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository"; import { TokensRepository } from "@/modules/tokens/tokens.repository"; +import { calendar_v3 } from "@googleapis/calendar"; import { Logger, NotFoundException } from "@nestjs/common"; import { BadRequestException, UnauthorizedException } from "@nestjs/common"; import { Injectable } from "@nestjs/common"; @@ -11,7 +12,6 @@ import { ConfigService } from "@nestjs/config"; import { Prisma } from "@prisma/client"; import { Request } from "express"; import { OAuth2Client } from "googleapis-common"; -import { calendar_v3 } from "@googleapis/calendar"; import { z } from "zod"; import { SUCCESS_STATUS, GOOGLE_CALENDAR_TYPE } from "@calcom/platform-constants"; @@ -91,7 +91,7 @@ export class GoogleCalendarService implements OAuthCalendarApp { } if (gcalCredentials.invalid) { - throw new BadRequestException("Invalid google oauth credentials."); + throw new BadRequestException("Invalid google OAuth credentials."); } const { connectedCalendars } = await this.calendarsService.getCalendars(userId); diff --git a/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts b/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts index be19aed4e5..62d60286da 100644 --- a/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts @@ -95,7 +95,7 @@ describe("Platform Gcal Endpoints", () => { .expect(401); }); - it(`/GET/gcal/oauth/auth-url: it should auth-url to google oauth with valid access token `, async () => { + it(`/GET/gcal/oauth/auth-url: it should auth-url to google OAuth with valid access token `, async () => { const response = await request(app.getHttpServer()) .get(`/v2/gcal/oauth/auth-url`) .set("Authorization", `Bearer ${accessTokenSecret}`) @@ -105,7 +105,7 @@ describe("Platform Gcal Endpoints", () => { expect(data.authUrl).toBeDefined(); }); - it(`/GET/gcal/oauth/save: without oauth code`, async () => { + it(`/GET/gcal/oauth/save: without OAuth code`, async () => { await request(app.getHttpServer()) .get( `/v2/gcal/oauth/save?state=accessToken=${accessTokenSecret}&origin%3D${CLIENT_REDIRECT_URI}&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events` diff --git a/apps/api/v2/src/ee/gcal/gcal.controller.ts b/apps/api/v2/src/ee/gcal/gcal.controller.ts index 9978fb2de7..3e43006c8a 100644 --- a/apps/api/v2/src/ee/gcal/gcal.controller.ts +++ b/apps/api/v2/src/ee/gcal/gcal.controller.ts @@ -100,7 +100,7 @@ export class GcalController { } if (gcalCredentials.invalid) { - throw new BadRequestException("Invalid google oauth credentials."); + throw new BadRequestException("Invalid google OAuth credentials."); } const { connectedCalendars } = await this.calendarsService.getCalendars(userId); diff --git a/apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts b/apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts index 88efa362c1..116721308f 100644 --- a/apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts +++ b/apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts @@ -102,7 +102,7 @@ describe("PermissionsGuard", () => { }); }); - describe("when oauth id is provided", () => { + describe("when OAuth id is provided", () => { it("should return true for valid permissions", async () => { const mockContext = createMockExecutionContext({ "x-cal-client-id": "100" }); jest.spyOn(reflector, "get").mockReturnValue([SCHEDULE_WRITE]); diff --git a/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts b/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts index 83a6eb618e..bf612dac2b 100644 --- a/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts +++ b/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts @@ -89,7 +89,7 @@ export class ConferencingController { @Get("/:app/oauth/auth-url") @HttpCode(HttpStatus.OK) @UseGuards(ApiAuthGuard) - @ApiOperation({ summary: "Get oauth conferencing app auth url" }) + @ApiOperation({ summary: "Get OAuth conferencing app auth url" }) async redirect( @Req() req: Request, @Headers("Authorization") authorization: string, diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts index d7296c2928..01316d537c 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts @@ -244,7 +244,7 @@ describe("OAuth client WebhooksController (e2e)", () => { }); }); }); - it("/webhooks (GET) should fail to get webhooks of oauth client that doesn't belong to you", () => { + it("/webhooks (GET) should fail to get webhooks of OAuth client that doesn't belong to you", () => { return request(app.getHttpServer()).get(`/v2/oauth-clients/${otherOAuthClient.id}/webhooks`).expect(403); }); @@ -267,7 +267,7 @@ describe("OAuth client WebhooksController (e2e)", () => { }); }); - it("/oauth-clients/:oAuthClientId/webhooks/:webhookId (DELETE) should fail to delete webhooks of an oauth client that doesn't belong to you", () => { + it("/oauth-clients/:oAuthClientId/webhooks/:webhookId (DELETE) should fail to delete webhooks of an OAuth client that doesn't belong to you", () => { return request(app.getHttpServer()) .delete(`/v2/oauth-clients/${otherOAuthClient.id}/webhooks/${otherOAuthClientWebhook.id}`) .expect(403); diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json index 47d88cf0f4..717da59c00 100644 --- a/apps/api/v2/swagger/documentation.json +++ b/apps/api/v2/swagger/documentation.json @@ -3865,7 +3865,7 @@ "/v2/conferencing/{app}/oauth/auth-url": { "get": { "operationId": "ConferencingController_redirect", - "summary": "Get oauth conferencing app auth url", + "summary": "Get OAuth conferencing app auth url", "parameters": [ { "name": "Authorization", @@ -15367,4 +15367,4 @@ } } } -} \ No newline at end of file +} diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json index 8223bb2ca7..c6b647791e 100644 --- a/docs/api-reference/v2/openapi.json +++ b/docs/api-reference/v2/openapi.json @@ -3665,7 +3665,7 @@ "/v2/conferencing/{app}/oauth/auth-url": { "get": { "operationId": "ConferencingController_redirect", - "summary": "Get oauth conferencing app auth url", + "summary": "Get OAuth conferencing app auth url", "parameters": [ { "name": "Authorization", diff --git a/docs/platform/faq.mdx b/docs/platform/faq.mdx index 98632d67cf..267f276e67 100644 --- a/docs/platform/faq.mdx +++ b/docs/platform/faq.mdx @@ -43,4 +43,4 @@ description: Answers to the most common questions about the Platform API and ato ### 9. What are the authentification methods for making calls to the v2 API? Either of the two: - Setting `Authorization: Bearer ` header where `` is access token of the managed user. -- Setting `x-cal-client-id: ` and `x-cal-secret-key: ` where `` is oauth client id and `` is oauth client secret. Both can be copied from the dashboard. +- Setting `x-cal-client-id: ` and `x-cal-secret-key: ` where `` is OAuth client id and `` is OAuth client secret. Both can be copied from the dashboard.