Merge branch 'main' into app-install-flow-followup

Author: SomayChauhan

apps/api/v2/src/modules/auth/decorators/get-team/get-team.decorator.ts

@@ -0,0 +1,33 @@
+import { ExecutionContext } from "@nestjs/common";
+import { createParamDecorator } from "@nestjs/common";
+
+import { Team } from "@calcom/prisma/client";
+
+export type GetTeamReturnType = Team;
+
+export const GetTeam = createParamDecorator<
+  keyof GetTeamReturnType | (keyof GetTeamReturnType)[],
+  ExecutionContext
+>((data, ctx) => {
+  const request = ctx.switchToHttp().getRequest();
+  const team = request.team as GetTeamReturnType;
+
+  if (!team) {
+    throw new Error("GetTeam decorator : Team not found");
+  }
+
+  if (Array.isArray(data)) {
+    return data.reduce((prev, curr) => {
+      return {
+        ...prev,
+        [curr]: team[curr],
+      };
+    }, {});
+  }
+
+  if (data) {
+    return team[data];
+  }
+
+  return team;
+});

apps/api/v2/src/modules/auth/guards/organizations/is-org.guard.ts

@@ -5,7 +5,7 @@ import { Request } from "express";
 import { Team } from "@calcom/prisma/client";
 
 @Injectable()
-export class isOrgGuard implements CanActivate {
+export class IsOrgGuard implements CanActivate {
   constructor(private organizationsRepository: OrganizationsRepository) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {

apps/api/v2/src/modules/auth/guards/teams/is-team-in-org.guard.ts

@@ -0,0 +1,33 @@
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsTeamInOrg implements CanActivate {
+  constructor(private organizationsRepository: OrganizationsRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { team: Team }>();
+    const teamId: string = request.params.teamId;
+    const orgId: string = request.params.orgId;
+
+    if (!orgId) {
+      throw new ForbiddenException("No org id found in request params.");
+    }
+
+    if (!teamId) {
+      throw new ForbiddenException("No team id found in request params.");
+    }
+
+    const team = await this.organizationsRepository.findOrgTeam(Number(orgId), Number(teamId));
+
+    if (team && !team.isOrganization && team.parentId === Number(orgId)) {
+      request.team = team;
+      return true;
+    }
+
+    return false;
+  }
+}

apps/api/v2/src/modules/organizations/controllers/organizations-teams.controller.e2e-spec.ts

@@ -22,7 +22,10 @@ describe("Organizations Team Endpoints", () => {
 
     let userRepositoryFixture: UserRepositoryFixture;
     let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+
     let org: Team;
+    let team: Team;
 
     const userEmail = "org-teams-controller-e2e@api.com";
     let user: User;
@@ -37,6 +40,7 @@ describe("Organizations Team Endpoints", () => {
 
       userRepositoryFixture = new UserRepositoryFixture(moduleRef);
       organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
 
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -48,6 +52,12 @@ describe("Organizations Team Endpoints", () => {
         isOrganization: true,
       });
 
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
       app = moduleRef.createNestApplication();
       bootstrap(app as NestExpressApplication);
 
@@ -72,6 +82,26 @@ describe("Organizations Team Endpoints", () => {
         });
     });
 
+    it("should fail if org does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/120494059/teams`).expect(403);
+    });
+
+    it("should get the team of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${team.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(team.id);
+          expect(responseBody.data.parentId).toEqual(team.parentId);
+        });
+    });
+
+    it("should fail if the team does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams/123132145`).expect(403);
+    });
+
     afterAll(async () => {
       await userRepositoryFixture.deleteByEmail(user.email);
       await organizationsRepositoryFixture.delete(org.id);

apps/api/v2/src/modules/organizations/controllers/organizations-teams.controller.ts

@@ -1,7 +1,9 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { GetOrg } from "@/modules/auth/decorators/get-org/get-org.decorator";
+import { GetTeam } from "@/modules/auth/decorators/get-team/get-team.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
-import { isOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
 import { Controller, UseGuards, Get, Param, ParseIntPipe } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";
 
@@ -13,7 +15,7 @@ import { Team } from "@calcom/prisma/client";
   path: "/v2/organizations/:orgId/teams",
   version: API_VERSIONS_VALUES,
 })
-@UseGuards(ApiAuthGuard, isOrgGuard)
+@UseGuards(ApiAuthGuard, IsOrgGuard)
 @DocsTags("Organizations Teams")
 export class OrganizationsTeamsController {
   @Get()
@@ -28,4 +30,20 @@ export class OrganizationsTeamsController {
       data: [],
     };
   }
+
+  @UseGuards(IsTeamInOrg)
+  @Get("/:teamId")
+  async getTeam(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @GetOrg() organization: Team,
+    @GetTeam() team: Team,
+    @GetOrg("name") orgName: string
+  ): Promise<ApiResponse<Team>> {
+    console.log(teamId, orgId, organization, team, orgName);
+    return {
+      status: SUCCESS_STATUS,
+      data: team,
+    };
+  }
 }

