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
This commit is contained in:
1 parent
eca01be58c
commit
bc1d73e9fe
9 files changed
+11
-24
No files matched your search
+3
-1
@@ -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);
|
||||
|
||||
@@ -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(
|
||||
|
||||
+1
-5
@@ -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()
|
||||
|
||||
+1
-5
@@ -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()
|
||||
|
||||
+1
-1
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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";
|
||||
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user