* fix: dont check OrganizationSettings.orgAutoAcceptEmail uniqueness for platform teams * feat: display organizationId in OAuthClientCard * feat: ApiAuthStrategy handle oauth credentials * refactor: clean up ApiAuthStrategy test * refactor: use ApiAuthGuard in OauthClientsUsersController and OAuthFlowController * fix: copying org id * refactor: more specific error message when api auth * refactor: auto accept team creator membership * feat: useTeamEventType and useTeamEventTypes hooks * refactor: make team event-types public & searchable by eventSlug * feat: include host name in team event-types hosts response * fix: isFixed=true by default for COLLECTIVE event hosts * fix: useTeamEventType eventSlug access * feat: BookerPlatformWrapper enable team events by exposting orgId and teamId props * refactor: provide orgId in atoms context * refactor: use orgId from context in team event-types hooks * refactor: return teams in useMe * chore: examples app teams setup * Revert "refactor: return teams in useMe" This reverts commit de992ddc9af6ee9a2111938069f5b9c34cc2d8ea. * Revert "chore: examples app teams setup" This reverts commit 0766aa21acc25efa2361d38c3f87ddba773a0245. * feat: useTeams hook * chore: setup examples app with team event-type * fix: small fixes * swagger * Revert "refactor: provide orgId in atoms context" This reverts commit f053a498ee6f8fa8ece5ec8d8630c59eda8873e3. * feat: orgId in atoms context * feat: PlatformBilling guard * chore: delete test of the deleted oauth-client-credentials.guard * refactor: org event-types collective events isFixed always true and priority medium * refactor: org event-types COLLECTIVE response ignore isFixed and priority as they are same * fix: organizations event-types e2e * fix: billing guard * refactor: tests cleanup * fix: platform plan guard spec * refactor: e2e test cleanup * seed error if not team * refactor: rename authenticateApiKey to authenticateBearerToken * refactor: transforming response hosts * refactor: rename findUniqueByMatchingAutoAcceptEmail to findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail * refactor: rename findUniqueByMatchingAutoAcceptEmail to findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
83 lines
2.5 KiB
TypeScript
83 lines
2.5 KiB
TypeScript
import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/organization";
|
|
|
|
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
|
|
import { MembershipRole } from "@calcom/prisma/client";
|
|
import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler";
|
|
|
|
import { moveUserToMatchingOrg } from "./verify-email";
|
|
|
|
vi.mock("@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler");
|
|
vi.mock("@calcom/lib/server/repository/organization");
|
|
|
|
describe("moveUserToMatchingOrg", () => {
|
|
const email = "test@example.com";
|
|
|
|
beforeEach(() => {
|
|
vi.resetAllMocks();
|
|
});
|
|
|
|
it("should not proceed if no matching organization is found", async () => {
|
|
organizationScenarios.OrganizationRepository.findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail.fakeNoMatch();
|
|
|
|
await moveUserToMatchingOrg({ email });
|
|
|
|
expect(inviteMembersWithNoInviterPermissionCheck).not.toHaveBeenCalled();
|
|
});
|
|
|
|
describe("should invite user to the matching organization", () => {
|
|
const argToInviteMembersWithNoInviterPermissionCheck = {
|
|
inviterName: null,
|
|
language: "en",
|
|
invitations: [
|
|
{
|
|
usernameOrEmail: email,
|
|
role: MembershipRole.MEMBER,
|
|
},
|
|
],
|
|
};
|
|
|
|
it("when organization has a slug and requestedSlug(slug is used)", async () => {
|
|
const org = {
|
|
id: "org123",
|
|
slug: "test-org",
|
|
requestedSlug: "requested-test-org",
|
|
};
|
|
|
|
organizationScenarios.OrganizationRepository.findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail.fakeReturnOrganization(
|
|
org,
|
|
{ email }
|
|
);
|
|
|
|
await moveUserToMatchingOrg({ email });
|
|
|
|
expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith({
|
|
...argToInviteMembersWithNoInviterPermissionCheck,
|
|
teamId: org.id,
|
|
orgSlug: org.slug,
|
|
});
|
|
});
|
|
|
|
it("when organization has requestedSlug only", async () => {
|
|
const org = {
|
|
id: "org123",
|
|
slug: null,
|
|
requestedSlug: "requested-test-org",
|
|
};
|
|
|
|
organizationScenarios.OrganizationRepository.findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail.fakeReturnOrganization(
|
|
org,
|
|
{ email }
|
|
);
|
|
|
|
await moveUserToMatchingOrg({ email });
|
|
|
|
expect(inviteMembersWithNoInviterPermissionCheck).toHaveBeenCalledWith({
|
|
...argToInviteMembersWithNoInviterPermissionCheck,
|
|
teamId: org.id,
|
|
orgSlug: org.requestedSlug,
|
|
});
|
|
});
|
|
});
|
|
});
|