Skip to content

Scheduling infrastructure for absolutely everyone.

fix: managed user timeZone validation (#24226)

Lauris Skraucisc11814c342da
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 825fadef422..85c65d2b3fa 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
@@ -705,6 +705,111 @@ describe("OAuth Client Users Endpoints", () => {
.expect(200);
});
+ describe("managed user time zone", () => {
+ describe("negative tests", () => {
+ it("should not allow '' time zone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ timeZone: "",
+ name: "Bob Smithson",
+ };
+
+ await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(400);
+ });
+
+ it("should not allow 'invalid-timezone' time zone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ timeZone: "invalid-timezone",
+ name: "Bob Smithson",
+ };
+
+ await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(400);
+ });
+ });
+
+ describe("positive tests", () => {
+ it("should allow null timezone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ timeZone: null,
+ name: "Bob Smithson",
+ };
+
+ const response = await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(201);
+
+ const responseBody: CreateManagedUserOutput = response.body;
+ expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+ await userRepositoryFixture.delete(responseBody.data.user.id);
+ });
+
+ it("should allow undefined time zone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ timeZone: undefined,
+ name: "Bob Smithson",
+ };
+
+ const response = await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(201);
+
+ const responseBody: CreateManagedUserOutput = response.body;
+ expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+ await userRepositoryFixture.delete(responseBody.data.user.id);
+ });
+
+ it("should allow valid time zone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ timeZone: "Europe/Rome",
+ name: "Bob Smithson",
+ };
+
+ const response = await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(201);
+
+ const responseBody: CreateManagedUserOutput = response.body;
+ expect(responseBody.data.user.timeZone).toBe("Europe/Rome");
+ await userRepositoryFixture.delete(responseBody.data.user.id);
+ });
+
+ it("should allow without any time zone", async () => {
+ const requestBody = {
+ email: "[email protected]",
+ name: "Bob Smithson",
+ };
+
+ const response = await request(app.getHttpServer())
+ .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+ .set("x-cal-secret-key", oAuthClient.secret)
+ .send(requestBody)
+ .expect(201);
+
+ const responseBody: CreateManagedUserOutput = response.body;
+ expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+ await userRepositoryFixture.delete(responseBody.data.user.id);
+ });
+ });
+ });
+
afterAll(async () => {
await oauthClientRepositoryFixture.delete(oAuthClient.id);
await oauthClientRepositoryFixture.delete(oAuthClientEventTypesDisabled.id);
@@ -712,17 +817,17 @@ describe("OAuth Client Users Endpoints", () => {
try {
await userRepositoryFixture.delete(postResponseData.user.id);
} catch (e) {
- // User might have been deleted by the test
+ console.log(e);
}
try {
await userRepositoryFixture.delete(postResponseData2.user.id);
} catch (e) {
- // User might have been deleted by the test
+ console.log(e);
}
try {
await userRepositoryFixture.delete(platformAdmin.id);
} catch (e) {
- // User might have been deleted by the test
+ console.log(e);
}
await app.close();
});
@@ -931,7 +1036,7 @@ describe("OAuth Client Users Endpoints", () => {
try {
await userRepositoryFixture.delete(postResponseData.user.id);
} catch (e) {
- // User might have been deleted by the test
+ console.log(e);
}
await app.close();
});
diff --git a/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts b/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
index a274fad6ff2..829a10be139 100644
--- a/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
+++ b/apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts
@@ -1,6 +1,7 @@
import { Locales } from "@/lib/enums/locales";
import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject } from "class-validator";
import { ValidateMetadata } from "@calcom/platform-types";
@@ -29,6 +30,7 @@ export class CreateManagedUserInput {
})
weekStart?: WeekDay;
+ @Transform(({ value }) => (value === null ? undefined : value))
@IsTimeZone()
@IsOptional()
@CapitalizeTimeZone()