apps/api/v2/src/modules/organizations/organizations.repository.ts

@@ -70,4 +70,14 @@ export class OrganizationsRepository {
       },
     });
   }
+
+  async findOrgTeam(organizationId: number, teamId: number) {
+    return this.dbRead.prisma.team.findUnique({
+      where: {
+        id: teamId,
+        isOrganization: false,
+        parentId: organizationId,
+      },
+    });
+  }
 }

apps/web/components/eventtype/AssignmentWarningDialog.tsx

@@ -12,6 +12,7 @@ interface AssignmentWarningDialogProps {
   leaveWithoutAssigningHosts: MutableRefObject<boolean>;
   id: number;
 }
+
 const AssignmentWarningDialog = (props: AssignmentWarningDialogProps) => {
   const { t } = useLocale();
   const {
@@ -24,11 +25,12 @@ const AssignmentWarningDialog = (props: AssignmentWarningDialogProps) => {
   const router = useRouter();
   return (
     <Dialog open={isOpenAssignmentWarnDialog} onOpenChange={setIsOpenAssignmentWarnDialog}>
-      <DialogContent title={t("leave_without_assigning_anyone")} Icon="circle-alert" type="confirmation">
-        <div className="text-subtle text-sm">
-          <p className="mt-3">{t("leave_without_adding_attendees")}</p>
-          <p className="mt-4">{t("no_availability_shown_to_bookers")}</p>
-        </div>
+      <DialogContent
+        title={t("leave_without_assigning_anyone")}
+        description={`${t("leave_without_adding_attendees")} ${t("no_availability_shown_to_bookers")}`}
+        Icon="circle-alert"
+        enableOverflow
+        type="confirmation">
         <DialogFooter className="mt-6">
           <Button
             onClick={(e) => {

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",

packages/platform/types/tsconfig.json

@@ -7,6 +7,6 @@
     "experimentalDecorators": true,
     "outDir": "dist"
   },
-  "include": ["."],
+  "include": [".", "../../types/business-days-plugin.d.ts", "../../types/window.d.ts"],
   "exclude": ["dist", "build", "node_modules"]
 }

packages/platform/utils/tsconfig.json

@@ -8,6 +8,6 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
-  "include": [".", "./tests"],
+  "include": [".", "./tests", "../../types/business-days-plugin.d.ts", "../../types/window.d.ts"],
   "exclude": ["dist", "build", "node_modules", "**/*.test.*", "**/__mocks__/*", "**/__tests__/*"]
 }

packages/ui/components/dialog/Dialog.tsx

@@ -134,11 +134,11 @@ export const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps
           {type === "confirmation" && (
             <div className="flex">
               {icon && (
-                <div className="bg-emphasis mr-4 inline-flex h-10 w-10 items-center justify-center rounded-full">
+                <div className="bg-emphasis flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full">
                   <Icon name={icon} className="text-emphasis h-4 w-4" />
                 </div>
               )}
-              <div className="w-full">
+              <div className="ml-4 flex-grow">
                 <DialogHeader title={title} subtitle={props.description} />
                 <div data-testid="dialog-confirmation">{children}</div>
               </div>
@@ -167,7 +167,7 @@ export function DialogHeader(props: DialogHeaderProps) {
         id="modal-title">
         {props.title}
       </h3>
-      {props.subtitle && <div className="text-subtle text-sm">{props.subtitle}</div>}
+      {props.subtitle && <p className="text-subtle text-sm">{props.subtitle}</p>}
     </div>
   );
 }