* refactor(teams): improve membership validation for org admins - Add organization scope validation to removeMember handler - Ensure team operations are scoped to users organization context - Update related tests * test(teams): align removeMember tests with updated interface - Add organizationId to test contexts - Add team.findMany mock for org validation - Add test cases for org scope validation * refactor(teams): use TeamRepository for org validation in LegacyRemoveMemberService - Add findByIdsAndOrgId method to TeamRepository - Inject TeamRepository into LegacyRemoveMemberService via constructor - Update RemoveMemberServiceFactory to instantiate and inject TeamRepository - Update tests to mock TeamRepository instead of direct prisma calls Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: [email protected] <[email protected]> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
24 lines
1.0 KiB
TypeScript
24 lines
1.0 KiB
TypeScript
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
|
|
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
|
|
import { prisma } from "@calcom/prisma";
|
|
|
|
import type { IRemoveMemberService } from "./IRemoveMemberService";
|
|
import { LegacyRemoveMemberService } from "./LegacyRemoveMemberService";
|
|
import { PBACRemoveMemberService } from "./PBACRemoveMemberService";
|
|
|
|
export class RemoveMemberServiceFactory {
|
|
/**
|
|
* Creates the appropriate RemoveMemberService based on whether PBAC is enabled
|
|
* Caches the service per team/org to avoid repeated feature flag checks
|
|
*/
|
|
static async create(teamId: number): Promise<IRemoveMemberService> {
|
|
const featuresRepository = new FeaturesRepository(prisma);
|
|
const isPBACEnabled = await featuresRepository.checkIfTeamHasFeature(teamId, "pbac");
|
|
|
|
const teamRepository = new TeamRepository(prisma);
|
|
const service = isPBACEnabled ? new PBACRemoveMemberService() : new LegacyRemoveMemberService(teamRepository);
|
|
|
|
return service;
|
|
}
|
|
}
|