Merge branch 'main' into dub-folders

Author: pumfleet

.yarn/versions/3c2036fd.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

apps/api/v2/package.json

@@ -61,6 +61,7 @@
     "helmet": "^7.1.0",
     "ioredis": "^5.3.2",
     "jsforce": "^1.11.0",
+    "lodash": "^4.17.21",
     "luxon": "^3.4.4",
     "nest-winston": "^1.9.4",
     "next-auth": "^4.22.1",

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts

@@ -455,7 +455,6 @@ describe("Bookings Endpoints 2024-08-13", () => {
               // eslint-disable-next-line
               // @ts-ignore
               const data: GetSeatedBookingOutput_2024_08_13 = responseBody.data;
-              console.log("asap data", JSON.stringify(data, null, 2));
               expect(data.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`);
               expect(data.attendees[0].bookingFieldsResponses.name).toEqual(splitName);
             } else {

apps/api/v2/src/ee/event-types/event-types_2024_06_14/event-types.repository.ts

@@ -7,11 +7,7 @@ import { InputEventTransformed_2024_06_14 } from "@calcom/platform-types";
 
 @Injectable()
 export class EventTypesRepository_2024_06_14 {
-  constructor(
-    private readonly dbRead: PrismaReadService,
-    private readonly dbWrite: PrismaWriteService,
-    private usersService: UsersService
-  ) {}
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
 
   async createUserEventType(
     userId: number,
@@ -47,6 +43,13 @@ export class EventTypesRepository_2024_06_14 {
     });
   }
 
+  async getEventTypeWithHosts(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      include: { hosts: true },
+    });
+  }
+
   async getUserEventType(userId: number, eventTypeId: number) {
     return this.dbRead.prisma.eventType.findFirst({
       where: {

apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output.ts

@@ -1,6 +1,6 @@
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsEnum, IsString, ValidateNested } from "class-validator";
+import { IsEnum, IsString, ValidateNested, IsOptional } from "class-validator";
 
 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 
@@ -10,8 +10,9 @@ class Data {
   callId!: string;
 
   @IsString()
+  @IsOptional()
   @ApiProperty()
-  agentId!: string;
+  agentId?: string;
 }
 
 export class CreatePhoneCallOutput {

apps/api/v2/src/ee/platform-endpoints-module.ts

@@ -8,7 +8,8 @@ import { MeModule } from "@/ee/me/me.module";
 import { ProviderModule } from "@/ee/provider/provider.module";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
-import { SlotsModule } from "@/modules/slots/slots.module";
+import { SlotsModule_2024_04_15 } from "@/modules/slots/slots-2024-04-15/slots.module";
+import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module";
 import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
 import { TeamsMembershipsModule } from "@/modules/teams/memberships/teams-memberships.module";
 import { TeamsModule } from "@/modules/teams/teams/teams.module";
@@ -29,7 +30,8 @@ import { Module } from "@nestjs/common";
     BookingsModule_2024_04_15,
     BookingsModule_2024_08_13,
     TeamsMembershipsModule,
-    SlotsModule,
+    SlotsModule_2024_04_15,
+    SlotsModule_2024_09_04,
     TeamsModule,
   ],
 })

apps/api/v2/src/lib/api-versions.ts

@@ -6,15 +6,18 @@ import {
   VERSION_2024_06_11,
   VERSION_2024_06_14,
   VERSION_2024_08_13,
+  VERSION_2024_09_04,
 } from "@calcom/platform-constants";
 
 export const API_VERSIONS_VALUES: VersionValue = API_VERSIONS as unknown as VersionValue;
 export const VERSION_2024_06_14_VALUE: VersionValue = VERSION_2024_06_14 as unknown as VersionValue;
 export const VERSION_2024_06_11_VALUE: VersionValue = VERSION_2024_06_11 as unknown as VersionValue;
 export const VERSION_2024_04_15_VALUE: VersionValue = VERSION_2024_04_15 as unknown as VersionValue;
 export const VERSION_2024_08_13_VALUE: VersionValue = VERSION_2024_08_13 as unknown as VersionValue;
+export const VERSION_2024_09_04_VALUE: VersionValue = VERSION_2024_09_04 as unknown as VersionValue;
 
 export { VERSION_2024_04_15 };
 export { VERSION_2024_06_11 };
 export { VERSION_2024_06_14 };
 export { VERSION_2024_08_13 };
+export { VERSION_2024_09_04 };

apps/api/v2/src/modules/auth/decorators/get-optional-user/get-optional-user.decorator.ts

@@ -0,0 +1,30 @@
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
+import { ExecutionContext } from "@nestjs/common";
+import { createParamDecorator } from "@nestjs/common";
+
+export const GetOptionalUser = createParamDecorator<
+  keyof ApiAuthGuardUser | (keyof ApiAuthGuardUser)[],
+  ExecutionContext
+>((data, ctx) => {
+  const request = ctx.switchToHttp().getRequest();
+  const user = request.user as ApiAuthGuardUser;
+
+  if (!user) {
+    return null;
+  }
+
+  if (Array.isArray(data)) {
+    return data.reduce((prev, curr) => {
+      return {
+        ...prev,
+        [curr]: user[curr],
+      };
+    }, {});
+  }
+
+  if (data) {
+    return user[data];
+  }
+
+  return user;
+});

apps/api/v2/src/modules/auth/guards/optional-api-auth/optional-api-auth.guard.ts

@@ -0,0 +1,14 @@
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { NO_AUTH_PROVIDED_MESSAGE } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
+
+export class OptionalApiAuthGuard extends ApiAuthGuard {
+  handleRequest(error: Error, user: any) {
+    // note(Lauris): optional means that auth is not required but if it is invalid then still throw error.
+    const noAuthProvided = error && error.message === NO_AUTH_PROVIDED_MESSAGE;
+    if (user || noAuthProvided || !error) {
+      return user || null;
+    } else {
+      throw error;
+    }
+  }
+}

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts

@@ -19,6 +19,8 @@ import { INVALID_ACCESS_TOKEN, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom
 
 export type ApiAuthGuardUser = UserWithProfile & { isSystemAdmin: boolean };
 
+export const NO_AUTH_PROVIDED_MESSAGE =
+  "No authentication method provided. Either pass an API key as 'Bearer' header or OAuth client credentials as 'x-cal-secret-key' and 'x-cal-client-id' headers";
 @Injectable()
 export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth") {
   constructor(
@@ -62,9 +64,7 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
         return await this.authenticateNextAuth(nextAuthToken);
       }
 
-      throw new UnauthorizedException(
-        "No authentication method provided. Either pass an API key as 'Bearer' header or OAuth client credentials as 'x-cal-secret-key' and 'x-cal-client-id' headers"
-      );
+      throw new UnauthorizedException(NO_AUTH_PROVIDED_MESSAGE);
     } catch (err) {
       if (err instanceof Error) {
         return this.error(err);

apps/api/v2/src/modules/memberships/memberships.module.ts

@@ -1,10 +1,11 @@
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { MembershipsService } from "@/modules/memberships/services/memberships.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { Module } from "@nestjs/common";
 
 @Module({
   imports: [PrismaModule],
-  providers: [MembershipsRepository],
-  exports: [MembershipsRepository],
+  providers: [MembershipsRepository, MembershipsService],
+  exports: [MembershipsRepository, MembershipsService],
 })
 export class MembershipsModule {}

apps/api/v2/src/modules/memberships/services/memberships.service.ts

@@ -0,0 +1,24 @@
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { Injectable } from "@nestjs/common";
+import { intersectionBy } from "lodash";
+
+@Injectable()
+export class MembershipsService {
+  constructor(private readonly membershipsRepository: MembershipsRepository) {}
+
+  async haveMembershipsInCommon(firstUserId: number, secondUserId: number) {
+    const memberships = await this.membershipsInCommon(firstUserId, secondUserId);
+    return memberships.length > 0;
+  }
+
+  async membershipsInCommon(firstUserId: number, secondUserId: number) {
+    const firstUserMemberships = await this.membershipsRepository.findUserMemberships(firstUserId);
+    const secondUserMemberships = await this.membershipsRepository.findUserMemberships(secondUserId);
+
+    return intersectionBy(
+      firstUserMemberships.filter((m) => m.accepted),
+      secondUserMemberships.filter((m) => m.accepted),
+      "teamId"
+    );
+  }
+}

apps/api/v2/src/modules/organizations/organizations.repository.ts

@@ -131,4 +131,14 @@ export class OrganizationsRepository {
       },
     });
   }
+
+  async findOrgBySlug(slug: string) {
+    return this.dbRead.prisma.team.findFirst({
+      where: {
+        slug,
+        parentId: null,
+        isOrganization: true,
+      },
+    });
+  }
 }

apps/api/v2/src/modules/organizations/repositories/organizations-users.repository.ts

@@ -37,22 +37,6 @@ export class OrganizationsUsersRepository {
     });
   }
 
-  async getOrganizationUserByUsername(orgId: number, username: string) {
-    return await this.dbRead.prisma.user.findFirst({
-      where: {
-        username,
-        ...this.filterOnOrgMembership(orgId),
-      },
-      include: {
-        profiles: {
-          where: {
-            organizationId: orgId,
-          },
-        },
-      },
-    });
-  }
-
   async getOrganizationUserByEmail(orgId: number, email: string) {
     return await this.dbRead.prisma.user.findFirst({
       where: {
@@ -109,4 +93,19 @@ export class OrganizationsUsersRepository {
       },
     });
   }
+
+  async getOrganizationUserByUsername(orgId: number, username: string) {
+    const profile = await this.dbRead.prisma.profile.findUnique({
+      where: {
+        username_organizationId: {
+          organizationId: orgId,
+          username,
+        },
+      },
+      include: {
+        user: true,
+      },
+    });
+    return profile?.user;
+  }
 }

apps/api/v2/src/modules/slots/controllers/slots.controller.e2e-spec.ts apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.e2e-spec.ts

@@ -4,7 +4,7 @@ import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/
 import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { SlotsModule } from "@/modules/slots/slots.module";
+import { SlotsModule_2024_04_15 } from "@/modules/slots/slots-2024-04-15/slots.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
 import { INestApplication } from "@nestjs/common";
@@ -243,7 +243,7 @@ const expectedSlotsRomeRange = {
   },
 };
 
-describe("Slots Endpoints", () => {
+describe("Slots 2024-04-15 Endpoints", () => {
   describe("Individual user slots", () => {
     let app: INestApplication;
 
@@ -275,7 +275,7 @@ describe("Slots Endpoints", () => {
             UsersModule,
             TokensModule,
             SchedulesModule_2024_06_11,
-            SlotsModule,
+            SlotsModule_2024_04_15,
           ],
         })
       )

apps/api/v2/src/modules/slots/controllers/slots.controller.ts apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.ts

@@ -1,25 +1,31 @@
-import { API_VERSIONS_VALUES } from "@/lib/api-versions";
-import { SlotsOutputService } from "@/modules/slots/services/slots-output.service";
-import { SlotsService } from "@/modules/slots/services/slots.service";
+import { SlotsOutputService_2024_04_15 } from "@/modules/slots/slots-2024-04-15/services/slots-output.service";
+import { SlotsService_2024_04_15 } from "@/modules/slots/slots-2024-04-15/services/slots.service";
 import { Query, Body, Controller, Get, Delete, Post, Req, Res } from "@nestjs/common";
+import { ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
 import { ApiTags as DocsTags, ApiCreatedResponse, ApiOkResponse, ApiOperation } from "@nestjs/swagger";
 import { Response as ExpressResponse, Request as ExpressRequest } from "express";
 
-import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  SUCCESS_STATUS,
+  VERSION_2024_06_14,
+  VERSION_2024_04_15,
+  VERSION_2024_06_11,
+  VERSION_2024_08_13,
+} from "@calcom/platform-constants";
 import { getAvailableSlots } from "@calcom/platform-libraries";
 import type { AvailableSlotsType } from "@calcom/platform-libraries";
-import { RemoveSelectedSlotInput, ReserveSlotInput } from "@calcom/platform-types";
-import { ApiResponse, GetAvailableSlotsInput } from "@calcom/platform-types";
+import { RemoveSelectedSlotInput_2024_04_15, ReserveSlotInput_2024_04_15 } from "@calcom/platform-types";
+import { ApiResponse, GetAvailableSlotsInput_2024_04_15 } from "@calcom/platform-types";
 
 @Controller({
   path: "/v2/slots",
-  version: API_VERSIONS_VALUES,
+  version: [VERSION_2024_04_15, VERSION_2024_06_11, VERSION_2024_06_14, VERSION_2024_08_13],
 })
-@DocsTags("Slots")
-export class SlotsController {
+@DocsExcludeController(true)
+export class SlotsController_2024_04_15 {
   constructor(
-    private readonly slotsService: SlotsService,
-    private readonly slotsOutputService: SlotsOutputService
+    private readonly slotsService: SlotsService_2024_04_15,
+    private readonly slotsOutputService: SlotsOutputService_2024_04_15
   ) {}
 
   @Post("/reserve")
@@ -40,7 +46,7 @@ export class SlotsController {
   })
   @ApiOperation({ summary: "Reserve a slot" })
   async reserveSlot(
-    @Body() body: ReserveSlotInput,
+    @Body() body: ReserveSlotInput_2024_04_15,
     @Res({ passthrough: true }) res: ExpressResponse,
     @Req() req: ExpressRequest
   ): Promise<ApiResponse<string>> {
@@ -65,7 +71,7 @@ export class SlotsController {
   })
   @ApiOperation({ summary: "Delete a selected slot" })
   async deleteSelectedSlot(
-    @Query() params: RemoveSelectedSlotInput,
+    @Query() params: RemoveSelectedSlotInput_2024_04_15,
     @Req() req: ExpressRequest
   ): Promise<ApiResponse> {
     const uid = req.cookies?.uid || params.uid;
@@ -148,7 +154,7 @@ export class SlotsController {
   })
   @ApiOperation({ summary: "Get available slots" })
   async getAvailableSlots(
-    @Query() query: GetAvailableSlotsInput,
+    @Query() query: GetAvailableSlotsInput_2024_04_15,
     @Req() req: ExpressRequest
   ): Promise<ApiResponse<AvailableSlotsType>> {
     const isTeamEvent = await this.slotsService.checkIfIsTeamEvent(query.eventTypeId);

apps/api/v2/src/modules/slots/services/slots-output.service.ts apps/api/v2/src/modules/slots/slots-2024-04-15/services/slots-output.service.ts

@@ -4,13 +4,15 @@ import { DateTime } from "luxon";
 
 import { SlotFormat } from "@calcom/platform-enums";
 
-type TimeSlots = { slots: Record<string, { time: string; attendees?: number; bookingUid?: string }[]> };
+export type TimeSlots = {
+  slots: Record<string, { time: string; attendees?: number; bookingUid?: string }[]>;
+};
 type RangeSlots = {
   slots: Record<string, { startTime: string; endTime: string; attendees?: number; bookingUid?: string }[]>;
 };
 
 @Injectable()
-export class SlotsOutputService {
+export class SlotsOutputService_2024_04_15 {
   constructor(private readonly eventTypesRepository: EventTypesRepository_2024_04_15) {}
 
   async getOutputSlots(