From bc1d73e9fe77057f6162d8c7524baa3ae72e1746 Mon Sep 17 00:00:00 2001 From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Date: Wed, 12 Mar 2025 00:05:40 +0200 Subject: [PATCH] fix: broken metadata import from platform/types (#19986) * fix: broken metadata import from platform/types * fix: OAuthClientUsersService instead of this in oauth-clients-users.service.ts --- .../oauth-client-users.controller.e2e-spec.ts | 4 +++- .../oauth-clients/services/oauth-clients-users.service.ts | 2 +- .../inputs/create-managed-organization.input.ts | 6 +----- .../inputs/update-managed-organization.input.ts | 6 +----- .../organizations/outputs/managed-organization.output.ts | 2 +- .../v2/src/modules/teams/teams/inputs/create-team.input.ts | 6 +----- .../v2/src/modules/teams/teams/inputs/update-team.input.ts | 6 +----- packages/platform/types/bookings/2024-08-13/inputs/index.ts | 1 + packages/platform/types/teams/outputs/team.output.ts | 2 +- 9 files changed, 11 insertions(+), 24 deletions(-) diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts index 74d747858a..87090f9479 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts @@ -260,7 +260,9 @@ describe("OAuth Client Users Endpoints", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); - expect(responseBody.data.user.email).toEqual(getOAuthUserEmail(oAuthClient.id, requestBody.email)); + expect(responseBody.data.user.email).toEqual( + OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email) + ); expect(responseBody.data.user.timeZone).toEqual(requestBody.timeZone); expect(responseBody.data.user.name).toEqual(requestBody.name); expect(responseBody.data.user.weekStart).toEqual(requestBody.weekStart); diff --git a/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts b/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts index 424431cf74..3383a0afdb 100644 --- a/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts +++ b/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts @@ -106,7 +106,7 @@ export class OAuthClientUsersService { const { offset, limit, emails } = queryParams; const oAuthEmails = emails?.map((email) => - email.includes(oAuthClientId) ? email : this.getOAuthUserEmail(oAuthClientId, email) + email.includes(oAuthClientId) ? email : OAuthClientUsersService.getOAuthUserEmail(oAuthClientId, email) ); const managedUsers = await this.userRepository.findManagedUsersByOAuthClientIdAndEmails( diff --git a/apps/api/v2/src/modules/organizations/organizations/inputs/create-managed-organization.input.ts b/apps/api/v2/src/modules/organizations/organizations/inputs/create-managed-organization.input.ts index c0d71cdf34..4a2bb1328c 100644 --- a/apps/api/v2/src/modules/organizations/organizations/inputs/create-managed-organization.input.ts +++ b/apps/api/v2/src/modules/organizations/organizations/inputs/create-managed-organization.input.ts @@ -2,11 +2,7 @@ import { RefreshApiKeyInput } from "@/modules/api-keys/inputs/refresh-api-key.in import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; import { IsObject, IsOptional, IsString, Length } from "class-validator"; -import { - Metadata, - METADATA_DOCS, - ValidateMetadata, -} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types"; export class CreateOrganizationInput extends RefreshApiKeyInput { @IsString() diff --git a/apps/api/v2/src/modules/organizations/organizations/inputs/update-managed-organization.input.ts b/apps/api/v2/src/modules/organizations/organizations/inputs/update-managed-organization.input.ts index 7a0bf47021..9a291ceb35 100644 --- a/apps/api/v2/src/modules/organizations/organizations/inputs/update-managed-organization.input.ts +++ b/apps/api/v2/src/modules/organizations/organizations/inputs/update-managed-organization.input.ts @@ -1,11 +1,7 @@ import { ApiPropertyOptional } from "@nestjs/swagger"; import { IsObject, IsOptional, IsString, Length } from "class-validator"; -import { - Metadata, - METADATA_DOCS, - ValidateMetadata, -} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types"; export class UpdateOrganizationInput { @IsString() diff --git a/apps/api/v2/src/modules/organizations/organizations/outputs/managed-organization.output.ts b/apps/api/v2/src/modules/organizations/organizations/outputs/managed-organization.output.ts index 38712a695b..6a38643feb 100644 --- a/apps/api/v2/src/modules/organizations/organizations/outputs/managed-organization.output.ts +++ b/apps/api/v2/src/modules/organizations/organizations/outputs/managed-organization.output.ts @@ -2,7 +2,7 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; import { Expose, Transform, Type } from "class-transformer"; import { IsBoolean, IsInt, IsObject, IsOptional, IsString, Length, ValidateNested } from "class-validator"; -import { Metadata } from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import { Metadata } from "@calcom/platform-types"; export class ManagedOrganizationOutput { @IsInt() diff --git a/apps/api/v2/src/modules/teams/teams/inputs/create-team.input.ts b/apps/api/v2/src/modules/teams/teams/inputs/create-team.input.ts index 1f2d7ffbef..5714b2ced8 100644 --- a/apps/api/v2/src/modules/teams/teams/inputs/create-team.input.ts +++ b/apps/api/v2/src/modules/teams/teams/inputs/create-team.input.ts @@ -1,11 +1,7 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; import { IsBoolean, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator"; -import { - Metadata, - METADATA_DOCS, - ValidateMetadata, -} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types"; export class CreateTeamInput { @IsString() diff --git a/apps/api/v2/src/modules/teams/teams/inputs/update-team.input.ts b/apps/api/v2/src/modules/teams/teams/inputs/update-team.input.ts index 7a5bf9c6e3..6bc32450c5 100644 --- a/apps/api/v2/src/modules/teams/teams/inputs/update-team.input.ts +++ b/apps/api/v2/src/modules/teams/teams/inputs/update-team.input.ts @@ -1,11 +1,7 @@ import { ApiPropertyOptional } from "@nestjs/swagger"; import { IsBoolean, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator"; -import { - Metadata, - METADATA_DOCS, - ValidateMetadata, -} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types"; export class UpdateTeamDto { @IsString() diff --git a/packages/platform/types/bookings/2024-08-13/inputs/index.ts b/packages/platform/types/bookings/2024-08-13/inputs/index.ts index 6a51c454a6..a9e46ee866 100644 --- a/packages/platform/types/bookings/2024-08-13/inputs/index.ts +++ b/packages/platform/types/bookings/2024-08-13/inputs/index.ts @@ -8,3 +8,4 @@ export * from "./reassign-to-user.input"; export * from "./reschedule-booking-input.pipe"; export * from "./cancel-booking-input.pipe"; export * from "./decline-booking.input"; +export * from "./validators/validate-metadata"; diff --git a/packages/platform/types/teams/outputs/team.output.ts b/packages/platform/types/teams/outputs/team.output.ts index e01da271c3..ade6110eb3 100644 --- a/packages/platform/types/teams/outputs/team.output.ts +++ b/packages/platform/types/teams/outputs/team.output.ts @@ -2,7 +2,7 @@ import { ApiProperty as DocsProperty, ApiPropertyOptional } from "@nestjs/swagge import { Expose, Transform } from "class-transformer"; import { IsBoolean, IsInt, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator"; -import type { Metadata } from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata"; +import type { Metadata } from "../../bookings/2024-08-13/inputs/validators/validate-metadata"; export class TeamOutputDto { @IsInt()