Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(sharing): team sharing for projects (#6586)

Will Hutchinsoneeb9483a32f5
diff --git a/.sqlx/query-22889d5110796ee5c0581948d047f80ff7b54a17c6a0bb533e51933269e2479b.json b/.sqlx/query-22889d5110796ee5c0581948d047f80ff7b54a17c6a0bb533e51933269e2479b.json
deleted file mode 100644
index 07cabfaa50..0000000000
--- a/.sqlx/query-22889d5110796ee5c0581948d047f80ff7b54a17c6a0bb533e51933269e2479b.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT\n permission.id,\n permission.\"linkShare\" AS \"link_share?\",\n permission.\"linkShareAccessLevel\" AS \"link_share_access_level?: AccessLevel\",\n project.\"userId\" AS owner,\n COALESCE(\n json_agg(json_build_object(\n 'channel_id', channel.\"channel_id\",\n 'access_level', channel.\"access_level\"\n )) FILTER (WHERE channel.\"channel_id\" IS NOT NULL),\n '[]'\n ) AS \"channel_share_permissions?\"\n FROM \"ProjectPermission\" project_permission\n JOIN \"SharePermission\" permission\n ON project_permission.\"sharePermissionId\" = permission.id\n JOIN \"Project\" project ON project_permission.\"projectId\" = project.id\n LEFT JOIN \"ChannelSharePermission\" channel\n ON channel.\"share_permission_id\" = permission.id\n WHERE project_permission.\"projectId\" = $1\n GROUP BY permission.id, project.\"userId\"\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Text"
- },
- {
- "ordinal": 1,
- "name": "link_share?",
- "type_info": "Text"
- },
- {
- "ordinal": 2,
- "name": "link_share_access_level?: AccessLevel",
- "type_info": {
- "Custom": {
- "name": "\"AccessLevel\"",
- "kind": {
- "Enum": [
- "view",
- "comment",
- "edit",
- "owner"
- ]
- }
- }
- }
- },
- {
- "ordinal": 3,
- "name": "owner",
- "type_info": "Text"
- },
- {
- "ordinal": 4,
- "name": "channel_share_permissions?",
- "type_info": "Json"
- }
- ],
- "parameters": {
- "Left": [
- "Text"
- ]
- },
- "nullable": [
- false,
- true,
- true,
- false,
- null
- ]
- },
- "hash": "22889d5110796ee5c0581948d047f80ff7b54a17c6a0bb533e51933269e2479b"
-}
diff --git a/.sqlx/query-3b9c5a5b2f2bc9c05419a2f362dd067a7c37a7dd9e6f65f37a2be3c11a01d4c2.json b/.sqlx/query-3b9c5a5b2f2bc9c05419a2f362dd067a7c37a7dd9e6f65f37a2be3c11a01d4c2.json
new file mode 100644
index 0000000000..fac46dc612
--- /dev/null
+++ b/.sqlx/query-3b9c5a5b2f2bc9c05419a2f362dd067a7c37a7dd9e6f65f37a2be3c11a01d4c2.json
@@ -0,0 +1,34 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT access_level AS \"access_level: AccessLevel\"\n FROM entity_access\n WHERE entity_id = $1 AND entity_type = 'project' AND source_type = 'team'\n AND granted_from_project_id IS NULL\n ORDER BY access_level\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "access_level: AccessLevel",
+ "type_info": {
+ "Custom": {
+ "name": "\"AccessLevel\"",
+ "kind": {
+ "Enum": [
+ "view",
+ "comment",
+ "edit",
+ "owner"
+ ]
+ }
+ }
+ }
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "3b9c5a5b2f2bc9c05419a2f362dd067a7c37a7dd9e6f65f37a2be3c11a01d4c2"
+}
diff --git a/.sqlx/query-62ddf35c17c3a1787a2aa9610bf97b2bfc02acb863aa374d077f53de47cfcdad.json b/.sqlx/query-62ddf35c17c3a1787a2aa9610bf97b2bfc02acb863aa374d077f53de47cfcdad.json
new file mode 100644
index 0000000000..21c44e77c1
--- /dev/null
+++ b/.sqlx/query-62ddf35c17c3a1787a2aa9610bf97b2bfc02acb863aa374d077f53de47cfcdad.json
@@ -0,0 +1,76 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT\n permission.id,\n permission.\"linkShare\" AS \"link_share?\",\n permission.\"linkShareAccessLevel\" AS \"link_share_access_level?: AccessLevel\",\n permission.team_share_access_level AS \"team_share_access_level?: AccessLevel\",\n project.\"userId\" AS owner,\n COALESCE(\n json_agg(json_build_object(\n 'channel_id', channel.\"channel_id\",\n 'access_level', channel.\"access_level\"\n )) FILTER (WHERE channel.\"channel_id\" IS NOT NULL),\n '[]'\n ) AS \"channel_share_permissions?\"\n FROM \"ProjectPermission\" project_permission\n JOIN \"SharePermission\" permission\n ON project_permission.\"sharePermissionId\" = permission.id\n JOIN \"Project\" project ON project_permission.\"projectId\" = project.id\n LEFT JOIN \"ChannelSharePermission\" channel\n ON channel.\"share_permission_id\" = permission.id\n WHERE project_permission.\"projectId\" = $1\n GROUP BY permission.id, project.\"userId\"\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 1,
+ "name": "link_share?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 2,
+ "name": "link_share_access_level?: AccessLevel",
+ "type_info": {
+ "Custom": {
+ "name": "\"AccessLevel\"",
+ "kind": {
+ "Enum": [
+ "view",
+ "comment",
+ "edit",
+ "owner"
+ ]
+ }
+ }
+ }
+ },
+ {
+ "ordinal": 3,
+ "name": "team_share_access_level?: AccessLevel",
+ "type_info": {
+ "Custom": {
+ "name": "\"AccessLevel\"",
+ "kind": {
+ "Enum": [
+ "view",
+ "comment",
+ "edit",
+ "owner"
+ ]
+ }
+ }
+ }
+ },
+ {
+ "ordinal": 4,
+ "name": "owner",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 5,
+ "name": "channel_share_permissions?",
+ "type_info": "Json"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ false,
+ true,
+ true,
+ true,
+ false,
+ null
+ ]
+ },
+ "hash": "62ddf35c17c3a1787a2aa9610bf97b2bfc02acb863aa374d077f53de47cfcdad"
+}
diff --git a/.sqlx/query-6c5f77ad3f132df02fea7deca4b14f2e0b98861e3f1967785d49d66fc9ed49ed.json b/.sqlx/query-6c5f77ad3f132df02fea7deca4b14f2e0b98861e3f1967785d49d66fc9ed49ed.json
new file mode 100644
index 0000000000..09f97b42b1
--- /dev/null
+++ b/.sqlx/query-6c5f77ad3f132df02fea7deca4b14f2e0b98861e3f1967785d49d66fc9ed49ed.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "DELETE FROM entity_access\n WHERE granted_from_project_id = $1\n AND source_type = 'team'\n AND source_id = $2",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Text",
+ "Text"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "6c5f77ad3f132df02fea7deca4b14f2e0b98861e3f1967785d49d66fc9ed49ed"
+}
diff --git a/.sqlx/query-c520df6bc7468dc2846dd074eaef6fd38e2e862744473e98ac1e9a0226d9d0cd.json b/.sqlx/query-c520df6bc7468dc2846dd074eaef6fd38e2e862744473e98ac1e9a0226d9d0cd.json
new file mode 100644
index 0000000000..cff83746ce
--- /dev/null
+++ b/.sqlx/query-c520df6bc7468dc2846dd074eaef6fd38e2e862744473e98ac1e9a0226d9d0cd.json
@@ -0,0 +1,34 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT\n sp.team_share_access_level::text AS \"level?\",\n sp.team_share_team_id AS \"team_id?\",\n sp.team_share_revision AS revision\n FROM \"ProjectPermission\" pp\n JOIN \"SharePermission\" sp ON pp.\"sharePermissionId\" = sp.id\n WHERE pp.\"projectId\" = $1\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "level?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 1,
+ "name": "team_id?",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 2,
+ "name": "revision",
+ "type_info": "Int8"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ null,
+ true,
+ false
+ ]
+ },
+ "hash": "c520df6bc7468dc2846dd074eaef6fd38e2e862744473e98ac1e9a0226d9d0cd"
+}
diff --git a/.sqlx/query-f204cb7321ff15dc476c1d781f28a152904633496f272a2529bd2b22789d9830.json b/.sqlx/query-f204cb7321ff15dc476c1d781f28a152904633496f272a2529bd2b22789d9830.json
new file mode 100644
index 0000000000..f0097234ff
--- /dev/null
+++ b/.sqlx/query-f204cb7321ff15dc476c1d781f28a152904633496f272a2529bd2b22789d9830.json
@@ -0,0 +1,16 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO entity_access (\n entity_id,\n entity_type,\n source_id,\n source_type,\n access_level\n )\n VALUES ($1, 'project', $2, 'team', $3::text::\"AccessLevel\")\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text",
+ "Text"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "f204cb7321ff15dc476c1d781f28a152904633496f272a2529bd2b22789d9830"
+}
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
index 03d636e6f0..91ec81eb11 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
@@ -19,6 +19,8 @@ const mocks = vi.hoisted(() => ({
callRecordShared: true,
callRecordQuerySuccess: true,
getProjectPermissions: vi.fn(),
+ editProject: vi.fn(),
+ editDocument: vi.fn(),
copyLink: vi.fn(),
blockPermissionsRead: vi.fn(),
inBlock: true,
@@ -82,7 +84,11 @@ vi.mock('@core/util/channels', () => ({ useSendMessageToPeople: () => mocks }));
vi.mock('@service-storage/client', () => ({
storageServiceClient: {
getDocumentPermissions: mocks.getDocumentPermissions,
- projects: { getPermissions: mocks.getProjectPermissions },
+ editDocument: mocks.editDocument,
+ projects: {
+ getPermissions: mocks.getProjectPermissions,
+ edit: mocks.editProject,
+ },
},
blockNameToItemType: (name: string) =>
name === 'agent' ? 'agent_session' : 'document',
@@ -106,7 +112,27 @@ vi.mock('@channel/use-channel-participants', () => ({
}));
vi.mock('@core/component/EntityIcon', () => ({ EntityIcon: () => null }));
vi.mock('@core/component/UserIcon', () => ({ UserIcon: () => null }));
-vi.mock('@core/component/Tabs', () => ({ Tabs: () => null }));
+vi.mock('@core/component/Tabs', () => ({
+ Tabs: (props: {
+ list: { value: string; label: string }[];
+ value?: string;
+ onChange?: (value: string) => void;
+ }) => (
+ <div role="tablist">
+ <For each={props.list}>
+ {(tab) => (
+ <button
+ role="tab"
+ aria-selected={props.value === tab.value}
+ onClick={() => props.onChange?.(tab.value)}
+ >
+ {tab.label}
+ </button>
+ )}
+ </For>
+ </div>
+ ),
+}));
vi.mock('@core/signal/blockElement', () => ({
blockHotkeyScopeSignal: { get: () => '' },
}));
@@ -240,7 +266,9 @@ vi.mock('@ui', () => {
Group: Container,
}),
ButtonGroup: Object.assign(Container, { Divider: () => null }),
- SegmentedControl: () => null,
+ SegmentedControl: (props: { 'aria-label'?: string }) => (
+ <div role="group" aria-label={props['aria-label']} />
+ ),
cn: (...values: unknown[]) => values.filter(Boolean).join(' '),
Hotkey: () => null,
};
@@ -254,6 +282,8 @@ beforeEach(() => {
mocks.callRecordQuerySuccess = true;
mocks.updateChatPermissions.mockResolvedValue({ isErr: () => false });
mocks.updateCallTeamShare.mockResolvedValue({ isErr: () => false });
+ mocks.editProject.mockResolvedValue({ isErr: () => false });
+ mocks.editDocument.mockResolvedValue({ isErr: () => false });
Object.defineProperty(navigator, 'clipboard', {
configurable: true,
value: { writeText: mocks.copyLink },
@@ -484,7 +514,8 @@ describe('call team sharing', () => {
true
);
expect(mocks.updateChatPermissions).not.toHaveBeenCalled();
- expect(mocks.getDocumentPermissions).not.toHaveBeenCalled();
+ expect(mocks.editDocument).not.toHaveBeenCalled();
+ expect(mocks.editProject).not.toHaveBeenCalled();
});
it('clears call team access with an explicit null', async () => {
@@ -550,6 +581,9 @@ describe('chat team sharing', () => {
expect(
screen.getByText("Share this chat directly with the owner's team.")
).toBeTruthy();
+ expect(
+ screen.getByRole('group', { name: 'Link sharing scope' })
+ ).toBeTruthy();
expect(
screen
.getByRole('group', { name: 'Team access level' })
@@ -596,3 +630,112 @@ describe('chat team sharing', () => {
expect(mocks.updateChatPermissions).not.toHaveBeenCalled();
});
});
+
+function mountProjectShare() {
+ mocks.blockPermissionsRead.mockReturnValue({
+ isErr: () => false,
+ value: {
+ id: 'perm-project',
+ owner: 'owner',
+ linkShare: null,
+ linkShareAccessLevel: null,
+ teamShareAccessLevel: 'view',
+ channelSharePermissions: [],
+ },
+ });
+ render(() => (
+ <ShareModal
+ id="project-1"
+ name="Launch folder"
+ owner="owner"
+ itemType="project"
+ blockAlias="project"
+ userPermissions={Permissions.OWNER}
+ isSharePermOpen
+ setIsSharePermOpen={vi.fn()}
+ />
+ ));
+}
+
+describe('project team sharing', () => {
+ it('lets the owner share the folder with their team without a link sharing card', async () => {
+ mocks.hasTeam = true;
+ mountProjectShare();
+
+ expect(screen.getByText('Team access')).toBeTruthy();
+ expect(
+ screen.getByText("Share this folder directly with the owner's team.")
+ ).toBeTruthy();
+ expect(
+ screen.queryByRole('group', { name: 'Link sharing scope' })
+ ).toBeNull();
+ expect(screen.queryByText('Link sharing off')).toBeNull();
+ expect(
+ screen
+ .getByRole('group', { name: 'Team access level' })
+ .getAttribute('data-value')
+ ).toBe('view');
+
+ fireEvent.click(
+ screen.getByRole('button', { name: 'Set Team access level edit' })
+ );
+
+ await vi.waitFor(() =>
+ expect(mocks.editProject).toHaveBeenCalledWith({
+ id: 'project-1',
+ sharePermission: { teamShareAccessLevel: 'edit' },
+ })
+ );
+ expect(mocks.updateChatPermissions).not.toHaveBeenCalled();
+ expect(mocks.editDocument).not.toHaveBeenCalled();
+ });
+
+ it('clears folder team access with an explicit null', async () => {
+ mocks.hasTeam = true;
+ mountProjectShare();
+
+ fireEvent.click(
+ screen.getByRole('button', { name: 'Set Team access level NONE' })
+ );
+
+ await vi.waitFor(() =>
+ expect(mocks.editProject).toHaveBeenCalledWith({
+ id: 'project-1',
+ sharePermission: { teamShareAccessLevel: null },
+ })
+ );
+ });
+
+ it('hides folder team access when the owner has no team', () => {
+ mocks.hasTeam = false;
+ mountProjectShare();
+
+ expect(screen.queryByText('Team access')).toBeNull();
+ expect(
+ screen.queryByRole('group', { name: 'Team access level' })
+ ).toBeNull();
+ expect(
+ screen.queryByRole('group', { name: 'Link sharing scope' })
+ ).toBeNull();
+ expect(mocks.editProject).not.toHaveBeenCalled();
+ });
+
+ it('puts folder team access on a Team tab and omits the Link tab', () => {
+ mocks.mobile = true;
+ mocks.hasTeam = true;
+ mountProjectShare();
+
+ expect(screen.queryByRole('tab', { name: 'Link' })).toBeNull();
+ expect(screen.queryByText('Team access')).toBeNull();
+
+ fireEvent.click(screen.getByRole('tab', { name: 'Team' }));
+
+ expect(screen.getByText('Team access')).toBeTruthy();
+ expect(
+ screen.getByText("Share this folder directly with the owner's team.")
+ ).toBeTruthy();
+ expect(
+ screen.queryByRole('group', { name: 'Link sharing scope' })
+ ).toBeNull();
+ });
+});
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index d0d459fd6d..a8097c7ee6 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -112,7 +112,6 @@ import {
LINK_SHARE_SCOPE_OPTIONS,
type LinkSharePayload,
type LinkShareScope,
- TEAM_SHARE_SCOPE_OPTIONS,
type TeamSharePayload,
type TeamShareScope,
teamShareScopeOptionsForItem,
@@ -317,13 +316,65 @@ interface TeamShareControls {
scopeOptions: ReadonlyArray<{ value: TeamShareScope; label: string }>;
}
+function teamShareOnOwnCard(
+ itemType: ItemType,
+ teamShare: TeamShareControls | undefined
+): TeamShareControls | undefined {
+ return teamShare && isLinkSharingDisabledForItem(itemType)
+ ? teamShare
+ : undefined;
+}
+
+function TeamAccessSection(props: { teamShare: TeamShareControls }) {
+ const teamShareScope = () => getTeamShareScope(props.teamShare.accessLevel);
+
+ return (
+ <div class="flex flex-wrap items-center justify-between gap-3">
+ <div class="flex flex-col gap-1">
+ <span class="font-medium">Team access</span>
+ <p class="text-sm text-ink-muted">
+ Share this {props.teamShare.itemNoun} directly with the owner's team.
+ </p>
+ </div>
+ <Dropdown>
+ <Dropdown.Trigger
+ variant="outline"
+ aria-label="Team access"
+ class="min-w-16.75 py-1 pl-2 pr-1 rounded-md flex items-center gap-1"
+ >
+ {getTeamShareScopeCopy(teamShareScope())}
+ <ChevronDownIcon class="size-4 text-ink-extra-muted" />
+ </Dropdown.Trigger>
+ <Dropdown.Content portalScope="local">
+ <Dropdown.RadioGroup
+ aria-label="Team access level"
+ value={teamShareScope()}
+ onChange={(value) =>
+ props.teamShare.setAccessLevel(value as TeamShareScope)
+ }
+ >
+ <For each={props.teamShare.scopeOptions}>
+ {(option) => (
+ <Dropdown.RadioItem value={option.value}>
+ <span class="flex-1 truncate">{option.label}</span>
+ <Dropdown.ItemIndicator>
+ <CheckIcon class="size-3.5 text-accent" />
+ </Dropdown.ItemIndicator>
+ </Dropdown.RadioItem>
+ )}
+ </For>
+ </Dropdown.RadioGroup>
+ </Dropdown.Content>
+ </Dropdown>
+ </div>
+ );
+}
+
function LinkSharingControls(props: LinkSharingControlsProps) {
const scope = () => getLinkShareScope(props.linkShare);
const scopeCopy = () => getLinkShareScopeCopy(scope());
const shareStatus = () =>
getShareStatus(props.linkShare, props.hasExplicitShares);
- const teamShareScope = () => getTeamShareScope(props.teamShare?.accessLevel);
- const teamShareNoun = () => props.teamShare?.itemNoun ?? 'item';
return (
<div class="flex flex-col gap-3 p-4 text-sm text-ink">
@@ -371,48 +422,11 @@ function LinkSharingControls(props: LinkSharingControlsProps) {
</div>
</Show>
<Show when={props.teamShare}>
- <div class="flex flex-wrap items-center justify-between gap-3 border-t border-edge-muted pt-3">
- <div class="flex flex-col gap-1">
- <span class="font-medium">Team access</span>
- <p class="text-sm text-ink-muted">
- Share this {teamShareNoun()} directly with the owner's team.
- </p>
+ {(teamShare) => (
+ <div class="border-t border-edge-muted pt-3">
+ <TeamAccessSection teamShare={teamShare()} />
</div>
- <Dropdown>
- <Dropdown.Trigger
- variant="outline"
- aria-label="Team access"
- class="min-w-16.75 py-1 pl-2 pr-1 rounded-md flex items-center gap-1"
- >
- {getTeamShareScopeCopy(teamShareScope())}
- <ChevronDownIcon class="size-4 text-ink-extra-muted" />
- </Dropdown.Trigger>
- <Dropdown.Content portalScope="local">
- <Dropdown.RadioGroup
- aria-label="Team access level"
- value={teamShareScope()}
- onChange={(value) =>
- props.teamShare?.setAccessLevel(value as TeamShareScope)
- }
- >
- <For
- each={
- props.teamShare?.scopeOptions ?? TEAM_SHARE_SCOPE_OPTIONS
- }
- >
- {(option) => (
- <Dropdown.RadioItem value={option.value}>
- <span class="flex-1 truncate">{option.label}</span>
- <Dropdown.ItemIndicator>
- <CheckIcon class="size-3.5 text-accent" />
- </Dropdown.ItemIndicator>
- </Dropdown.RadioItem>
- )}
- </For>
- </Dropdown.RadioGroup>
- </Dropdown.Content>
- </Dropdown>
- </div>
+ )}
</Show>
</div>
);
@@ -433,8 +447,7 @@ interface MobileShareDrawerProps {
formattedOwner: string;
linkShare: LinkShare | null | undefined;
linkShareAccessLevel: AccessLevel | null | undefined;
- teamShareAccessLevel: AccessLevel | null | undefined;
- setTeamShareAccessLevel?: (scope: TeamShareScope) => void;
+ teamShare?: TeamShareControls;
refetch: () => void;
navigateToChannel: (channelId: string) => void;
removeChannelAccess: (channelId: string) => void;
@@ -470,6 +483,8 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
!isLinkSharingDisabledForItem(props.itemType)
)
tabs.push({ value: 'link', label: 'Link' });
+ if (teamShareOnOwnCard(props.itemType, props.teamShare))
+ tabs.push({ value: 'team', label: 'Team' });
return tabs;
});
@@ -663,20 +678,22 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
setLinkShareScope={props.setLinkShareScope}
setLinkShareAccessLevel={props.setLinkShareAccessLevel}
copyLink={props.copyLink}
- teamShare={
- props.setTeamShareAccessLevel
- ? {
- accessLevel: props.teamShareAccessLevel,
- setAccessLevel: props.setTeamShareAccessLevel,
- itemNoun: getShareItemNoun(props.itemType),
- scopeOptions: teamShareScopeOptionsForItem(
- props.itemType
- ),
- }
- : undefined
- }
+ teamShare={props.teamShare}
/>
</Show>
+ <Show
+ when={
+ effectiveActiveTab() === 'team'
+ ? teamShareOnOwnCard(props.itemType, props.teamShare)
+ : undefined
+ }
+ >
+ {(teamShare) => (
+ <div class="p-4 text-sm text-ink">
+ <TeamAccessSection teamShare={teamShare()} />
+ </div>
+ )}
+ </Show>
</MobileDrawer.Content>
</MobileDrawer.Portal>
</MobileDrawer>
@@ -1005,6 +1022,11 @@ export function ShareModal(props: ShareModalProps) {
});
} else if (props.itemType === 'call') {
result = await updateCallTeamShare(props.id, shared);
+ } else if (props.itemType === 'project') {
+ result = await storageServiceClient.projects.edit({
+ id: props.id,
+ sharePermission,
+ });
} else {
result = await storageServiceClient.editDocument({
sharePermission,
@@ -1166,8 +1188,7 @@ export function ShareModal(props: ShareModalProps) {
formattedOwner={formattedOwner()}
linkShare={linkShare()}
linkShareAccessLevel={linkShareAccessLevel()}
- teamShareAccessLevel={teamShareAccessLevel()}
- setTeamShareAccessLevel={teamShareControls()?.setAccessLevel}
+ teamShare={teamShareControls()}
refetch={refetch}
navigateToChannel={navigateToChannel}
removeChannelAccess={removeChannelAccess}
@@ -1401,6 +1422,19 @@ export function ShareModal(props: ShareModalProps) {
</Panel.Body>
</Panel>
</Show>
+ <Show
+ when={teamShareOnOwnCard(props.itemType, teamShareControls())}
+ >
+ {(teamShare) => (
+ <Panel depth={2} class="rounded-xl bg-dialog">
+ <Panel.Body>
+ <div class="p-4 text-sm text-ink">
+ <TeamAccessSection teamShare={teamShare()} />
+ </div>
+ </Panel.Body>
+ </Panel>
+ )}
+ </Show>
</Dialog.Content>
</div>
</Dialog.Portal>
diff --git a/apps/web/src/lib/core/component/TopBar/linkShare.test.ts b/apps/web/src/lib/core/component/TopBar/linkShare.test.ts
index 740d7ef0ef..8bc54d5268 100644
--- a/apps/web/src/lib/core/component/TopBar/linkShare.test.ts
+++ b/apps/web/src/lib/core/component/TopBar/linkShare.test.ts
@@ -15,11 +15,14 @@ import {
} from './linkShare';
describe('isTeamShareSupportedForItem', () => {
- it.each(['document', 'chat', 'call'] as const)('supports %s', (itemType) => {
- expect(isTeamShareSupportedForItem(itemType)).toBe(true);
- });
+ it.each(['document', 'chat', 'call', 'project'] as const)(
+ 'supports %s',
+ (itemType) => {
+ expect(isTeamShareSupportedForItem(itemType)).toBe(true);
+ }
+ );
- it.each(['project', 'email', 'agent_session'] as const)(
+ it.each(['email', 'agent_session'] as const)(
'does not offer team access for %s',
(itemType) => {
expect(isTeamShareSupportedForItem(itemType)).toBe(false);
@@ -34,6 +37,7 @@ describe('getShareItemNoun', () => {
['call', 'call'],
['email', 'email thread'],
['agent_session', 'agent session'],
+ ['project', 'folder'],
] as const)('names %s as "%s"', (itemType, noun) => {
expect(getShareItemNoun(itemType)).toBe(noun);
});
@@ -140,6 +144,12 @@ describe('team share payload', () => {
{ value: 'comment', label: 'Comment' },
{ value: 'edit', label: 'Edit' },
]);
+ expect(teamShareScopeOptionsForItem('project')).toEqual([
+ { value: 'NONE', label: 'None' },
+ { value: 'view', label: 'View' },
+ { value: 'comment', label: 'Comment' },
+ { value: 'edit', label: 'Edit' },
+ ]);
});
it.each([undefined, null, 'owner'] as const)(
diff --git a/apps/web/src/lib/core/component/TopBar/linkShare.ts b/apps/web/src/lib/core/component/TopBar/linkShare.ts
index f592608b1e..ca5ece194d 100644
--- a/apps/web/src/lib/core/component/TopBar/linkShare.ts
+++ b/apps/web/src/lib/core/component/TopBar/linkShare.ts
@@ -9,6 +9,7 @@ const TEAM_SHAREABLE_ITEM_TYPES: ReadonlySet<ItemType> = new Set<ItemType>([
'document',
'chat',
'call',
+ 'project',
]);
export function isTeamShareSupportedForItem(itemType: ItemType): boolean {
@@ -22,6 +23,8 @@ export function getShareItemNoun(itemType: ItemType): string {
return 'email thread';
case 'agent_session':
return 'agent session';
+ case 'project':
+ return 'folder';
default:
return itemType;
}
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/project_access/test.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/project_access/test.rs
index 23008f064d..9bd6282e04 100644
--- a/crates/entity_access/src/outbound/pg_access_repo/queries/project_access/test.rs
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries/project_access/test.rs
@@ -150,6 +150,36 @@ async fn insert_entity_access(
Ok(())
}
+async fn insert_team_entity_access(
+ pool: &PgPool,
+ project_id: Uuid,
+ team_id: Uuid,
+ access_level: AccessLevel,
+) -> anyhow::Result<()> {
+ let access_level = access_level.to_string();
+ let team_id = team_id.to_string();
+
+ sqlx::query!(
+ r#"
+ INSERT INTO entity_access (
+ entity_id,
+ entity_type,
+ source_id,
+ source_type,
+ access_level
+ )
+ VALUES ($1, 'project', $2, 'team', $3::text::"AccessLevel")
+ "#,
+ project_id,
+ team_id,
+ access_level,
+ )
+ .execute(pool)
+ .await?;
+
+ Ok(())
+}
+
fn anonymous_source_ids() -> SourceIds {
SourceIds(Vec::new())
}
@@ -307,3 +337,22 @@ async fn inherited_project_access_is_preserved(pool: PgPool) -> anyhow::Result<(
assert_eq!(access, Some(AccessLevel::Edit));
Ok(())
}
+
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn direct_team_grant_without_link_share_grants_teammate_access(
+ pool: PgPool,
+) -> anyhow::Result<()> {
+ let project_id = setup_project(&pool, None).await?;
+ let team_id = Uuid::new_v4();
+ insert_user(&pool, REQUESTER).await?;
+ insert_team(&pool, team_id, OWNER).await?;
+ add_team_user(&pool, team_id, OWNER, "owner").await?;
+ add_team_user(&pool, team_id, REQUESTER, "member").await?;
+ insert_team_entity_access(&pool, project_id, team_id, AccessLevel::Edit).await?;
+
+ let access =
+ get_project_access(&pool, &project_id, &authenticated_source_ids(Some(team_id))).await?;
+
+ assert_eq!(access, Some(AccessLevel::Edit));
+ Ok(())
+}
diff --git a/crates/entity_access_db_utils/src/team_share.rs b/crates/entity_access_db_utils/src/team_share.rs
index aac797c63f..08a72b7293 100644
--- a/crates/entity_access_db_utils/src/team_share.rs
+++ b/crates/entity_access_db_utils/src/team_share.rs
@@ -4,9 +4,9 @@
//! transaction. They do not infer consent, authorize users, or commit transactions.
//! Use `share_permission_db_utils::team_share` for canonical mutations.
-use crate::{AccessLevel, EntityType};
+use crate::{AccessLevel, EntityAccessSourceType, EntityType, get_nested_project_entities};
use macro_uuid::Uuid;
-use sqlx::{PgConnection, Postgres, Transaction};
+use sqlx::{PgConnection, Postgres, QueryBuilder, Transaction};
#[cfg(test)]
mod test;
@@ -120,3 +120,73 @@ pub async fn delete_direct(
.await?;
Ok(())
}
+
+/// Bind parameters per nested `entity_access` row in the inherited-grant upsert.
+const NESTED_TEAM_GRANT_BINDS_PER_ROW: usize = 6;
+/// Nested rows per INSERT. Six binds each; stay under Postgres' 65535-parameter limit.
+const NESTED_TEAM_GRANT_CHUNK_SIZE: usize = 8_192;
+const _: () = assert!(NESTED_TEAM_GRANT_CHUNK_SIZE * NESTED_TEAM_GRANT_BINDS_PER_ROW < 65_535);
+
+/// Copy or remove this project's managed team grant on nested contents.
+///
+/// Document and chat access reads `entity_access` on the child, not the folder.
+/// Person and channel folder sharing already write `granted_from_project_id` rows.
+/// Same-team refreshes delete then rebuild so inherited rows whose entities left
+/// the tree cannot linger.
+pub async fn replace_project_contributions(
+ transaction: &mut Transaction<'_, Postgres>,
+ project_id: &Uuid,
+ previous_team_id: Option<Uuid>,
+ target: Option<(Uuid, AccessLevel)>,
+) -> Result<(), sqlx::Error> {
+ let project_id_str = project_id.to_string();
+ if let Some(previous_team_id) = previous_team_id {
+ sqlx::query!(
+ r#"DELETE FROM entity_access
+ WHERE granted_from_project_id = $1
+ AND source_type = 'team'
+ AND source_id = $2"#,
+ project_id_str,
+ previous_team_id.to_string(),
+ )
+ .execute(transaction.as_mut())
+ .await?;
+ }
+ let Some((team_id, level)) = target else {
+ return Ok(());
+ };
+ let rows: Vec<_> = get_nested_project_entities(transaction, project_id)
+ .await?
+ .into_iter()
+ .filter(|entity| !(entity.entity_type == "project" && entity.entity_id == project_id_str))
+ .filter_map(|entity| {
+ macro_uuid::string_to_uuid(&entity.entity_id)
+ .ok()
+ .map(|id| (id, entity.entity_type))
+ })
+ .collect();
+ if rows.is_empty() {
+ return Ok(());
+ }
+ let team_id_str = team_id.to_string();
+ for chunk in rows.chunks(NESTED_TEAM_GRANT_CHUNK_SIZE) {
+ let mut query = QueryBuilder::new(
+ "INSERT INTO entity_access (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id) ",
+ );
+ query.push_values(chunk, |mut row, (nested_id, nested_type)| {
+ row.push_bind(*nested_id)
+ .push_bind(nested_type)
+ .push_bind(team_id_str.clone())
+ .push_bind(EntityAccessSourceType::Team)
+ .push_bind(level)
+ .push_bind(project_id_str.clone());
+ });
+ query.push(
+ " ON CONFLICT (entity_id, entity_type, source_id, source_type, granted_from_project_id) \
+ WHERE granted_from_project_id IS NOT NULL \
+ DO UPDATE SET access_level = EXCLUDED.access_level, updated_at = NOW()",
+ );
+ query.build().execute(transaction.as_mut()).await?;
+ }
+ Ok(())
+}
diff --git a/crates/entity_access_db_utils/src/team_share/test.rs b/crates/entity_access_db_utils/src/team_share/test.rs
index f88e2ca133..d59ddfcafc 100644
--- a/crates/entity_access_db_utils/src/team_share/test.rs
+++ b/crates/entity_access_db_utils/src/team_share/test.rs
@@ -68,6 +68,79 @@ async fn guard_uses_documented_key_and_transaction_lifetime(
Ok(())
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../fixtures", scripts("team_share"))
+)]
+async fn same_team_refresh_drops_inherited_rows_outside_the_tree(
+ pool: PgPool,
+) -> Result<(), sqlx::Error> {
+ let mut tx = pool.begin().await?;
+ acquire_guard(&mut tx).await?;
+ let project_id = Uuid::from_u128(0x20000000_0000_0000_0000_000000000001);
+ let team_id = Uuid::from_u128(0x10000000_0000_0000_0000_000000000001);
+ let stale_id = Uuid::from_u128(0x20000000_0000_0000_0000_000000000099);
+ sqlx::query!(
+ r#"INSERT INTO entity_access
+ (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)
+ VALUES ($1, 'email_thread', $2, 'team', 'edit', $3)"#,
+ stale_id,
+ team_id.to_string(),
+ project_id.to_string(),
+ )
+ .execute(tx.as_mut())
+ .await?;
+
+ replace_project_contributions(
+ &mut tx,
+ &project_id,
+ Some(team_id),
+ Some((team_id, AccessLevel::View)),
+ )
+ .await?;
+
+ let inherited = sqlx::query!(
+ r#"SELECT entity_id, entity_type, access_level AS "access_level: AccessLevel"
+ FROM entity_access
+ WHERE granted_from_project_id = $1 AND source_type = 'team' AND source_id = $2
+ ORDER BY entity_type, entity_id"#,
+ project_id.to_string(),
+ team_id.to_string(),
+ )
+ .fetch_all(tx.as_mut())
+ .await?;
+ assert!(
+ inherited
+ .iter()
+ .all(|row| row.entity_id != stale_id && row.access_level == AccessLevel::View)
+ );
+ assert_eq!(
+ inherited
+ .iter()
+ .map(|row| (row.entity_id, row.entity_type.as_str()))
+ .collect::<Vec<_>>(),
+ vec![
+ (
+ Uuid::from_u128(0x20000000_0000_0000_0000_000000000004),
+ "chat"
+ ),
+ (
+ Uuid::from_u128(0x20000000_0000_0000_0000_000000000002),
+ "document"
+ ),
+ (
+ Uuid::from_u128(0x20000000_0000_0000_0000_000000000005),
+ "email_thread"
+ ),
+ (
+ Uuid::from_u128(0x20000000_0000_0000_0000_000000000003),
+ "project"
+ ),
+ ]
+ );
+ Ok(())
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn guard_rejects_stale_snapshot_isolation(pool: PgPool) -> Result<(), sqlx::Error> {
let mut tx = pool.begin().await?;
diff --git a/crates/projects/src/domain/entity_mutation.rs b/crates/projects/src/domain/entity_mutation.rs
index f4435aed83..3af550170c 100644
--- a/crates/projects/src/domain/entity_mutation.rs
+++ b/crates/projects/src/domain/entity_mutation.rs
@@ -35,7 +35,9 @@ impl From<ProjectError> for EntityMutationErrorCode {
error @ (ProjectError::BadRequest(_)
| ProjectError::NameTooLong { .. }
| ProjectError::RecursiveNesting) => Self::invalid(rootcause::report!(error)),
- error @ ProjectError::CannotModifyDeleted => Self::conflict(rootcause::report!(error)),
+ error @ (ProjectError::Conflict(_) | ProjectError::CannotModifyDeleted) => {
+ Self::conflict(rootcause::report!(error))
+ }
error @ ProjectError::Internal(_) => Self::internal(rootcause::report!(error)),
}
}
diff --git a/crates/projects/src/domain/models.rs b/crates/projects/src/domain/models.rs
index ef7e99ac89..1eebf1552b 100644
--- a/crates/projects/src/domain/models.rs
+++ b/crates/projects/src/domain/models.rs
@@ -3,6 +3,7 @@
use macro_user_id::user_id::MacroUserIdStr;
use model::folder::FileSystemNode;
use model::project::Project;
+use models_permissions::share_permission::team_share::AuthorizedTeamShareCommand;
use models_permissions::share_permission::{SharePermissionV2, UpdateSharePermissionRequestV2};
/// Arguments for atomically creating a project and its access metadata.
@@ -31,6 +32,10 @@ pub struct EditProjectArgs {
pub parent_id: Option<String>,
/// Optional sharing changes.
pub share_permission: Option<UpdateSharePermissionRequestV2>,
+ /// Owner-authorized command for an explicit `teamShareAccessLevel`; the
+ /// repository applies it atomically with the rest of the edit and rejects
+ /// a team level that arrives without one.
+ pub team_share: Option<AuthorizedTeamShareCommand>,
}
/// Identifiers affected by a recursive soft deletion.
@@ -129,6 +134,10 @@ pub enum ProjectError {
/// A soft-deleted project cannot be modified.
#[error("cannot modify deleted project")]
CannotModifyDeleted,
+ /// The requested change conflicts with the persisted state (for example a
+ /// stale team-share revision); the caller should reload and retry.
+ #[error("conflict: {0}")]
+ Conflict(String),
/// The requested parent would recursively nest the project.
#[error("project is recursively nested")]
RecursiveNesting,
diff --git a/crates/projects/src/domain/ports.rs b/crates/projects/src/domain/ports.rs
index 4b00a2f7d5..c20c6cbab6 100644
--- a/crates/projects/src/domain/ports.rs
+++ b/crates/projects/src/domain/ports.rs
@@ -23,6 +23,7 @@ use models_bulk_upload::{
UploadExtractFolderResponseData,
};
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::team_share::TeamShareFacts;
use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
use s3_key::BulkUploadStagingKey;
use uuid::Uuid;
@@ -77,6 +78,13 @@ pub trait ProjectRepo: Send + Sync + 'static {
project_id: &str,
) -> impl Future<Output = Result<SharePermissionV2, Self::Err>> + Send;
+ /// Load the canonical team-share facts (persisted owner, owner's team,
+ /// current explicit grant, revision) the owner policy authorizes against.
+ fn get_team_share_facts(
+ &self,
+ project_id: &str,
+ ) -> impl Future<Output = Result<TeamShareFacts, ProjectError>> + Send;
+
/// Get previews for the supplied project identifiers.
fn batch_get_project_preview(
&self,
@@ -100,7 +108,7 @@ pub trait ProjectRepo: Send + Sync + 'static {
fn edit_project(
&self,
args: EditProjectArgs,
- ) -> impl Future<Output = Result<MutatedProject, Self::Err>> + Send;
+ ) -> impl Future<Output = Result<MutatedProject, ProjectError>> + Send;
/// Return whether the proposed parent is inside the project's subtree.
fn is_project_recursively_nested(
diff --git a/crates/projects/src/domain/service.rs b/crates/projects/src/domain/service.rs
index 8d23c17067..b5f7107d52 100644
--- a/crates/projects/src/domain/service.rs
+++ b/crates/projects/src/domain/service.rs
@@ -21,6 +21,10 @@ use model::project::{
use models_bulk_upload::{UploadExtractFolderRequest, UploadExtractFolderResponseData};
use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::team_share::{
+ AuthorizedTeamShareCommand, TeamShareLevel, TeamSharePolicyError, TeamShareRequest,
+ authorize_team_share,
+};
use s3_key::BulkUploadStagingKey;
use unicode_segmentation::UnicodeSegmentation;
use uuid::Uuid;
@@ -142,6 +146,37 @@ where
);
});
}
+
+ async fn authorize_project_team_share(
+ &self,
+ receipt: &EntityAccessReceipt<EditAccessLevel>,
+ request: TeamShareRequest,
+ ) -> Result<Option<AuthorizedTeamShareCommand>, ProjectError> {
+ if request == TeamShareRequest::default() {
+ return Ok(None);
+ }
+ let facts = self
+ .repo
+ .get_team_share_facts(&receipt.entity().entity_id)
+ .await?;
+ authorize_team_share(
+ receipt.acting_user_id(),
+ &facts,
+ request,
+ TeamShareLevel::Edit,
+ )
+ .map_err(|error| match error {
+ TeamSharePolicyError::MissingActor | TeamSharePolicyError::NotOwner => {
+ ProjectError::Unauthorized
+ }
+ TeamSharePolicyError::InvalidRevision => ProjectError::Conflict(error.to_string()),
+ TeamSharePolicyError::MissingTeam
+ | TeamSharePolicyError::InvalidLevel
+ | TeamSharePolicyError::ContradictoryInputs => {
+ ProjectError::BadRequest(error.to_string())
+ }
+ })
+ }
}
impl<R, U, D, Sha, Eam, Idx, B> ProjectService for ProjectServiceImpl<R, U, D, Sha, Eam, Idx, B>
@@ -398,6 +433,19 @@ where
));
}
+ let team_share = self
+ .authorize_project_team_share(
+ &receipt,
+ TeamShareRequest {
+ access_level: args
+ .share_permission
+ .as_ref()
+ .and_then(|p| p.team_share_access_level),
+ legacy_enabled: None,
+ },
+ )
+ .await?;
+
let new_parent_id = args
.project_parent_id
.as_deref()
@@ -438,9 +486,9 @@ where
update_parent: args.project_parent_id.is_some(),
parent_id: new_parent_id.map(str::to_string),
share_permission: args.share_permission,
+ team_share,
})
- .await
- .map_err(|error| internal_error(error, "unable to patch project"))?;
+ .await?;
self.bump_project_modified(&project.id).await;
let _ = self
diff --git a/crates/projects/src/domain/service/tests.rs b/crates/projects/src/domain/service/tests.rs
index 4e291b99bc..bb8ca9c1da 100644
--- a/crates/projects/src/domain/service/tests.rs
+++ b/crates/projects/src/domain/service/tests.rs
@@ -916,6 +916,7 @@ async fn edit_project_publishes_requested_update_metadata() {
for case in cases {
let project_id = Uuid::new_v4();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts().times(0);
if case
.requested_parent
.as_deref()
@@ -1080,7 +1081,7 @@ async fn edit_project_failures_publish_no_event() {
repo.expect_is_project_recursively_nested()
.return_once(|_, _| Box::pin(async { Ok(true) }));
repo.expect_edit_project()
- .return_once(|_| Box::pin(async { Err(anyhow::anyhow!("database unavailable")) }));
+ .return_once(|_| Box::pin(async { Err(anyhow::anyhow!("database unavailable").into()) }));
let event_broker = TestEventBroker::default();
let published = event_broker.published();
let service = mutation_service_with_event_broker(
@@ -1137,6 +1138,7 @@ async fn edit_project_failures_publish_no_event() {
async fn edit_project_succeeds_when_event_publication_fails() {
let project_id = Uuid::new_v4();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts().times(0);
repo.expect_edit_project().return_once(move |_| {
Box::pin(async move {
Ok(project(
@@ -1183,6 +1185,7 @@ async fn owner_edit_propagates_move_and_updates_all_modified_timestamps() {
args.project_id == project_id.to_string()
&& args.update_parent
&& args.parent_id.as_deref() == Some(new_parent_id.to_string().as_str())
+ && args.team_share.is_none()
})
.return_once(move |_| {
Box::pin(async move {
@@ -1236,7 +1239,7 @@ async fn empty_parent_clears_persistence_and_eam_parent_argument() {
let old_parent_id = Uuid::new_v4();
let mut repo = MockProjectRepo::new();
repo.expect_edit_project()
- .withf(|args| args.update_parent && args.parent_id.is_none())
+ .withf(|args| args.update_parent && args.parent_id.is_none() && args.team_share.is_none())
.return_once(move |_| {
Box::pin(async move {
Ok(project(
@@ -1272,6 +1275,7 @@ async fn empty_parent_clears_persistence_and_eam_parent_argument() {
async fn edit_name_limit_counts_unicode_graphemes() {
let project_id = Uuid::new_v4();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts().times(0);
repo.expect_edit_project().return_once(move |_| {
Box::pin(async move {
Ok(project(
@@ -2244,3 +2248,296 @@ async fn upload_extract_uses_fixed_request_id() {
assert_eq!(response.request_id, fixed_id.to_string());
assert_eq!(*request_ids.lock().unwrap(), vec![fixed_id]);
}
+
+use models_permissions::share_permission::team_share::{TeamShareFacts, TeamShareLevel};
+
+const OTHER_USER: &str = "macro|[email protected]";
+const TEAM_ID: Uuid = Uuid::from_u128(0xb2222222_2222_2222_2222_222222222222);
+
+fn owner_user() -> MacroUserIdStr<'static> {
+ user_id("macro|[email protected]")
+}
+
+fn team_share_facts(
+ project_id: Uuid,
+ owner: MacroUserIdStr<'static>,
+ owner_team_id: Option<Uuid>,
+ revision: i64,
+) -> TeamShareFacts {
+ TeamShareFacts {
+ entity: EntityType::Project.with_entity_string(project_id.to_string()),
+ owner,
+ owner_team_id,
+ current: None,
+ revision,
+ }
+}
+
+fn team_share_args(level: Option<AccessLevel>) -> PatchProjectRequestV2 {
+ PatchProjectRequestV2 {
+ name: None,
+ project_parent_id: None,
+ share_permission: Some(UpdateSharePermissionRequestV2 {
+ link_share: None,
+ link_share_access_level: None,
+ team_share_access_level: Some(level),
+ channel_share_permissions: None,
+ }),
+ }
+}
+
+#[tokio::test]
+async fn edit_without_team_share_field_does_not_load_facts_or_send_command() {
+ let project_id = Uuid::new_v4();
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts().times(0);
+ repo.expect_edit_project()
+ .withf(|args| args.team_share.is_none())
+ .return_once(move |_| {
+ Box::pin(async move {
+ Ok(project(
+ &project_id.to_string(),
+ None,
+ ))
+ })
+ });
+ repo.expect_update_project_modified()
+ .return_once(|_| Box::pin(async { Ok(()) }));
+ let event_broker = TestEventBroker::default();
+ let published = event_broker.published();
+ let service = mutation_service_with_event_broker(
+ repo,
+ RecordingEam::default(),
+ RecordingIndexer::default(),
+ event_broker,
+ );
+ let mut request = patch_request(None, None);
+ request.name = Some("Renamed".to_string());
+
+ service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ request,
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(published.lock().unwrap().len(), 1);
+}
+
+#[tokio::test]
+async fn edit_with_team_share_level_forwards_authorized_command() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), Some(TEAM_ID), 0);
+ let expected_facts = facts.clone();
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .withf(move |id| id == project_id.to_string())
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project()
+ .withf(move |args| {
+ let Some(command) = args.team_share.as_ref() else {
+ return false;
+ };
+ command.expected() == &expected_facts
+ && command.target().is_some_and(|grant| {
+ grant.team_id == TEAM_ID && grant.level == TeamShareLevel::Edit
+ })
+ && command.next_revision() == 1
+ })
+ .return_once(move |_| {
+ Box::pin(async move {
+ Ok(project(
+ &project_id.to_string(),
+ None,
+ ))
+ })
+ });
+ repo.expect_update_project_modified()
+ .return_once(|_| Box::pin(async { Ok(()) }));
+ let event_broker = TestEventBroker::default();
+ let published = event_broker.published();
+ let service = mutation_service_with_event_broker(
+ repo,
+ RecordingEam::default(),
+ RecordingIndexer::default(),
+ event_broker,
+ );
+
+ service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::Edit)),
+ )
+ .await
+ .unwrap();
+
+ let published = published.lock().unwrap();
+ assert_eq!(published.len(), 1);
+ assert_eq!(
+ published[0].payload["metadata"]["share_permission_updated"],
+ true
+ );
+}
+
+#[tokio::test]
+async fn edit_with_team_share_null_forwards_clear_command() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), Some(TEAM_ID), 0);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project()
+ .withf(|args| {
+ args.team_share
+ .as_ref()
+ .is_some_and(|command| command.target().is_none() && command.next_revision() == 1)
+ })
+ .return_once(move |_| {
+ Box::pin(async move {
+ Ok(project(
+ &project_id.to_string(),
+ None,
+ ))
+ })
+ });
+ repo.expect_update_project_modified()
+ .return_once(|_| Box::pin(async { Ok(()) }));
+ let service = mutation_service(repo, RecordingEam::default(), RecordingIndexer::default());
+
+ service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(None),
+ )
+ .await
+ .unwrap();
+}
+
+#[tokio::test]
+async fn edit_team_share_by_non_owner_returns_unauthorized_and_publishes_nothing() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, user_id(OTHER_USER), Some(TEAM_ID), 0);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project().times(0);
+ let event_broker = TestEventBroker::default();
+ let published = event_broker.published();
+ let service = mutation_service_with_event_broker(
+ repo,
+ RecordingEam::default(),
+ RecordingIndexer::default(),
+ event_broker,
+ );
+
+ let result = service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::View)),
+ )
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::Unauthorized)));
+ assert!(published.lock().unwrap().is_empty());
+}
+
+#[tokio::test]
+async fn edit_team_share_owner_level_returns_bad_request() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), Some(TEAM_ID), 0);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project().times(0);
+ let service = mutation_service(repo, RecordingEam::default(), RecordingIndexer::default());
+
+ let result = service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::Owner)),
+ )
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::BadRequest(_))));
+}
+
+#[tokio::test]
+async fn edit_team_share_without_owner_team_returns_bad_request() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), None, 0);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project().times(0);
+ let service = mutation_service(repo, RecordingEam::default(), RecordingIndexer::default());
+
+ let result = service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::Edit)),
+ )
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::BadRequest(_))));
+}
+
+#[tokio::test]
+async fn edit_team_share_exhausted_revision_returns_conflict() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), Some(TEAM_ID), i64::MAX);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project().times(0);
+ let service = mutation_service(repo, RecordingEam::default(), RecordingIndexer::default());
+
+ let result = service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::Edit)),
+ )
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::Conflict(_))));
+}
+
+#[tokio::test]
+async fn edit_repo_conflict_does_not_publish_event() {
+ let project_id = Uuid::new_v4();
+ let facts = team_share_facts(project_id, owner_user(), Some(TEAM_ID), 0);
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_share_facts()
+ .return_once(move |_| Box::pin(async move { Ok(facts) }));
+ repo.expect_edit_project()
+ .return_once(|_| Box::pin(async { Err(ProjectError::Conflict("stale".into())) }));
+ let event_broker = TestEventBroker::default();
+ let published = event_broker.published();
+ let service = mutation_service_with_event_broker(
+ repo,
+ RecordingEam::default(),
+ RecordingIndexer::default(),
+ event_broker,
+ );
+
+ let result = service
+ .edit_project(
+ mutation_receipt::<EditAccessLevel>(project_id, AccessLevel::Owner),
+ basic_project(project_id, None, false),
+ team_share_args(Some(AccessLevel::Edit)),
+ )
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::Conflict(_))));
+ assert!(published.lock().unwrap().is_empty());
+}
diff --git a/crates/projects/src/inbound/axum_router.rs b/crates/projects/src/inbound/axum_router.rs
index 26ea35a49e..800d031fa4 100644
--- a/crates/projects/src/inbound/axum_router.rs
+++ b/crates/projects/src/inbound/axum_router.rs
@@ -89,6 +89,7 @@ impl IntoResponse for ProjectError {
| Self::NameTooLong { .. }
| Self::CannotModifyDeleted
| Self::RecursiveNesting => StatusCode::BAD_REQUEST,
+ Self::Conflict(_) => StatusCode::CONFLICT,
Self::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
};
diff --git a/crates/projects/src/inbound/axum_router/tests.rs b/crates/projects/src/inbound/axum_router/tests.rs
index 17648f4e25..178d86a978 100644
--- a/crates/projects/src/inbound/axum_router/tests.rs
+++ b/crates/projects/src/inbound/axum_router/tests.rs
@@ -8,6 +8,7 @@ use axum::{
Router,
body::Body,
http::{Request, StatusCode},
+ response::IntoResponse,
};
use entity_access::domain::{
models::{
@@ -914,3 +915,9 @@ async fn mark_uploaded_preserves_exact_lambda_request_and_response_json() {
json!({ "projectIds": [PROJECT_ID, "project-child"] })
);
}
+
+#[test]
+fn project_error_conflict_maps_to_409() {
+ let response = ProjectError::Conflict("stale".into()).into_response();
+ assert_eq!(response.status(), StatusCode::CONFLICT);
+}
diff --git a/crates/projects/src/outbound/pg_project_repo.rs b/crates/projects/src/outbound/pg_project_repo.rs
index c921b8aaec..95664bae16 100644
--- a/crates/projects/src/outbound/pg_project_repo.rs
+++ b/crates/projects/src/outbound/pg_project_repo.rs
@@ -6,6 +6,7 @@ mod delete;
mod edit;
mod revert_delete;
mod share;
+mod team_share;
mod upload_folder;
#[cfg(test)]
@@ -21,8 +22,8 @@ use model::project::{
use sqlx::PgPool;
use crate::domain::models::{
- CreateProjectArgs, EditProjectArgs, MarkedUploadedTree, PurgedProjectTree, RevertDeleteResult,
- SoftDeleteResult, UploadFolderRepoArgs,
+ CreateProjectArgs, EditProjectArgs, MarkedUploadedTree, ProjectError, PurgedProjectTree,
+ RevertDeleteResult, SoftDeleteResult, UploadFolderRepoArgs,
};
use crate::domain::ports::ProjectRepo;
@@ -185,6 +186,15 @@ impl ProjectRepo for PgProjectRepo {
share::get_project_share_permission(&self.pool, project_id).await
}
+ #[tracing::instrument(err, skip(self))]
+ async fn get_team_share_facts(
+ &self,
+ project_id: &str,
+ ) -> Result<models_permissions::share_permission::team_share::TeamShareFacts, ProjectError>
+ {
+ team_share::get_team_share_facts(&self.pool, project_id).await
+ }
+
#[tracing::instrument(err, skip(self, project_ids))]
async fn batch_get_project_preview(
&self,
@@ -253,8 +263,17 @@ impl ProjectRepo for PgProjectRepo {
}
#[tracing::instrument(err, skip(self, args))]
- async fn edit_project(&self, args: EditProjectArgs) -> Result<Project, Self::Err> {
+ async fn edit_project(&self, args: EditProjectArgs) -> Result<Project, ProjectError> {
let mut transaction = self.pool.begin().await?;
+ // Canonical team sharing first: it takes the shared guard before any
+ // `SharePermission` row lock and refuses an unauthorized team level.
+ team_share::apply_team_share(
+ &mut transaction,
+ &args.project_id,
+ args.share_permission.as_ref(),
+ args.team_share.as_ref(),
+ )
+ .await?;
let project = edit::edit_project(&mut transaction, &args).await?;
transaction.commit().await?;
Ok(project)
diff --git a/crates/projects/src/outbound/pg_project_repo/fixtures/team.sql b/crates/projects/src/outbound/pg_project_repo/fixtures/team.sql
new file mode 100644
index 0000000000..188557ce9e
--- /dev/null
+++ b/crates/projects/src/outbound/pg_project_repo/fixtures/team.sql
@@ -0,0 +1,5 @@
+INSERT INTO public.team ("id", "name", "owner_id", "seat_count")
+VALUES ('b2222222-2222-2222-2222-222222222222', 'Test Team', 'macro|[email protected]', 2);
+
+INSERT INTO public.team_user ("team_id", "user_id", "team_role")
+VALUES ('b2222222-2222-2222-2222-222222222222', 'macro|[email protected]', 'owner');
diff --git a/crates/projects/src/outbound/pg_project_repo/fixtures/users.sql b/crates/projects/src/outbound/pg_project_repo/fixtures/users.sql
new file mode 100644
index 0000000000..830de09a64
--- /dev/null
+++ b/crates/projects/src/outbound/pg_project_repo/fixtures/users.sql
@@ -0,0 +1,8 @@
+INSERT INTO public."Organization" ("id","name")
+(SELECT 1, 'organization-one');
+
+INSERT INTO public."macro_user" ("id", "username", "email", "stripe_customer_id")
+(SELECT 'a1111111-1111-1111-1111-111111111111', '[email protected]', '[email protected]', 'stripe_test');
+
+INSERT INTO public."User" ("id","email","stripeCustomerId","macro_user_id")
+(SELECT 'macro|[email protected]', '[email protected]','stripe_test','a1111111-1111-1111-1111-111111111111');
diff --git a/crates/projects/src/outbound/pg_project_repo/share.rs b/crates/projects/src/outbound/pg_project_repo/share.rs
index e6ed42899d..240418ec16 100644
--- a/crates/projects/src/outbound/pg_project_repo/share.rs
+++ b/crates/projects/src/outbound/pg_project_repo/share.rs
@@ -35,6 +35,7 @@ pub(super) async fn get_project_share_permission(
permission.id,
permission."linkShare" AS "link_share?",
permission."linkShareAccessLevel" AS "link_share_access_level?: AccessLevel",
+ permission.team_share_access_level AS "team_share_access_level?: AccessLevel",
project."userId" AS owner,
COALESCE(
json_agg(json_build_object(
@@ -73,7 +74,7 @@ pub(super) async fn get_project_share_permission(
id: row.id,
link_share,
link_share_access_level: row.link_share_access_level,
- team_share_access_level: None,
+ team_share_access_level: row.team_share_access_level,
owner: row.owner,
channel_share_permissions,
})
diff --git a/crates/projects/src/outbound/pg_project_repo/team_share.rs b/crates/projects/src/outbound/pg_project_repo/team_share.rs
new file mode 100644
index 0000000000..98df89d640
--- /dev/null
+++ b/crates/projects/src/outbound/pg_project_repo/team_share.rs
@@ -0,0 +1,76 @@
+#[cfg(test)]
+mod test;
+
+use model_entity::{Entity, EntityType};
+use models_permissions::share_permission::UpdateSharePermissionRequestV2;
+use models_permissions::share_permission::team_share::{
+ AuthorizedTeamShareCommand, TeamShareFacts,
+};
+use share_permission_db_utils::team_share::{self, TeamShareError};
+use sqlx::{PgPool, Postgres, Transaction};
+
+use crate::domain::models::ProjectError;
+
+impl From<sqlx::Error> for ProjectError {
+ fn from(error: sqlx::Error) -> Self {
+ Self::Internal(error.into())
+ }
+}
+
+pub(super) fn map_team_share_error(error: rootcause::Report<TeamShareError>) -> ProjectError {
+ match error.current_context() {
+ TeamShareError::NotFound => ProjectError::NotFound("team-share project".to_string()),
+ TeamShareError::ChangedFacts | TeamShareError::UntrackedGrant => {
+ ProjectError::Conflict(error.to_string())
+ }
+ TeamShareError::InvalidAdoption
+ | TeamShareError::InvalidEntity
+ | TeamShareError::InvalidState
+ | TeamShareError::Infrastructure => ProjectError::Internal(error.into()),
+ }
+}
+
+fn project_entity(project_id: &str) -> Entity<'_> {
+ EntityType::Project.with_entity_str(project_id)
+}
+
+#[tracing::instrument(err, skip(pool))]
+pub(super) async fn get_team_share_facts(
+ pool: &PgPool,
+ project_id: &str,
+) -> Result<TeamShareFacts, ProjectError> {
+ let mut transaction = pool.begin().await?;
+ let facts = team_share::load_facts(&mut transaction, &project_entity(project_id))
+ .await
+ .map_err(map_team_share_error)?;
+ transaction.commit().await?;
+ Ok(facts)
+}
+
+#[tracing::instrument(err, skip(transaction, share_permission, team_share))]
+pub(super) async fn apply_team_share(
+ transaction: &mut Transaction<'_, Postgres>,
+ project_id: &str,
+ share_permission: Option<&UpdateSharePermissionRequestV2>,
+ team_share: Option<&AuthorizedTeamShareCommand>,
+) -> Result<(), ProjectError> {
+ let requested_level = share_permission.and_then(|p| p.team_share_access_level);
+ match team_share {
+ Some(command) => {
+ let expected = &command.expected().entity;
+ if expected.entity_type != EntityType::Project
+ || expected.entity_id != project_id
+ || requested_level != Some(command.target().map(|grant| grant.level.into()))
+ {
+ return Err(ProjectError::BadRequest(
+ "team-share command does not match patch".to_string(),
+ ));
+ }
+ team_share::apply(transaction, command)
+ .await
+ .map_err(map_team_share_error)
+ }
+ None if requested_level.is_some() => Err(ProjectError::Unauthorized),
+ None => Ok(()),
+ }
+}
diff --git a/crates/projects/src/outbound/pg_project_repo/team_share/test.rs b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
new file mode 100644
index 0000000000..8627fff3d1
--- /dev/null
+++ b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
@@ -0,0 +1,497 @@
+use macro_db_migrator::MACRO_DB_MIGRATIONS;
+use model_entity::EntityType;
+use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::team_share::{
+ AuthorizedTeamShareCommand, TeamShareFacts, TeamShareLevel, TeamShareRequest,
+ authorize_team_share,
+};
+use models_permissions::share_permission::{
+ LinkShare, SharePermissionV2, UpdateSharePermissionRequestV2,
+};
+use sqlx::{PgPool, Pool, Postgres};
+use uuid::Uuid;
+
+use crate::domain::models::{CreateProjectArgs, EditProjectArgs, ProjectError};
+use crate::domain::ports::ProjectRepo;
+use crate::outbound::pg_project_repo::PgProjectRepo;
+
+const OWNER: &str = "macro|[email protected]";
+const TEAM_ID: Uuid = Uuid::from_u128(0xb2222222_2222_2222_2222_222222222222);
+
+async fn create_project(repo: &PgProjectRepo, name: &str) -> String {
+ repo.create_project(CreateProjectArgs {
+ user_id: OWNER.to_owned(),
+ name: name.to_string(),
+ parent_id: None,
+ share_permission: SharePermissionV2::new_project_share_permission(None),
+ })
+ .await
+ .unwrap()
+ .id
+}
+
+fn team_share_request(level: Option<AccessLevel>) -> UpdateSharePermissionRequestV2 {
+ UpdateSharePermissionRequestV2 {
+ link_share: None,
+ link_share_access_level: None,
+ team_share_access_level: Some(level),
+ channel_share_permissions: None,
+ }
+}
+
+fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {
+ authorize_team_share(
+ Some(&facts.owner),
+ facts,
+ TeamShareRequest {
+ access_level: Some(level),
+ legacy_enabled: None,
+ },
+ TeamShareLevel::Edit,
+ )
+ .unwrap()
+ .unwrap()
+}
+
+async fn edit_team_share(
+ repo: &PgProjectRepo,
+ project_id: &str,
+ level: Option<AccessLevel>,
+) -> Result<(), ProjectError> {
+ let facts = repo.get_team_share_facts(project_id).await?;
+ repo.edit_project(EditProjectArgs {
+ project_id: project_id.to_string(),
+ name: None,
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(team_share_request(level)),
+ team_share: Some(command(&facts, level)),
+ })
+ .await
+ .map(|_| ())
+}
+
+#[derive(Debug, PartialEq, Eq)]
+struct StoredTeamShare {
+ level: Option<String>,
+ team_id: Option<Uuid>,
+ revision: i64,
+}
+
+async fn stored_team_share(pool: &Pool<Postgres>, project_id: &str) -> StoredTeamShare {
+ let row = sqlx::query!(
+ r#"
+ SELECT
+ sp.team_share_access_level::text AS "level?",
+ sp.team_share_team_id AS "team_id?",
+ sp.team_share_revision AS revision
+ FROM "ProjectPermission" pp
+ JOIN "SharePermission" sp ON pp."sharePermissionId" = sp.id
+ WHERE pp."projectId" = $1
+ "#,
+ project_id,
+ )
+ .fetch_one(pool)
+ .await
+ .unwrap();
+ StoredTeamShare {
+ level: row.level,
+ team_id: row.team_id,
+ revision: row.revision,
+ }
+}
+
+async fn inherited_team_rows(
+ pool: &Pool<Postgres>,
+ project_id: &str,
+) -> Vec<(Uuid, String, AccessLevel)> {
+ sqlx::query!(
+ r#"
+ SELECT entity_id, entity_type, access_level AS "access_level: AccessLevel"
+ FROM entity_access
+ WHERE granted_from_project_id = $1 AND source_type = 'team'
+ ORDER BY entity_id
+ "#,
+ project_id,
+ )
+ .fetch_all(pool)
+ .await
+ .unwrap()
+ .into_iter()
+ .map(|row| (row.entity_id, row.entity_type, row.access_level))
+ .collect()
+}
+
+async fn insert_folder_document(pool: &Pool<Postgres>, project_id: &str, document_id: Uuid) {
+ sqlx::query!(
+ r#"INSERT INTO "Document" (id, name, owner, "projectId")
+ VALUES ($1, 'Nested', $2, $3)"#,
+ document_id.to_string(),
+ OWNER,
+ project_id,
+ )
+ .execute(pool)
+ .await
+ .unwrap();
+}
+
+async fn direct_team_rows(pool: &Pool<Postgres>, project_id: &str) -> Vec<AccessLevel> {
+ sqlx::query_scalar!(
+ r#"
+ SELECT access_level AS "access_level: AccessLevel"
+ FROM entity_access
+ WHERE entity_id = $1 AND entity_type = 'project' AND source_type = 'team'
+ AND granted_from_project_id IS NULL
+ ORDER BY access_level
+ "#,
+ Uuid::parse_str(project_id).unwrap(),
+ )
+ .fetch_all(pool)
+ .await
+ .unwrap()
+}
+
+fn unshared() -> StoredTeamShare {
+ StoredTeamShare {
+ level: None,
+ team_id: None,
+ revision: 0,
+ }
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn get_team_share_facts_reads_owner_team_and_null_state(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Facts").await;
+
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+
+ assert_eq!(facts.entity.entity_type, EntityType::Project);
+ assert_eq!(facts.entity.entity_id, project_id);
+ assert_eq!(facts.owner.as_ref(), OWNER);
+ assert_eq!(facts.owner_team_id, Some(TEAM_ID));
+ assert_eq!(facts.current, None);
+ assert_eq!(facts.revision, 0);
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users"))
+)]
+async fn get_team_share_facts_without_team_has_no_owner_team(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "No team").await;
+
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+
+ assert_eq!(facts.owner_team_id, None);
+ assert_eq!(facts.current, None);
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_applies_team_share_command_and_inserts_direct_team_entity_access(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Shared").await;
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::Edit))
+ .await
+ .unwrap();
+ assert_eq!(
+ stored_team_share(&pool, &project_id).await,
+ StoredTeamShare {
+ level: Some("edit".to_string()),
+ team_id: Some(TEAM_ID),
+ revision: 1,
+ }
+ );
+ assert_eq!(
+ direct_team_rows(&pool, &project_id).await,
+ [AccessLevel::Edit]
+ );
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::View))
+ .await
+ .unwrap();
+ assert_eq!(
+ stored_team_share(&pool, &project_id).await,
+ StoredTeamShare {
+ level: Some("view".to_string()),
+ team_id: Some(TEAM_ID),
+ revision: 2,
+ }
+ );
+ assert_eq!(
+ direct_team_rows(&pool, &project_id).await,
+ [AccessLevel::View]
+ );
+
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+ assert_eq!(
+ facts.current.map(|grant| (grant.team_id, grant.level)),
+ Some((TEAM_ID, TeamShareLevel::View))
+ );
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_team_share_copies_and_clears_nested_document_grants(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Folder").await;
+ let document_id = Uuid::from_u128(0xc3333333_3333_3333_3333_333333333333);
+ insert_folder_document(&pool, &project_id, document_id).await;
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::Edit))
+ .await
+ .unwrap();
+ assert_eq!(
+ inherited_team_rows(&pool, &project_id).await,
+ [(document_id, "document".to_string(), AccessLevel::Edit)]
+ );
+
+ let stale_id = Uuid::from_u128(0xc5555555_5555_5555_5555_555555555555);
+ sqlx::query!(
+ r#"INSERT INTO entity_access
+ (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)
+ VALUES ($1, 'email_thread', $2, 'team', 'edit', $3)"#,
+ stale_id,
+ TEAM_ID.to_string(),
+ project_id,
+ )
+ .execute(&pool)
+ .await
+ .unwrap();
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::View))
+ .await
+ .unwrap();
+ assert_eq!(
+ inherited_team_rows(&pool, &project_id).await,
+ [(document_id, "document".to_string(), AccessLevel::View)]
+ );
+
+ let later_id = Uuid::from_u128(0xc4444444_4444_4444_4444_444444444444);
+ insert_folder_document(&pool, &project_id, later_id).await;
+ sqlx::query!(
+ r#"INSERT INTO entity_access
+ (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)
+ VALUES ($1, 'document', $2, 'team', 'view', $3)"#,
+ later_id,
+ TEAM_ID.to_string(),
+ project_id,
+ )
+ .execute(&pool)
+ .await
+ .unwrap();
+
+ edit_team_share(&repo, &project_id, None).await.unwrap();
+ assert!(inherited_team_rows(&pool, &project_id).await.is_empty());
+ assert!(direct_team_rows(&pool, &project_id).await.is_empty());
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_clear_command_removes_managed_team_entity_access_and_bumps_revision(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Cleared").await;
+ edit_team_share(&repo, &project_id, Some(AccessLevel::Comment))
+ .await
+ .unwrap();
+
+ edit_team_share(&repo, &project_id, None).await.unwrap();
+
+ assert_eq!(
+ stored_team_share(&pool, &project_id).await,
+ StoredTeamShare {
+ level: None,
+ team_id: None,
+ revision: 2,
+ }
+ );
+ assert!(direct_team_rows(&pool, &project_id).await.is_empty());
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_with_team_level_but_no_command_returns_unauthorized(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Original").await;
+
+ let result = repo
+ .edit_project(EditProjectArgs {
+ project_id: project_id.clone(),
+ name: Some("Renamed".to_string()),
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(team_share_request(Some(AccessLevel::Edit))),
+ team_share: None,
+ })
+ .await;
+
+ assert!(matches!(result, Err(ProjectError::Unauthorized)));
+ assert_eq!(stored_team_share(&pool, &project_id).await, unshared());
+ assert!(direct_team_rows(&pool, &project_id).await.is_empty());
+ assert_eq!(
+ repo.get_project_by_id(&project_id)
+ .await
+ .unwrap()
+ .unwrap()
+ .name,
+ "Original"
+ );
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_rejects_command_for_other_project_or_mismatched_level(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Target").await;
+ let other_project_id = create_project(&repo, "Other").await;
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+ let other_facts = repo.get_team_share_facts(&other_project_id).await.unwrap();
+
+ let wrong_project = repo
+ .edit_project(EditProjectArgs {
+ project_id: project_id.clone(),
+ name: None,
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(team_share_request(Some(AccessLevel::Edit))),
+ team_share: Some(command(&other_facts, Some(AccessLevel::Edit))),
+ })
+ .await;
+ assert!(matches!(wrong_project, Err(ProjectError::BadRequest(_))));
+
+ let wrong_level = repo
+ .edit_project(EditProjectArgs {
+ project_id: project_id.clone(),
+ name: None,
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(team_share_request(Some(AccessLevel::View))),
+ team_share: Some(command(&facts, Some(AccessLevel::Edit))),
+ })
+ .await;
+ assert!(matches!(wrong_level, Err(ProjectError::BadRequest(_))));
+
+ assert_eq!(stored_team_share(&pool, &project_id).await, unshared());
+ assert_eq!(
+ stored_team_share(&pool, &other_project_id).await,
+ unshared()
+ );
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_stale_command_returns_conflict(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Stale").await;
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+ let stale = command(&facts, Some(AccessLevel::Edit));
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::Edit))
+ .await
+ .unwrap();
+
+ let replay = repo
+ .edit_project(EditProjectArgs {
+ project_id: project_id.clone(),
+ name: None,
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(team_share_request(Some(AccessLevel::Edit))),
+ team_share: Some(stale),
+ })
+ .await;
+
+ assert!(matches!(replay, Err(ProjectError::Conflict(_))));
+ assert_eq!(stored_team_share(&pool, &project_id).await.revision, 1);
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn edit_team_share_and_link_share_in_one_call_persists_both(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Both").await;
+ let facts = repo.get_team_share_facts(&project_id).await.unwrap();
+
+ repo.edit_project(EditProjectArgs {
+ project_id: project_id.clone(),
+ name: Some("Renamed".to_string()),
+ update_parent: false,
+ parent_id: None,
+ share_permission: Some(UpdateSharePermissionRequestV2 {
+ link_share: Some(Some(LinkShare::Team)),
+ link_share_access_level: Some(Some(AccessLevel::Comment)),
+ team_share_access_level: Some(Some(AccessLevel::Edit)),
+ channel_share_permissions: None,
+ }),
+ team_share: Some(command(&facts, Some(AccessLevel::Edit))),
+ })
+ .await
+ .unwrap();
+
+ let permission = repo
+ .get_project_share_permission(&project_id)
+ .await
+ .unwrap();
+ assert_eq!(permission.link_share, Some(LinkShare::Team));
+ assert_eq!(
+ permission.link_share_access_level,
+ Some(AccessLevel::Comment)
+ );
+ assert_eq!(permission.team_share_access_level, Some(AccessLevel::Edit));
+ assert_eq!(
+ repo.get_project_by_id(&project_id)
+ .await
+ .unwrap()
+ .unwrap()
+ .name,
+ "Renamed"
+ );
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("users", "team"))
+)]
+async fn get_project_share_permission_reads_team_share_access_level(pool: PgPool) {
+ let repo = PgProjectRepo::new(pool.clone());
+ let project_id = create_project(&repo, "Read").await;
+ assert_eq!(
+ repo.get_project_share_permission(&project_id)
+ .await
+ .unwrap()
+ .team_share_access_level,
+ None
+ );
+
+ edit_team_share(&repo, &project_id, Some(AccessLevel::Comment))
+ .await
+ .unwrap();
+
+ assert_eq!(
+ repo.get_project_share_permission(&project_id)
+ .await
+ .unwrap()
+ .team_share_access_level,
+ Some(AccessLevel::Comment)
+ );
+}
diff --git a/crates/projects/src/outbound/pg_project_repo/tests.rs b/crates/projects/src/outbound/pg_project_repo/tests.rs
index 3e47600d6f..c99c2cc2e3 100644
--- a/crates/projects/src/outbound/pg_project_repo/tests.rs
+++ b/crates/projects/src/outbound/pg_project_repo/tests.rs
@@ -384,6 +384,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
update_parent: false,
parent_id: None,
share_permission: None,
+ team_share: None,
})
.await?;
assert_eq!(unchanged.parent_id.as_deref(), Some(ROOT_ID));
@@ -395,6 +396,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
update_parent: true,
parent_id: Some("10000000-0000-0000-0000-000000000005".to_owned()),
share_permission: None,
+ team_share: None,
})
.await?;
assert_eq!(
@@ -414,6 +416,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
team_share_access_level: None,
channel_share_permissions: None,
}),
+ team_share: None,
})
.await?;
assert!(updated.parent_id.is_none());
@@ -436,6 +439,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
team_share_access_level: None,
channel_share_permissions: None,
}),
+ team_share: None,
})
.await?;
assert_eq!(
@@ -457,6 +461,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
team_share_access_level: None,
channel_share_permissions: None,
}),
+ team_share: None,
})
.await?;
let before_omitted_update = project_share_permission_columns(&pool, ROOT_ID).await;
@@ -479,6 +484,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
team_share_access_level: None,
channel_share_permissions: None,
}),
+ team_share: None,
})
.await?;
assert_eq!(
@@ -497,6 +503,7 @@ async fn edit_supports_parent_flags_and_sharing(pool: Pool<Postgres>) -> anyhow:
team_share_access_level: None,
channel_share_permissions: None,
}),
+ team_share: None,
})
.await?;
assert_eq!(
diff --git a/crates/share_permission_db_utils/src/team_share.rs b/crates/share_permission_db_utils/src/team_share.rs
index 0781820186..9ef4fbf8b7 100644
--- a/crates/share_permission_db_utils/src/team_share.rs
+++ b/crates/share_permission_db_utils/src/team_share.rs
@@ -7,7 +7,9 @@
//! Ordinary reads may use a short transaction and [`load_facts`] before domain policy.
pub use entity_access_db_utils::team_share::acquire_guard;
-use entity_access_db_utils::team_share::{delete_direct, direct_level, upsert_direct};
+use entity_access_db_utils::team_share::{
+ delete_direct, direct_level, replace_project_contributions, upsert_direct,
+};
use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
use macro_uuid::Uuid;
use model_entity::{Entity, EntityType};
@@ -429,5 +431,15 @@ async fn write_state(
.await
.context(TeamShareError::Infrastructure)?;
}
+ if entity.entity_type == EntityType::Project {
+ replace_project_contributions(
+ transaction,
+ &uuid,
+ state.facts.current.map(|grant| grant.team_id),
+ target.map(|grant| (grant.team_id, grant.level.into())),
+ )
+ .await
+ .context(TeamShareError::Infrastructure)?;
+ }
Ok(())
}
diff --git a/crates/share_permission_db_utils/src/team_share/test.rs b/crates/share_permission_db_utils/src/team_share/test.rs
index d7382eb6c2..eeee35ced2 100644
--- a/crates/share_permission_db_utils/src/team_share/test.rs
+++ b/crates/share_permission_db_utils/src/team_share/test.rs
@@ -3,6 +3,10 @@ use macro_db_migrator::MACRO_DB_MIGRATIONS;
use models_permissions::share_permission::team_share::{TeamShareRequest, authorize_team_share};
use sqlx::PgPool;
+fn project() -> Entity<'static> {
+ EntityType::Project.with_entity_string("20000000-0000-0000-0000-000000000001".to_string())
+}
+
fn document() -> Entity<'static> {
EntityType::Document.with_entity_string("20000000-0000-0000-0000-000000000002".to_string())
}
@@ -263,6 +267,111 @@ async fn initialize_grants_comment_to_owner_team_for_initiative(
Ok(())
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../fixtures", scripts("team_share"))
+)]
+async fn apply_project_team_share_copies_and_clears_nested_contents(
+ pool: PgPool,
+) -> rootcause::Result<()> {
+ let mut tx = pool.begin().await?;
+ let entity = project();
+ let project_id = entity.entity_id.as_ref();
+ let nested_document = document();
+ let document_id = Uuid::parse_str(&nested_document.entity_id)?;
+ let nested_id = Uuid::from_u128(0x20000000_0000_0000_0000_000000000010);
+ sqlx::query!(
+ r#"UPDATE "Document" SET "projectId" = $1 WHERE id = $2"#,
+ project_id,
+ nested_document.entity_id.as_ref(),
+ )
+ .execute(tx.as_mut())
+ .await?;
+ sqlx::query!(
+ r#"INSERT INTO "Document" (id, name, owner, "projectId")
+ VALUES ($1, 'Later', 'macro|[email protected]', $2)"#,
+ nested_id.to_string(),
+ project_id,
+ )
+ .execute(tx.as_mut())
+ .await?;
+
+ let facts = load_facts(&mut tx, &entity).await?;
+ let team_id = facts
+ .owner_team_id
+ .expect("fixture owner belongs to a team");
+ apply(&mut tx, &command(&facts, Some(AccessLevel::Edit))).await?;
+
+ let inherited = sqlx::query!(
+ r#"SELECT entity_id, entity_type, access_level AS "access_level: AccessLevel"
+ FROM entity_access
+ WHERE granted_from_project_id = $1 AND source_type = 'team' AND source_id = $2
+ ORDER BY entity_id"#,
+ project_id,
+ team_id.to_string(),
+ )
+ .fetch_all(tx.as_mut())
+ .await?;
+ assert_eq!(inherited.len(), 2);
+ assert_eq!(inherited[0].entity_id, document_id);
+ assert_eq!(inherited[0].entity_type, "document");
+ assert_eq!(inherited[0].access_level, AccessLevel::Edit);
+ assert_eq!(inherited[1].entity_id, nested_id);
+ assert_eq!(inherited[1].access_level, AccessLevel::Edit);
+
+ let stale_id = Uuid::from_u128(0x20000000_0000_0000_0000_000000000099);
+ sqlx::query!(
+ r#"INSERT INTO entity_access
+ (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)
+ VALUES ($1, 'email_thread', $2, 'team', 'edit', $3)"#,
+ stale_id,
+ team_id.to_string(),
+ project_id,
+ )
+ .execute(tx.as_mut())
+ .await?;
+
+ let facts = load_facts(&mut tx, &entity).await?;
+ apply(&mut tx, &command(&facts, Some(AccessLevel::View))).await?;
+ let inherited = sqlx::query!(
+ r#"SELECT entity_id, entity_type, access_level AS "access_level: AccessLevel"
+ FROM entity_access
+ WHERE granted_from_project_id = $1 AND source_type = 'team'
+ ORDER BY entity_id"#,
+ project_id,
+ )
+ .fetch_all(tx.as_mut())
+ .await?;
+ assert_eq!(inherited.len(), 2);
+ assert_eq!(inherited[0].entity_id, document_id);
+ assert_eq!(inherited[0].access_level, AccessLevel::View);
+ assert_eq!(inherited[1].entity_id, nested_id);
+ assert_eq!(inherited[1].access_level, AccessLevel::View);
+
+ sqlx::query!(
+ r#"INSERT INTO entity_access
+ (entity_id, entity_type, source_id, source_type, access_level, granted_from_project_id)
+ VALUES ($1, 'chat', $2, 'team', 'view', $3)"#,
+ Uuid::parse_str(&chat().entity_id)?,
+ team_id.to_string(),
+ project_id,
+ )
+ .execute(tx.as_mut())
+ .await?;
+
+ let facts = load_facts(&mut tx, &entity).await?;
+ apply(&mut tx, &command(&facts, None)).await?;
+ let remaining = sqlx::query_scalar!(
+ r#"SELECT count(*) FROM entity_access
+ WHERE granted_from_project_id = $1 AND source_type = 'team'"#,
+ project_id,
+ )
+ .fetch_one(tx.as_mut())
+ .await?;
+ assert_eq!(remaining, Some(0));
+ Ok(())
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn load_facts_rejects_unsupported_entity_type(pool: PgPool) -> rootcause::Result<()> {
let entity =
diff --git a/docs/AGENT_GUIDE/documents.md b/docs/AGENT_GUIDE/documents.md
index 18036f1437..6411565a92 100644
--- a/docs/AGENT_GUIDE/documents.md
+++ b/docs/AGENT_GUIDE/documents.md
@@ -426,9 +426,11 @@ Right side of a doc (toggle with `Hide/Show Side Panel`):
oldest fetched entry (usually `created this`) pinned last; the toggle flips to `Show less`
once expanded.
- Header: `Share`, `Copy Share Link`, overflow menu — use `Share` to inspect or change the
- doc's visibility/permissions. Documents and AI chats also have a `Team access` dropdown
- (None / View / Comment / Edit) for sharing directly with the owner's team. That is
- independent of the team-scoped link control.
+ doc's visibility/permissions. Documents, AI chats, and folders have a `Team access`
+ control (None / View / Comment / Edit) for sharing directly with the owner's team.
+ That is independent of the team-scoped link control. Folders hide link sharing, so
+ Team access is its own card on desktop and a Team tab on mobile, not nested in the
+ Link card.
## Known failure: "expected instance of LoroDoc"
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index 75ba4daebe..986b9efbf3 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -421,6 +421,8 @@ search remains available. Right-click any Drive view, the Drive folder overview,
or a folder at any depth for **Open in new split**, **Open in current split**, and
**Open fullscreen** (when multiple splits are open). Folder menus also offer
Favorite/Unfavorite, Move to folder, Copy Link, and owner-only Rename and Delete.
+A folder's Share dialog, when the owner belongs to a team, has Team access
+(None, View, Comment, or Edit) without a Link sharing card or Link tab.
Favorites use the same open actions and **Remove from favorites** menu as Tasks.
The **Filter** menu reuses the
legacy **Type**, searchable **Tags**, and **Created by** submenus alongside **Files**