chore: remove /ee from apiv2 urls

apps/api/v2/src/app.rewrites.middleware.ts

@@ -7,6 +7,9 @@ export class RewriterMiddleware implements NestMiddleware {
     if (req.url.startsWith("/api/v2")) {
       req.url = req.url.replace("/api/v2", "/v2");
     }
+    if (req.url.startsWith("/v2/ee")) {
+      req.url = req.url.replace("/v2/ee", "/v2");
+    }
     next();
   }
 }

apps/api/v2/src/ee/bookings/controllers/bookings.controller.e2e-spec.ts

@@ -115,7 +115,7 @@ describe("Bookings Endpoints", () => {
       };
 
       return request(app.getHttpServer())
-        .post("/api/v2/ee/bookings")
+        .post("/v2/bookings")
         .send(body)
         .expect(201)
         .then(async (response) => {
@@ -138,7 +138,7 @@ describe("Bookings Endpoints", () => {
 
     it("should get bookings", async () => {
       return request(app.getHttpServer())
-        .get("/api/v2/ee/bookings?filters[status]=upcoming")
+        .get("/v2/bookings?filters[status]=upcoming")
         .then((response) => {
           console.log("asap responseBody", JSON.stringify(response.body, null, 2));
           const responseBody: GetBookingsOutput = response.body;
@@ -159,7 +159,7 @@ describe("Bookings Endpoints", () => {
 
     it("should get booking", async () => {
       return request(app.getHttpServer())
-        .get(`/api/v2/ee/bookings/${createdBooking.uid}`)
+        .get(`/v2/bookings/${createdBooking.uid}`)
         .then((response) => {
           const responseBody: GetBookingOutput = response.body;
           const bookingInfo = responseBody.data;
@@ -199,7 +199,7 @@ describe("Bookings Endpoints", () => {
     //   };
 
     //   return request(app.getHttpServer())
-    //     .post("/api/v2/ee/bookings/reccuring")
+    //     .post("/v2/bookings/reccuring")
     //     .send(body)
     //     .expect(201)
     //     .then((response) => {
@@ -231,7 +231,7 @@ describe("Bookings Endpoints", () => {
     //   };
 
     //   return request(app.getHttpServer())
-    //     .post("/api/v2/ee/bookings/instant")
+    //     .post("/v2/bookings/instant")
     //     .send(body)
     //     .expect(201)
     //     .then((response) => {
@@ -250,7 +250,7 @@ describe("Bookings Endpoints", () => {
       };
 
       return request(app.getHttpServer())
-        .post(`/api/v2/ee/bookings/${bookingId}/cancel`)
+        .post(`/v2/bookings/${bookingId}/cancel`)
         .send(body)
         .expect(201)
         .then((response) => {

apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts

@@ -68,7 +68,7 @@ const DEFAULT_PLATFORM_PARAMS = {
 };
 
 @Controller({
-  path: "ee/bookings",
+  path: "/bookings",
   version: "2",
 })
 @UseGuards(PermissionsGuard)

apps/api/v2/src/ee/calendars/controllers/calendars.controller.ts

@@ -11,7 +11,7 @@ import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { CalendarBusyTimesInput } from "@calcom/platform-types";
 
 @Controller({
-  path: "ee/calendars",
+  path: "/calendars",
   version: "2",
 })
 @UseGuards(AccessTokenGuard)

apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts

@@ -85,14 +85,14 @@ describe("Platform Gcal Endpoints", () => {
 
   it(`/GET/ee/gcal/oauth/auth-url: it should respond 401 with invalid access token`, async () => {
     await request(app.getHttpServer())
-      .get(`/api/v2/ee/gcal/oauth/auth-url`)
+      .get(`/v2/gcal/oauth/auth-url`)
       .set("Authorization", `Bearer invalid_access_token`)
       .expect(401);
   });
 
   it(`/GET/ee/gcal/oauth/auth-url: it should auth-url to google oauth with valid access token `, async () => {
     const response = await request(app.getHttpServer())
-      .get(`/api/v2/ee/gcal/oauth/auth-url`)
+      .get(`/v2/gcal/oauth/auth-url`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)
       .set("Origin", CLIENT_REDIRECT_URI)
       .expect(200);
@@ -103,41 +103,41 @@ describe("Platform Gcal Endpoints", () => {
   it(`/GET/ee/gcal/oauth/save: without oauth code`, async () => {
     await request(app.getHttpServer())
       .get(
-        `/api/v2/ee/gcal/oauth/save?state=accessToken=${accessTokenSecret}&origin%3D${CLIENT_REDIRECT_URI}&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
+        `/v2/gcal/oauth/save?state=accessToken=${accessTokenSecret}&origin%3D${CLIENT_REDIRECT_URI}&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
       )
       .expect(400);
   });
 
   it(`/GET/ee/gcal/oauth/save: without access token`, async () => {
     await request(app.getHttpServer())
       .get(
-        `/api/v2/ee/gcal/oauth/save?state=origin%3D${CLIENT_REDIRECT_URI}&code=4/0AfJohXmBuT7QVrEPlAJLBu4ZcSnyj5jtDoJqSW_riPUhPXQ70RPGkOEbVO3xs-OzQwpPQw&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
+        `/v2/gcal/oauth/save?state=origin%3D${CLIENT_REDIRECT_URI}&code=4/0AfJohXmBuT7QVrEPlAJLBu4ZcSnyj5jtDoJqSW_riPUhPXQ70RPGkOEbVO3xs-OzQwpPQw&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
       )
       .expect(400);
   });
 
   it(`/GET/ee/gcal/oauth/save: without origin`, async () => {
     await request(app.getHttpServer())
       .get(
-        `/api/v2/ee/gcal/oauth/save?state=accessToken=${accessTokenSecret}&code=4/0AfJohXmBuT7QVrEPlAJLBu4ZcSnyj5jtDoJqSW_riPUhPXQ70RPGkOEbVO3xs-OzQwpPQw&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
+        `/v2/gcal/oauth/save?state=accessToken=${accessTokenSecret}&code=4/0AfJohXmBuT7QVrEPlAJLBu4ZcSnyj5jtDoJqSW_riPUhPXQ70RPGkOEbVO3xs-OzQwpPQw&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`
       )
       .expect(400);
   });
 
   it(`/GET/ee/gcal/check with access token but without origin`, async () => {
     await request(app.getHttpServer())
-      .get(`/api/v2/ee/gcal/check`)
+      .get(`/v2/gcal/check`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)
       .expect(400);
   });
 
   it(`/GET/ee/gcal/check without access token`, async () => {
-    await request(app.getHttpServer()).get(`/api/v2/ee/gcal/check`).expect(401);
+    await request(app.getHttpServer()).get(`/v2/gcal/check`).expect(401);
   });
 
   it(`/GET/ee/gcal/check with access token and origin but no credentials`, async () => {
     await request(app.getHttpServer())
-      .get(`/api/v2/ee/gcal/check`)
+      .get(`/v2/gcal/check`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)
       .set("Origin", CLIENT_REDIRECT_URI)
       .expect(400);
@@ -151,7 +151,7 @@ describe("Platform Gcal Endpoints", () => {
       "google-calendar"
     );
     await request(app.getHttpServer())
-      .get(`/api/v2/ee/gcal/check`)
+      .get(`/v2/gcal/check`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)
       .set("Origin", CLIENT_REDIRECT_URI)
       .expect(200);

apps/api/v2/src/ee/gcal/gcal.controller.ts

@@ -44,7 +44,7 @@ const CALENDAR_SCOPES = [
 
 // Controller for the GCalConnect Atom
 @Controller({
-  path: "ee/gcal",
+  path: "/gcal",
   version: "2",
 })
 @DocsTags("Google Calendar")
@@ -60,7 +60,7 @@ export class GcalController {
     private readonly calendarsService: CalendarsService
   ) {}
 
-  private redirectUri = `${this.config.get("api.url")}/ee/gcal/oauth/save`;
+  private redirectUri = `${this.config.get("api.url")}/gcal/oauth/save`;
 
   @Get("/oauth/auth-url")
   @HttpCode(HttpStatus.OK)

apps/api/v2/src/ee/me/me.controller.e2e-spec.ts

@@ -71,7 +71,7 @@ describe("Me Endpoints", () => {
 
     it("should get user associated with access token", async () => {
       return request(app.getHttpServer())
-        .get("/api/v2/ee/me")
+        .get("/v2/me")
         .expect(200)
         .then((response) => {
           const responseBody: ApiSuccessResponse<UserResponse> = response.body;
@@ -90,7 +90,7 @@ describe("Me Endpoints", () => {
       const body: UpdateManagedUserInput = { timeZone: "Europe/Rome" };
 
       return request(app.getHttpServer())
-        .patch("/api/v2/ee/me")
+        .patch("/v2/me")
         .send(body)
         .expect(200)
         .then(async (response) => {
@@ -114,22 +114,19 @@ describe("Me Endpoints", () => {
     it("should not update user associated with access token given invalid timezone", async () => {
       const bodyWithIncorrectTimeZone: UpdateManagedUserInput = { timeZone: "Narnia/Woods" };
 
-      return request(app.getHttpServer()).patch("/api/v2/ee/me").send(bodyWithIncorrectTimeZone).expect(400);
+      return request(app.getHttpServer()).patch("/v2/me").send(bodyWithIncorrectTimeZone).expect(400);
     });
 
     it("should not update user associated with access token given invalid time format", async () => {
       const bodyWithIncorrectTimeFormat: UpdateManagedUserInput = { timeFormat: 100 };
 
-      return request(app.getHttpServer())
-        .patch("/api/v2/ee/me")
-        .send(bodyWithIncorrectTimeFormat)
-        .expect(400);
+      return request(app.getHttpServer()).patch("/v2/me").send(bodyWithIncorrectTimeFormat).expect(400);
     });
 
     it("should not update user associated with access token given invalid week start", async () => {
       const bodyWithIncorrectWeekStart: UpdateManagedUserInput = { weekStart: "waba luba dub dub" };
 
-      return request(app.getHttpServer()).patch("/api/v2/ee/me").send(bodyWithIncorrectWeekStart).expect(400);
+      return request(app.getHttpServer()).patch("/v2/me").send(bodyWithIncorrectWeekStart).expect(400);
     });
 
     afterAll(async () => {

apps/api/v2/src/ee/me/me.controller.ts

@@ -14,7 +14,7 @@ import { PROFILE_READ, PROFILE_WRITE, SUCCESS_STATUS } from "@calcom/platform-co
 import { userSchemaResponse } from "@calcom/platform-types";
 
 @Controller({
-  path: "ee/me",
+  path: "/me",
   version: "2",
 })
 @UseGuards(AccessTokenGuard, PermissionsGuard)

apps/api/v2/src/ee/provider/provider.controller.ts

@@ -20,7 +20,7 @@ import { ApiTags as DocsTags } from "@nestjs/swagger";
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 
 @Controller({
-  path: "ee/provider",
+  path: "/provider",
   version: "2",
 })
 @DocsTags("Cal provider")