Skip to content

Commit bc1d73e

Browse files
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
1 parent eca01be commit bc1d73e

File tree

9 files changed

+11
-24
lines changed

9 files changed

+11
-24
lines changed

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ describe("OAuth Client Users Endpoints", () => {
260260

261261
expect(responseBody.status).toEqual(SUCCESS_STATUS);
262262
expect(responseBody.data).toBeDefined();
263-
expect(responseBody.data.user.email).toEqual(getOAuthUserEmail(oAuthClient.id, requestBody.email));
263+
expect(responseBody.data.user.email).toEqual(
264+
OAuthClientUsersService.getOAuthUserEmail(oAuthClient.id, requestBody.email)
265+
);
264266
expect(responseBody.data.user.timeZone).toEqual(requestBody.timeZone);
265267
expect(responseBody.data.user.name).toEqual(requestBody.name);
266268
expect(responseBody.data.user.weekStart).toEqual(requestBody.weekStart);

apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export class OAuthClientUsersService {
106106
const { offset, limit, emails } = queryParams;
107107

108108
const oAuthEmails = emails?.map((email) =>
109-
email.includes(oAuthClientId) ? email : this.getOAuthUserEmail(oAuthClientId, email)
109+
email.includes(oAuthClientId) ? email : OAuthClientUsersService.getOAuthUserEmail(oAuthClientId, email)
110110
);
111111

112112
const managedUsers = await this.userRepository.findManagedUsersByOAuthClientIdAndEmails(

apps/api/v2/src/modules/organizations/organizations/inputs/create-managed-organization.input.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import { RefreshApiKeyInput } from "@/modules/api-keys/inputs/refresh-api-key.in
22
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
33
import { IsObject, IsOptional, IsString, Length } from "class-validator";
44

5-
import {
6-
Metadata,
7-
METADATA_DOCS,
8-
ValidateMetadata,
9-
} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
5+
import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types";
106

117
export class CreateOrganizationInput extends RefreshApiKeyInput {
128
@IsString()

apps/api/v2/src/modules/organizations/organizations/inputs/update-managed-organization.input.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { ApiPropertyOptional } from "@nestjs/swagger";
22
import { IsObject, IsOptional, IsString, Length } from "class-validator";
33

4-
import {
5-
Metadata,
6-
METADATA_DOCS,
7-
ValidateMetadata,
8-
} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
4+
import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types";
95

106
export class UpdateOrganizationInput {
117
@IsString()

apps/api/v2/src/modules/organizations/organizations/outputs/managed-organization.output.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
22
import { Expose, Transform, Type } from "class-transformer";
33
import { IsBoolean, IsInt, IsObject, IsOptional, IsString, Length, ValidateNested } from "class-validator";
44

5-
import { Metadata } from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
5+
import { Metadata } from "@calcom/platform-types";
66

77
export class ManagedOrganizationOutput {
88
@IsInt()

apps/api/v2/src/modules/teams/teams/inputs/create-team.input.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
22
import { IsBoolean, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator";
33

4-
import {
5-
Metadata,
6-
METADATA_DOCS,
7-
ValidateMetadata,
8-
} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
4+
import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types";
95

106
export class CreateTeamInput {
117
@IsString()

apps/api/v2/src/modules/teams/teams/inputs/update-team.input.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { ApiPropertyOptional } from "@nestjs/swagger";
22
import { IsBoolean, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator";
33

4-
import {
5-
Metadata,
6-
METADATA_DOCS,
7-
ValidateMetadata,
8-
} from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
4+
import { Metadata, METADATA_DOCS, ValidateMetadata } from "@calcom/platform-types";
95

106
export class UpdateTeamDto {
117
@IsString()

packages/platform/types/bookings/2024-08-13/inputs/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ export * from "./reassign-to-user.input";
88
export * from "./reschedule-booking-input.pipe";
99
export * from "./cancel-booking-input.pipe";
1010
export * from "./decline-booking.input";
11+
export * from "./validators/validate-metadata";

packages/platform/types/teams/outputs/team.output.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ApiProperty as DocsProperty, ApiPropertyOptional } from "@nestjs/swagge
22
import { Expose, Transform } from "class-transformer";
33
import { IsBoolean, IsInt, IsObject, IsOptional, IsString, IsUrl, Length } from "class-validator";
44

5-
import type { Metadata } from "@calcom/platform-types/bookings/2024-08-13/inputs/validators/validate-metadata";
5+
import type { Metadata } from "../../bookings/2024-08-13/inputs/validators/validate-metadata";
66

77
export class TeamOutputDto {
88
@IsInt()

0 commit comments

Comments
 (0)