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(team): default link share (#5709)

Will Hutchinson4999859aacad
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.json
index 6ba1324ea3..71b2723c0f 100644
--- a/.github/workspace-dep-closures.json
+++ b/.github/workspace-dep-closures.json
@@ -923,6 +923,7 @@
"crates/prompt",
"crates/remote_env_var",
"crates/roles_and_permissions",
+ "crates/share_permission_db_utils",
"crates/workspace-hack"
],
"comms_db_client": [
diff --git a/.sqlx/query-296972526c9ca794abbe57d671bb4f14ecda9d7885869afdc050ce84a0f0ab45.json b/.sqlx/query-296972526c9ca794abbe57d671bb4f14ecda9d7885869afdc050ce84a0f0ab45.json
new file mode 100644
index 0000000000..543bb75dfe
--- /dev/null
+++ b/.sqlx/query-296972526c9ca794abbe57d671bb4f14ecda9d7885869afdc050ce84a0f0ab45.json
@@ -0,0 +1,18 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE team\n SET\n name = COALESCE($2, name),\n slug = COALESCE($3, slug),\n default_link_share = CASE WHEN $4 THEN $5 ELSE default_link_share END\n WHERE id = $1\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text",
+ "Varchar",
+ "Bool",
+ "Text"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "296972526c9ca794abbe57d671bb4f14ecda9d7885869afdc050ce84a0f0ab45"
+}
diff --git a/.sqlx/query-fe4923829f168f5b5df199802772022b6a602bbb4d1b6a05036481a416074939.json b/.sqlx/query-6bb8d6d6270a34de88ddb8b6deb8e8010256a3aba7c764c33e9d04c75f136558.json
similarity index 75%
rename from .sqlx/query-fe4923829f168f5b5df199802772022b6a602bbb4d1b6a05036481a416074939.json
rename to .sqlx/query-6bb8d6d6270a34de88ddb8b6deb8e8010256a3aba7c764c33e9d04c75f136558.json
index 8104c4cf8f..d141994fe7 100644
--- a/.sqlx/query-fe4923829f168f5b5df199802772022b6a602bbb4d1b6a05036481a416074939.json
+++ b/.sqlx/query-6bb8d6d6270a34de88ddb8b6deb8e8010256a3aba7c764c33e9d04c75f136558.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO team (id, name, slug, owner_id, seat_count, subscription_id, paying)\n VALUES ($1, $2, $3, $4, 1, $5, $6)\n RETURNING id, name, slug, owner_id, enterprise, allow_non_admin_invites\n ",
+ "query": "\n INSERT INTO team (id, name, slug, owner_id, seat_count, subscription_id, paying)\n VALUES ($1, $2, $3, $4, 1, $5, $6)\n RETURNING id, name, slug, owner_id, enterprise, allow_non_admin_invites,\n default_link_share as \"default_link_share: LinkShare\"\n ",
"describe": {
"columns": [
{
@@ -32,6 +32,11 @@
"ordinal": 5,
"name": "allow_non_admin_invites",
"type_info": "Bool"
+ },
+ {
+ "ordinal": 6,
+ "name": "default_link_share: LinkShare",
+ "type_info": "Text"
}
],
"parameters": {
@@ -50,8 +55,9 @@
false,
false,
false,
- false
+ false,
+ true
]
},
- "hash": "fe4923829f168f5b5df199802772022b6a602bbb4d1b6a05036481a416074939"
+ "hash": "6bb8d6d6270a34de88ddb8b6deb8e8010256a3aba7c764c33e9d04c75f136558"
}
diff --git a/.sqlx/query-7929dc869efa38fd6724b329f1b88254cc7a19c37ee2c139c71eac52e896ff5d.json b/.sqlx/query-7929dc869efa38fd6724b329f1b88254cc7a19c37ee2c139c71eac52e896ff5d.json
new file mode 100644
index 0000000000..d0eb84441b
--- /dev/null
+++ b/.sqlx/query-7929dc869efa38fd6724b329f1b88254cc7a19c37ee2c139c71eac52e896ff5d.json
@@ -0,0 +1,22 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT t.default_link_share as \"default_link_share: LinkShare\"\n FROM team_user tu\n JOIN team t ON t.id = tu.team_id\n WHERE tu.user_id = $1\n ORDER BY tu.team_role DESC\n LIMIT 1\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "default_link_share: LinkShare",
+ "type_info": "Text"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ true
+ ]
+ },
+ "hash": "7929dc869efa38fd6724b329f1b88254cc7a19c37ee2c139c71eac52e896ff5d"
+}
diff --git a/.sqlx/query-5d5cf55d5b9dc0b138684b01620b30dc5908a951020368af47cbbe6ca1052e79.json b/.sqlx/query-d3d2c5be6306450a0d59db117a3696cdff60e2bb8f5aa19d35c0c0b7007d0f15.json
similarity index 68%
rename from .sqlx/query-5d5cf55d5b9dc0b138684b01620b30dc5908a951020368af47cbbe6ca1052e79.json
rename to .sqlx/query-d3d2c5be6306450a0d59db117a3696cdff60e2bb8f5aa19d35c0c0b7007d0f15.json
index 5e0c98cb29..dbb001cd33 100644
--- a/.sqlx/query-5d5cf55d5b9dc0b138684b01620b30dc5908a951020368af47cbbe6ca1052e79.json
+++ b/.sqlx/query-d3d2c5be6306450a0d59db117a3696cdff60e2bb8f5aa19d35c0c0b7007d0f15.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,\n t.allow_non_admin_invites,\n COALESCE(tcs.crm_enabled, FALSE) AS \"crm_enabled!\"\n FROM team t\n JOIN team_user tu ON t.id = tu.team_id\n LEFT JOIN team_crm_settings tcs ON tcs.team_id = t.id\n WHERE tu.user_id = $1\n ",
+ "query": "\n SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,\n t.allow_non_admin_invites,\n t.default_link_share as \"default_link_share: LinkShare\",\n COALESCE(tcs.crm_enabled, FALSE) AS \"crm_enabled!\"\n FROM team t\n LEFT JOIN team_crm_settings tcs ON tcs.team_id = t.id\n WHERE t.id = $1\n ",
"describe": {
"columns": [
{
@@ -40,13 +40,18 @@
},
{
"ordinal": 7,
+ "name": "default_link_share: LinkShare",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 8,
"name": "crm_enabled!",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
- "Text"
+ "Uuid"
]
},
"nullable": [
@@ -57,8 +62,9 @@
true,
false,
false,
+ true,
null
]
},
- "hash": "5d5cf55d5b9dc0b138684b01620b30dc5908a951020368af47cbbe6ca1052e79"
+ "hash": "d3d2c5be6306450a0d59db117a3696cdff60e2bb8f5aa19d35c0c0b7007d0f15"
}
diff --git a/.sqlx/query-8b1e8ff98b7b6cfc0d18fc32bcba5f41392f2f716d7c3ba7c7d50044981a322e.json b/.sqlx/query-d95562aa0c3a2b750c654b4391daf18fe5418d99bd177903a8ae7952a76552c6.json
similarity index 70%
rename from .sqlx/query-8b1e8ff98b7b6cfc0d18fc32bcba5f41392f2f716d7c3ba7c7d50044981a322e.json
rename to .sqlx/query-d95562aa0c3a2b750c654b4391daf18fe5418d99bd177903a8ae7952a76552c6.json
index 1f91ca6f25..d76fd5538a 100644
--- a/.sqlx/query-8b1e8ff98b7b6cfc0d18fc32bcba5f41392f2f716d7c3ba7c7d50044981a322e.json
+++ b/.sqlx/query-d95562aa0c3a2b750c654b4391daf18fe5418d99bd177903a8ae7952a76552c6.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,\n t.allow_non_admin_invites,\n COALESCE(tcs.crm_enabled, FALSE) AS \"crm_enabled!\"\n FROM team t\n LEFT JOIN team_crm_settings tcs ON tcs.team_id = t.id\n WHERE t.id = $1\n ",
+ "query": "\n SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,\n t.allow_non_admin_invites,\n t.default_link_share as \"default_link_share: LinkShare\",\n COALESCE(tcs.crm_enabled, FALSE) AS \"crm_enabled!\"\n FROM team t\n JOIN team_user tu ON t.id = tu.team_id\n LEFT JOIN team_crm_settings tcs ON tcs.team_id = t.id\n WHERE tu.user_id = $1\n ",
"describe": {
"columns": [
{
@@ -40,13 +40,18 @@
},
{
"ordinal": 7,
+ "name": "default_link_share: LinkShare",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 8,
"name": "crm_enabled!",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
- "Uuid"
+ "Text"
]
},
"nullable": [
@@ -57,8 +62,9 @@
true,
false,
false,
+ true,
null
]
},
- "hash": "8b1e8ff98b7b6cfc0d18fc32bcba5f41392f2f716d7c3ba7c7d50044981a322e"
+ "hash": "d95562aa0c3a2b750c654b4391daf18fe5418d99bd177903a8ae7952a76552c6"
}
diff --git a/Cargo.lock b/Cargo.lock
index 7ec14480c9..f3f512e01d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1244,6 +1244,7 @@ dependencies = [
"model",
"model-entity",
"model_notifications",
+ "models_permissions",
"native_app_service",
"non_empty",
"notification",
@@ -3030,6 +3031,7 @@ dependencies = [
"schemars 1.2.1",
"serde",
"serde_json",
+ "share_permission_db_utils",
"sqlx",
"thiserror 2.0.18",
"tokio",
@@ -4545,6 +4547,7 @@ dependencies = [
"secretsmanager_client",
"serde",
"serde_json",
+ "share_permission_db_utils",
"soup",
"sqlx",
"sqs_client",
@@ -4851,6 +4854,7 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.9",
+ "share_permission_db_utils",
"sqlx",
"sync_service_client",
"system_skills",
@@ -11898,6 +11902,7 @@ dependencies = [
"schemars 1.2.1",
"serde",
"serde_json",
+ "share_permission_db_utils",
"sqlx",
"sqs_client",
"system_properties",
@@ -13327,10 +13332,12 @@ dependencies = [
"model",
"model-entity",
"model_notifications",
+ "models_permissions",
"notification",
"secretsmanager_client",
"serde",
"serde_json",
+ "share_permission_db_utils",
"sqlx",
"tokio",
"tokio-util",
@@ -14142,10 +14149,12 @@ version = "0.1.0"
dependencies = [
"anyhow",
"entity_access_db_utils",
+ "macro_db_migrator",
"macro_user_id",
"macro_uuid",
"models_permissions",
"sqlx",
+ "tokio",
"workspace-hack",
]
@@ -15283,6 +15292,7 @@ dependencies = [
"model_user",
"models_email",
"models_pagination",
+ "models_permissions",
"non_empty",
"notification",
"roles_and_permissions",
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsx
index d7159e367d..5c2d15184e 100644
--- a/apps/web/src/features/settings/Team.tsx
+++ b/apps/web/src/features/settings/Team.tsx
@@ -1,4 +1,10 @@
import { toast } from '@core/component/Toast/Toast';
+import {
+ getLinkShareScope,
+ LINK_SHARE_SCOPE_OPTIONS,
+ type LinkShareScope,
+ NO_LINK_SHARE,
+} from '@core/component/TopBar/linkShare';
import { UserIcon } from '@core/component/UserIcon';
import { SERVER_HOSTS } from '@core/constant/servers';
import { useUserId } from '@core/context/user';
@@ -46,7 +52,15 @@ import {
import type { TeamInviteDetails } from '@service-auth/generated/schemas/teamInviteDetails';
import type { TeamMember } from '@service-auth/generated/schemas/teamMember';
import { TeamRole } from '@service-auth/generated/schemas/teamRole';
-import { Button, cn, Dialog, Panel, ToggleSwitch, Tooltip } from '@ui';
+import {
+ Button,
+ cn,
+ Dialog,
+ Panel,
+ SegmentedControl,
+ ToggleSwitch,
+ Tooltip,
+} from '@ui';
import {
createMemo,
createSignal,
@@ -979,6 +993,20 @@ function TeamManagement(props: {
toggleNonAdminInvitesMutation.mutate({ teamId: props.teamId });
};
+ // The team-wide default link-share scope for newly shared items. NONE
+ // (stored as null) means link sharing starts off.
+ const defaultLinkShare = () =>
+ getLinkShareScope(teamQuery.data?.team.default_link_share);
+
+ const handleChangeDefaultLinkShare = (scope: LinkShareScope) => {
+ if (!props.teamId || patchTeamMutation.isPending) return;
+ if (scope === defaultLinkShare()) return;
+ patchTeamMutation.mutate({
+ teamId: props.teamId,
+ request: { default_link_share: scope === NO_LINK_SHARE ? null : scope },
+ });
+ };
+
const handleSaveTeamName = () => {
const newName = editingTeamName()?.trim();
if (!props.teamId || !newName) return;
@@ -1298,6 +1326,24 @@ function TeamManagement(props: {
onChange={handleToggleNonAdminInvites}
/>
</SettingsRow>
+
+ <SettingsRow
+ label="Default link sharing"
+ description="The link-sharing scope newly shared items start with. None means link sharing starts off."
+ hideDescriptionOnMobile
+ >
+ <SegmentedControl
+ aria-label="Default link sharing scope"
+ size="sm"
+ value={defaultLinkShare()}
+ options={LINK_SHARE_SCOPE_OPTIONS.map((option) => ({
+ ...option,
+ disabled:
+ patchTeamMutation.isPending || teamQuery.isLoading,
+ }))}
+ onChange={handleChangeDefaultLinkShare}
+ />
+ </SettingsRow>
</Show>
</SettingsCard>
</SettingsSection>
diff --git a/apps/web/src/lib/queries/team/teams.ts b/apps/web/src/lib/queries/team/teams.ts
index af41cd1527..73933c995d 100644
--- a/apps/web/src/lib/queries/team/teams.ts
+++ b/apps/web/src/lib/queries/team/teams.ts
@@ -385,6 +385,7 @@ export function useCreateTeamWithInvitesMutation(
auto_join_domain: null,
enterprise: false,
allow_non_admin_invites: true,
+ default_link_share: 'TEAM',
};
queryClient.setQueryData<Team[]>(
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/index.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/index.ts
index 1cd3624e13..9da617a1d4 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/index.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/index.ts
@@ -73,6 +73,7 @@ export * from './initOutlookLinkParams';
export * from './initOutlookLinkResponse';
export * from './inviteEntry';
export * from './inviteToTeamRequest';
+export * from './linkShare';
export * from './macroApiTokenParams';
export * from './macroApiTokenResponse';
export * from './passwordlessCallbackParams';
@@ -84,6 +85,7 @@ export * from './passwordRequest';
export * from './patchTeamCrmSettingsRequest';
export * from './patchTeamCrmSettingsResponse';
export * from './patchTeamRequest';
+export * from './patchTeamRequestDefaultLinkShare';
export * from './patchTeamRequestName';
export * from './patchTeamRequestSlug';
export * from './patchTeamRequestUserRoleUpdates';
@@ -109,6 +111,7 @@ export * from './ssoRequiredResponse';
export * from './stripeSessionResponse';
export * from './team';
export * from './teamAutoJoinDomain';
+export * from './teamDefaultLinkShare';
export * from './teamInviteDetails';
export * from './teamInvitesResponse';
export * from './teamMember';
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/linkShare.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/linkShare.ts
new file mode 100644
index 0000000000..59f898f2f3
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/linkShare.ts
@@ -0,0 +1,17 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * authentication_service
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * Defines who can access an item through its share link.
+ */
+export type LinkShare = (typeof LinkShare)[keyof typeof LinkShare];
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const LinkShare = {
+ PUBLIC: 'PUBLIC',
+ TEAM: 'TEAM',
+} as const;
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequest.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequest.ts
index ba6e5fe59b..6ed7c276a4 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequest.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequest.ts
@@ -4,6 +4,7 @@
* authentication_service
* OpenAPI spec version: 0.1.0
*/
+import type { PatchTeamRequestDefaultLinkShare } from './patchTeamRequestDefaultLinkShare';
import type { PatchTeamRequestName } from './patchTeamRequestName';
import type { PatchTeamRequestSlug } from './patchTeamRequestSlug';
import type { PatchTeamRequestUserRoleUpdates } from './patchTeamRequestUserRoleUpdates';
@@ -12,6 +13,7 @@ import type { PatchTeamRequestUserRoleUpdates } from './patchTeamRequestUserRole
* Request to update a team
*/
export interface PatchTeamRequest {
+ default_link_share?: PatchTeamRequestDefaultLinkShare;
/** The new name for the team */
name?: PatchTeamRequestName;
/** The new slug for the team. This is normalized to SCREAMING_SNAKE_CASE. */
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequestDefaultLinkShare.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequestDefaultLinkShare.ts
new file mode 100644
index 0000000000..607f3fbff6
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/patchTeamRequestDefaultLinkShare.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * authentication_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { LinkShare } from './linkShare';
+
+export type PatchTeamRequestDefaultLinkShare = null | LinkShare;
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/team.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/team.ts
index c5bbcaef73..774f6b77f5 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/team.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/team.ts
@@ -5,6 +5,7 @@
* OpenAPI spec version: 0.1.0
*/
import type { TeamAutoJoinDomain } from './teamAutoJoinDomain';
+import type { TeamDefaultLinkShare } from './teamDefaultLinkShare';
/**
* The Team struct
@@ -19,6 +20,7 @@ with, when automatic domain joining is enabled (None otherwise). */
/** Whether the CRM is enabled for this team (from `team_crm_settings`;
`false` when no row exists). */
crm_enabled: boolean;
+ default_link_share?: TeamDefaultLinkShare;
/** Whether this team is on an enterprise license. Enterprise teams are
billed out-of-band; membership changes skip all Stripe subscription
bookkeeping (no seat counts, no subscription backfill, no paying check). */
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamDefaultLinkShare.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamDefaultLinkShare.ts
new file mode 100644
index 0000000000..2f64fa9041
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamDefaultLinkShare.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * authentication_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { LinkShare } from './linkShare';
+
+export type TeamDefaultLinkShare = null | LinkShare;
diff --git a/apps/web/src/lib/service-clients/service-auth/openapi.json b/apps/web/src/lib/service-clients/service-auth/openapi.json
index 146c67288f..85352aed8b 100644
--- a/apps/web/src/lib/service-clients/service-auth/openapi.json
+++ b/apps/web/src/lib/service-clients/service-auth/openapi.json
@@ -4188,6 +4188,11 @@
}
}
},
+ "LinkShare": {
+ "type": "string",
+ "description": "Defines who can access an item through its share link.",
+ "enum": ["PUBLIC", "TEAM"]
+ },
"MacroApiTokenResponse": {
"type": "object",
"required": ["macro_api_token"],
@@ -4288,6 +4293,17 @@
"type": "object",
"description": "Request to update a team",
"properties": {
+ "default_link_share": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/LinkShare",
+ "description": "The default link-share scope for items owned by the team. Omit to\nleave unchanged or pass `null` to default to link sharing off."
+ }
+ ]
+ },
"name": {
"type": ["string", "null"],
"description": "The new name for the team"
@@ -4509,6 +4525,17 @@
"type": "boolean",
"description": "Whether the CRM is enabled for this team (from `team_crm_settings`;\n`false` when no row exists)."
},
+ "default_link_share": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/LinkShare",
+ "description": "The default link-share scope applied when items owned by the team are\nshared via link without an explicit choice. `None` means link sharing\nis off by default. Defaults to [`LinkShare::Team`]."
+ }
+ ]
+ },
"enterprise": {
"type": "boolean",
"description": "Whether this team is on an enterprise license. Enterprise teams are\nbilled out-of-band; membership changes skip all Stripe subscription\nbookkeeping (no seat counts, no subscription backfill, no paying check)."
diff --git a/crates/call/src/outbound/pg_call_repo.rs b/crates/call/src/outbound/pg_call_repo.rs
index 2e8958a1b3..3ab7bf3c54 100644
--- a/crates/call/src/outbound/pg_call_repo.rs
+++ b/crates/call/src/outbound/pg_call_repo.rs
@@ -307,7 +307,9 @@ impl CallRepository for PgCallRepo {
room_name: &str,
created_by: MacroUserIdStr<'_>,
) -> Result<Option<Call>, Self::Err> {
- // Create share permission
+ // Create share permission. Call access is channel-based by design, so
+ // the team default link-share preference intentionally does not apply:
+ // link sharing is off and the channel gets an explicit edit grant.
let share_permission_id = uuid::Uuid::now_v7();
let share_permission = SharePermissionV2 {
id: share_permission_id.to_string(),
diff --git a/crates/chat/Cargo.toml b/crates/chat/Cargo.toml
index e012c34e74..8d2bb34d47 100644
--- a/crates/chat/Cargo.toml
+++ b/crates/chat/Cargo.toml
@@ -18,7 +18,13 @@ inbound = [
"entity_access/inbound",
"ports",
]
-outbound = ["dep:entity_access_db_utils", "dep:macro_uuid", "dep:sqlx", "ports"]
+outbound = [
+ "dep:entity_access_db_utils",
+ "dep:macro_uuid",
+ "dep:share_permission_db_utils",
+ "dep:sqlx",
+ "ports",
+]
ports = []
[dependencies]
@@ -70,6 +76,7 @@ roles_and_permissions = { path = "../roles_and_permissions", optional = true, de
utoipa = { workspace = true }
# Outbound (database adapters)
+share_permission_db_utils = { path = "../share_permission_db_utils", optional = true }
sqlx = { workspace = true, optional = true }
macro_uuid = { path = "../macro_uuid", optional = true }
diff --git a/crates/chat/src/domain/ports/chat.rs b/crates/chat/src/domain/ports/chat.rs
index 0a9a464952..d5971802a4 100644
--- a/crates/chat/src/domain/ports/chat.rs
+++ b/crates/chat/src/domain/ports/chat.rs
@@ -10,18 +10,29 @@ use entity_access::domain::models::{
};
use macro_user_id::user_id::MacroUserIdStr;
use model::chat::Chat;
-use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
/// Repository trait for low-level chat data access.
pub trait ChatRepo: Send + Sync + 'static {
/// Create a new chat, returning the chat ID.
+ ///
+ /// `share_permission` is the pre-resolved initial share permission — the
+ /// repository persists it verbatim and carries no share-policy of its own.
fn create(
&self,
user_id: MacroUserIdStr<'static>,
args: CreateChatArgs,
+ share_permission: SharePermissionV2,
) -> impl std::future::Future<Output = Result<String>> + Send;
+ /// Get the link-share preference of the user's team, or `None` when the
+ /// user is not on a team.
+ fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> impl std::future::Future<Output = Result<Option<TeamLinkShareDefault>>> + Send;
+
/// Get the full chat response (metadata, messages, web citations).
fn get_chat(
&self,
@@ -40,11 +51,15 @@ pub trait ChatRepo: Send + Sync + 'static {
) -> impl std::future::Future<Output = Result<AccessLevel>> + Send;
/// Copy a chat (create a new chat and duplicate its messages), returning the new chat ID.
+ ///
+ /// `share_permission` is the pre-resolved initial share permission for the
+ /// copy — the repository persists it verbatim.
fn copy_chat(
&self,
user_id: MacroUserIdStr<'static>,
source_chat_id: &str,
args: CopyChatArgs,
+ share_permission: SharePermissionV2,
) -> impl std::future::Future<Output = Result<String>> + Send;
/// Revert a soft-deleted chat (clears `deleted_at`, restores history).
diff --git a/crates/chat/src/domain/service/chat.rs b/crates/chat/src/domain/service/chat.rs
index be2348340f..ab7a37162e 100644
--- a/crates/chat/src/domain/service/chat.rs
+++ b/crates/chat/src/domain/service/chat.rs
@@ -129,7 +129,19 @@ where
let project_id = args.project_id.clone();
let name = args.name.clone();
- let chat_id = self.repo.create(user_id.clone(), args).await?;
+
+ // The owner's team default link-share preference decides the initial
+ // share permission; without a team the chat default (public/view) applies.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(user_id.as_ref())
+ .await?;
+ let share_permission = SharePermissionV2::new_chat_share_permission(team_default);
+
+ let chat_id = self
+ .repo
+ .create(user_id.clone(), args, share_permission)
+ .await?;
if let Some(project_id) = &project_id
&& !project_id.is_empty()
@@ -212,6 +224,15 @@ where
let chat = self.repo.get_metadata(chat_id).await?;
let name = format!("{} Copy", chat.name);
+
+ // The copier becomes the owner, so their team default decides the
+ // copy's initial share permission.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(user_id.as_ref())
+ .await?;
+ let share_permission = SharePermissionV2::new_chat_share_permission(team_default);
+
let new_chat_id = self
.repo
.copy_chat(
@@ -221,6 +242,7 @@ where
name: name.clone(),
project_id: None,
},
+ share_permission,
)
.await?;
diff --git a/crates/chat/src/domain/service/chat/test.rs b/crates/chat/src/domain/service/chat/test.rs
index db7d9db9f2..01cc832724 100644
--- a/crates/chat/src/domain/service/chat/test.rs
+++ b/crates/chat/src/domain/service/chat/test.rs
@@ -38,6 +38,8 @@ struct MessagePersistence {
struct StubChatRepo {
metadata_project_id: Option<String>,
message_persistence: Arc<Mutex<MessagePersistence>>,
+ team_default: Option<models_permissions::share_permission::TeamLinkShareDefault>,
+ received_share_permission: Arc<Mutex<Option<SharePermissionV2>>>,
fail_create: bool,
fail_copy_chat: bool,
fail_delete: bool,
@@ -84,13 +86,22 @@ impl ChatRepo for StubChatRepo {
&self,
_user_id: MacroUserIdStr<'static>,
_args: CreateChatArgs,
+ share_permission: SharePermissionV2,
) -> Result<String> {
if self.fail_create {
return Err(Self::repo_err());
}
+ *self.received_share_permission.lock().unwrap() = Some(share_permission);
Ok(CHAT_ID.to_string())
}
+ async fn get_team_default_link_share(
+ &self,
+ _user_id: &str,
+ ) -> Result<Option<models_permissions::share_permission::TeamLinkShareDefault>> {
+ Ok(self.team_default)
+ }
+
async fn get_chat(&self, _chat_id: &str) -> Result<ChatResponse> {
unimplemented!("not exercised")
}
@@ -123,10 +134,12 @@ impl ChatRepo for StubChatRepo {
_user_id: MacroUserIdStr<'static>,
_source_chat_id: &str,
_args: CopyChatArgs,
+ share_permission: SharePermissionV2,
) -> Result<String> {
if self.fail_copy_chat {
return Err(Self::repo_err());
}
+ *self.received_share_permission.lock().unwrap() = Some(share_permission);
Ok(NEW_CHAT_ID.to_string())
}
@@ -505,6 +518,121 @@ async fn create_publishes_chat_created() {
assert_eq!(metadata["project_id"], PROJECT_ID);
}
+#[tokio::test]
+async fn create_resolves_share_permission_from_team_default() {
+ use models_permissions::share_permission::access_level::AccessLevel;
+ use models_permissions::share_permission::{LinkShare, TeamLinkShareDefault};
+
+ let repo = StubChatRepo {
+ team_default: Some(TeamLinkShareDefault(Some(LinkShare::Team))),
+ ..StubChatRepo::default()
+ };
+ let service = build_service(repo.clone(), RecordingEventBroker::default());
+
+ service
+ .create(
+ owner(),
+ CreateChatArgs {
+ name: "New Chat".to_string(),
+ project_id: None,
+ },
+ )
+ .await
+ .unwrap();
+
+ let permission = repo
+ .received_share_permission
+ .lock()
+ .unwrap()
+ .clone()
+ .unwrap();
+ assert_eq!(permission.link_share, Some(LinkShare::Team));
+ assert_eq!(permission.link_share_access_level, Some(AccessLevel::View));
+}
+
+#[tokio::test]
+async fn create_uses_chat_default_without_team() {
+ use models_permissions::share_permission::LinkShare;
+ use models_permissions::share_permission::access_level::AccessLevel;
+
+ let repo = StubChatRepo::default();
+ let service = build_service(repo.clone(), RecordingEventBroker::default());
+
+ service
+ .create(
+ owner(),
+ CreateChatArgs {
+ name: "New Chat".to_string(),
+ project_id: None,
+ },
+ )
+ .await
+ .unwrap();
+
+ let permission = repo
+ .received_share_permission
+ .lock()
+ .unwrap()
+ .clone()
+ .unwrap();
+ assert_eq!(permission.link_share, Some(LinkShare::Public));
+ assert_eq!(permission.link_share_access_level, Some(AccessLevel::View));
+}
+
+#[tokio::test]
+async fn create_disables_link_share_when_team_turned_it_off() {
+ use models_permissions::share_permission::TeamLinkShareDefault;
+
+ let repo = StubChatRepo {
+ team_default: Some(TeamLinkShareDefault(None)),
+ ..StubChatRepo::default()
+ };
+ let service = build_service(repo.clone(), RecordingEventBroker::default());
+
+ service
+ .create(
+ owner(),
+ CreateChatArgs {
+ name: "New Chat".to_string(),
+ project_id: None,
+ },
+ )
+ .await
+ .unwrap();
+
+ let permission = repo
+ .received_share_permission
+ .lock()
+ .unwrap()
+ .clone()
+ .unwrap();
+ assert_eq!(permission.link_share, None);
+ assert_eq!(permission.link_share_access_level, None);
+}
+
+#[tokio::test]
+async fn copy_chat_resolves_share_permission_from_team_default() {
+ use models_permissions::share_permission::access_level::AccessLevel;
+ use models_permissions::share_permission::{LinkShare, TeamLinkShareDefault};
+
+ let repo = StubChatRepo {
+ team_default: Some(TeamLinkShareDefault(Some(LinkShare::Team))),
+ ..StubChatRepo::default()
+ };
+ let service = build_service(repo.clone(), RecordingEventBroker::default());
+
+ service.copy_chat(view_receipt(CHAT_ID)).await.unwrap();
+
+ let permission = repo
+ .received_share_permission
+ .lock()
+ .unwrap()
+ .clone()
+ .unwrap();
+ assert_eq!(permission.link_share, Some(LinkShare::Team));
+ assert_eq!(permission.link_share_access_level, Some(AccessLevel::View));
+}
+
#[tokio::test]
async fn copy_chat_publishes_chat_copied_keyed_by_new_chat() {
let broker = RecordingEventBroker::default();
diff --git a/crates/chat/src/outbound/postgres/mod.rs b/crates/chat/src/outbound/postgres/mod.rs
index f6d274641a..0d2e50e212 100644
--- a/crates/chat/src/outbound/postgres/mod.rs
+++ b/crates/chat/src/outbound/postgres/mod.rs
@@ -15,8 +15,8 @@ use macro_user_id::cowlike::CowLike;
use macro_user_id::user_id::MacroUserIdStr;
use model::chat::ChatMessageWithAttachments;
use model::chat::NewChatMessage;
-use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
use sqlx::PgPool;
/// Convert an [`anyhow::Error`] to a [`ChatErr`], detecting `sqlx::RowNotFound`.
@@ -75,11 +75,12 @@ impl PgChatRepo {
}
impl ChatRepo for PgChatRepo {
- #[tracing::instrument(err, skip(self))]
+ #[tracing::instrument(err, skip(self, share_permission))]
async fn create(
&self,
user_id: MacroUserIdStr<'static>,
args: CreateChatArgs,
+ share_permission: SharePermissionV2,
) -> Result<String> {
let mut tx = self
.pool
@@ -96,7 +97,6 @@ impl ChatRepo for PgChatRepo {
.await
.map_err(to_chat_err)?;
- let share_permission = SharePermissionV2::new_chat_share_permission();
queries::create_chat_permission::create_chat_permission(
&mut tx,
&chat_id,
@@ -132,6 +132,16 @@ impl ChatRepo for PgChatRepo {
Ok(chat_id)
}
+ #[tracing::instrument(err, skip(self))]
+ async fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> Result<Option<TeamLinkShareDefault>> {
+ share_permission_db_utils::get_team_default_link_share(&self.pool, user_id)
+ .await
+ .map_err(|e| ChatErr::Unknown(e.into()))
+ }
+
#[tracing::instrument(err, skip(self))]
#[allow(deprecated)]
async fn get_chat(&self, chat_id: &str) -> Result<ChatResponse> {
@@ -168,12 +178,13 @@ impl ChatRepo for PgChatRepo {
.map_err(to_chat_err)
}
- #[tracing::instrument(err, skip(self))]
+ #[tracing::instrument(err, skip(self, share_permission))]
async fn copy_chat(
&self,
user_id: MacroUserIdStr<'static>,
source_chat_id: &str,
args: CopyChatArgs,
+ share_permission: SharePermissionV2,
) -> Result<String> {
let mut tx = self
.pool
@@ -190,7 +201,6 @@ impl ChatRepo for PgChatRepo {
.await
.map_err(to_chat_err)?;
- let share_permission = SharePermissionV2::new_chat_share_permission();
queries::create_chat_permission::create_chat_permission(
&mut tx,
&chat_id,
diff --git a/crates/chat/src/outbound/postgres/test.rs b/crates/chat/src/outbound/postgres/test.rs
index 7be51e1948..f4d0dc6926 100644
--- a/crates/chat/src/outbound/postgres/test.rs
+++ b/crates/chat/src/outbound/postgres/test.rs
@@ -7,13 +7,21 @@ use macro_user_id::cowlike::CowLike;
use macro_user_id::user_id::MacroUserIdStr;
use model::chat::NewChatMessage;
use models_permissions::share_permission::access_level::AccessLevel;
-use models_permissions::share_permission::{LinkShare, UpdateSharePermissionRequestV2};
+use models_permissions::share_permission::{
+ LinkShare, SharePermissionV2, UpdateSharePermissionRequestV2,
+};
use sqlx::{Pool, Postgres, Row};
use super::PgChatRepo;
use crate::domain::models::{ChatErr, CopyChatArgs, CreateChatArgs, PatchChatArgs};
use crate::domain::ports::ChatRepo;
+/// The no-team default permission for a chat — the repo persists whatever the
+/// domain layer resolved, so tests pass it explicitly.
+fn default_share_permission() -> SharePermissionV2 {
+ SharePermissionV2::new_chat_share_permission(None)
+}
+
#[derive(Debug, Eq, PartialEq)]
struct StoredSharePermission {
id: String,
@@ -58,6 +66,7 @@ async fn create_test_chat(repo: &PgChatRepo, name: &str) -> String {
name: name.to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap()
@@ -95,6 +104,7 @@ async fn create_chat_with_message(repo: &PgChatRepo) -> (String, String) {
name: "Message update test".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -135,6 +145,7 @@ async fn create_chat_returns_id(pool: Pool<Postgres>) {
name: "Test Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -169,6 +180,7 @@ async fn create_message_bumps_chat_updated_at(pool: Pool<Postgres>) {
name: "Active Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -352,6 +364,7 @@ async fn create_chat_creates_user_item_access(pool: Pool<Postgres>) {
name: "Access Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -392,6 +405,7 @@ async fn create_chat_creates_user_history(pool: Pool<Postgres>) {
name: "History Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -428,6 +442,7 @@ async fn create_chat_with_project_id(pool: Pool<Postgres>) {
name: "Project Chat".to_string(),
project_id: Some("project-123".to_string()),
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -461,6 +476,7 @@ async fn get_chat_returns_chat(pool: Pool<Postgres>) {
name: "Get Me".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -503,6 +519,7 @@ async fn soft_delete_chat_sets_deleted_at(pool: Pool<Postgres>) {
name: "Delete Me".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -536,6 +553,7 @@ async fn soft_delete_chat_removes_history(pool: Pool<Postgres>) {
name: "History Delete".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -570,6 +588,7 @@ async fn permanently_delete_chat_removes_row(pool: Pool<Postgres>) {
name: "Perm Delete".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -602,6 +621,7 @@ async fn permanently_delete_chat_removes_permissions(pool: Pool<Postgres>) {
name: "Perm Delete Perms".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -635,6 +655,7 @@ async fn permanently_delete_chat_removes_user_item_access(pool: Pool<Postgres>)
name: "Perm Delete Access".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -670,6 +691,7 @@ async fn patch_chat_updates_name(pool: Pool<Postgres>) {
name: "Original".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -710,6 +732,7 @@ async fn patch_chat_updates_project(pool: Pool<Postgres>) {
name: "Project Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -758,6 +781,7 @@ async fn patch_chat_clears_project(pool: Pool<Postgres>) {
name: "Clear Project".to_string(),
project_id: Some("project-123".to_string()),
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -803,6 +827,7 @@ async fn get_chat_returns_full_response(pool: Pool<Postgres>) {
name: "Full Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -844,6 +869,7 @@ async fn copy_chat_creates_new_chat_with_same_messages(pool: Pool<Postgres>) {
name: "Source Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -868,6 +894,7 @@ async fn copy_chat_creates_new_chat_with_same_messages(pool: Pool<Postgres>) {
name: "Copied Chat".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
@@ -906,6 +933,7 @@ async fn revert_delete_restores_chat(pool: Pool<Postgres>) {
name: "Revert Me".to_string(),
project_id: None,
},
+ default_share_permission(),
)
.await
.unwrap();
diff --git a/crates/documents/Cargo.toml b/crates/documents/Cargo.toml
index ab1ca17eb2..200a8f30c5 100644
--- a/crates/documents/Cargo.toml
+++ b/crates/documents/Cargo.toml
@@ -61,6 +61,7 @@ outbound = [
"dep:base64",
"dep:entity_access_db_utils",
"dep:hex",
+ "dep:share_permission_db_utils",
"dep:sqlx",
"ports",
]
@@ -133,6 +134,7 @@ base64 = { workspace = true, optional = true }
cloudfront_sign = { workspace = true }
entity_access_db_utils = { path = "../entity_access_db_utils", optional = true }
futures = { workspace = true }
+share_permission_db_utils = { path = "../share_permission_db_utils", optional = true }
hex = { workspace = true, optional = true }
sqlx = { workspace = true, optional = true }
sync_service_client = { path = "../sync_service_client" }
diff --git a/crates/documents/src/domain/ports/mod.rs b/crates/documents/src/domain/ports/mod.rs
index 92c1743506..be72b81773 100644
--- a/crates/documents/src/domain/ports/mod.rs
+++ b/crates/documents/src/domain/ports/mod.rs
@@ -14,6 +14,7 @@ use entity_access::domain::models::{
};
use macro_user_id::user_id::MacroUserIdStr;
use model::document::{ContentType, DocumentBasic, DocumentMetadata, FileType};
+use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
use super::content::DocumentContent;
use super::events::InteractionReason;
@@ -131,11 +132,22 @@ pub trait DocumentRepo: Send + Sync + 'static {
/// Handles: Document row, version (DocumentInstance or DocumentBom),
/// document_sub_type, SharePermission, DocumentPermission, UserHistory,
/// ItemLastAccessed, UserItemAccess, and document_email.
+ ///
+ /// `share_permission` is the pre-resolved initial share permission — the
+ /// repository persists it verbatim and carries no share-policy of its own.
fn create_document(
&self,
args: CreateDocumentRepoArgs,
+ share_permission: SharePermissionV2,
) -> impl Future<Output = Result<DocumentMetadata, Self::Err>> + Send;
+ /// Get the link-share preference of the user's team, or `None` when the
+ /// user is not on a team.
+ fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> impl Future<Output = Result<Option<TeamLinkShareDefault>, Self::Err>> + Send;
+
/// Update an upload job to associate it with a document.
fn update_upload_job(
&self,
@@ -250,9 +262,13 @@ pub trait DocumentRepo: Send + Sync + 'static {
///
/// Creates: Document row, version (DocumentBom or DocumentInstance),
/// SharePermission, DocumentPermission, UserItemAccess, and user history.
+ ///
+ /// `share_permission` is the pre-resolved initial share permission for the
+ /// copy — the repository persists it verbatim.
fn copy_document(
&self,
args: CopyDocumentRepoArgs,
+ share_permission: SharePermissionV2,
) -> impl Future<Output = Result<DocumentMetadata, Self::Err>> + Send;
/// Copy PDF-specific data (DocumentText, DocumentProcessResult) for a copied document.
diff --git a/crates/documents/src/domain/service.rs b/crates/documents/src/domain/service.rs
index 78d16eef9c..99b1f16bb3 100644
--- a/crates/documents/src/domain/service.rs
+++ b/crates/documents/src/domain/service.rs
@@ -5,7 +5,9 @@ mod tests;
use entity_access_management::domain::ports::EntityAccessManagementService;
use model_entity::EntityType;
-use models_permissions::share_permission::{LinkShare, UpdateSharePermissionRequestV2};
+use models_permissions::share_permission::{
+ LinkShare, SharePermissionV2, UpdateSharePermissionRequestV2,
+};
use models_properties::EntityReference;
use models_properties::api::SetPropertyValue;
use std::borrow::Cow;
@@ -1050,15 +1052,29 @@ impl<
let project_id = args.project_id;
let sha = args.sha.clone();
+ // The owner's team default link-share preference decides the initial
+ // share permission; without a team the per-file-type default applies.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(args.user_id.as_ref())
+ .await
+ .map_err(|e| DocumentError::Internal(e.into()))?;
+ let share_permission =
+ SharePermissionV2::new_document_share_permission(file_type, team_default);
+
// Create document metadata in the database (full transaction)
- let document_metadata = self.repo.create_document(args).await.map_err(|e| {
- let err: anyhow::Error = e.into();
- if err.to_string().contains("document with ID already exists") {
- DocumentError::Conflict("document with ID already exists".to_string())
- } else {
- DocumentError::Internal(err)
- }
- })?;
+ let document_metadata = self
+ .repo
+ .create_document(args, share_permission)
+ .await
+ .map_err(|e| {
+ let err: anyhow::Error = e.into();
+ if err.to_string().contains("document with ID already exists") {
+ DocumentError::Conflict("document with ID already exists".to_string())
+ } else {
+ DocumentError::Internal(err)
+ }
+ })?;
let document_id = document_metadata.document_id.clone();
@@ -1415,16 +1431,29 @@ impl<
None
};
+ // The copier becomes the owner, so their team default decides the
+ // copy's initial share permission.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(user_id.as_ref())
+ .await
+ .map_err(|e| DocumentError::Internal(e.into()))?;
+ let share_permission =
+ SharePermissionV2::new_document_share_permission(file_type, team_default);
+
// Create the copy in the database
let new_metadata = self
.repo
- .copy_document(CopyDocumentRepoArgs {
- original_document: original_metadata.clone(),
- user_id: user_id.clone(),
- document_name,
- file_type,
- team_id: copy_team_id,
- })
+ .copy_document(
+ CopyDocumentRepoArgs {
+ original_document: original_metadata.clone(),
+ user_id: user_id.clone(),
+ document_name,
+ file_type,
+ team_id: copy_team_id,
+ },
+ share_permission,
+ )
.await
.map_err(|e| DocumentError::Internal(e.into()))?;
diff --git a/crates/documents/src/domain/service/tests.rs b/crates/documents/src/domain/service/tests.rs
index ac1ec214a5..b21de1b760 100644
--- a/crates/documents/src/domain/service/tests.rs
+++ b/crates/documents/src/domain/service/tests.rs
@@ -1839,8 +1839,10 @@ async fn copy_document_best_effort_bumps_inherited_project_and_publishes_event()
let mut copied_metadata = make_test_metadata();
copied_metadata.document_id = "doc-2".to_string();
copied_metadata.document_name = "copied doc".to_string();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
repo.expect_copy_document()
- .returning(move |_| Box::pin(std::future::ready(Ok(copied_metadata.clone()))));
+ .returning(move |_, _| Box::pin(std::future::ready(Ok(copied_metadata.clone()))));
repo.expect_get_document_version_id()
.returning(|_| Box::pin(std::future::ready(Ok((1, true)))));
repo.expect_get_latest_document_version_id()
@@ -1887,6 +1889,108 @@ async fn copy_document_best_effort_bumps_inherited_project_and_publishes_event()
assert_eq!(event.payload["metadata"]["owner"], "macro|[email protected]");
}
+fn create_document_repo_args(file_type: FileType) -> CreateDocumentRepoArgs {
+ CreateDocumentRepoArgs {
+ id: None,
+ sha: "sha".to_string(),
+ document_name: "doc".to_string(),
+ user_id: macro_user_id::user_id::MacroUserIdStr::parse_from_str("macro|[email protected]")
+ .unwrap()
+ .into_owned(),
+ file_type: Some(file_type),
+ project_id: None,
+ team_id: None,
+ email_attachment_id: None,
+ created_at: None,
+ sub_type: None,
+ skip_history: false,
+ }
+}
+
+async fn create_document_with_team_default(
+ team_default: Option<models_permissions::share_permission::TeamLinkShareDefault>,
+ file_type: FileType,
+ expected_link_share: Option<models_permissions::share_permission::LinkShare>,
+ expected_access_level: Option<models_permissions::share_permission::access_level::AccessLevel>,
+) {
+ let mut repo = make_mock_repo();
+ repo.expect_get_team_default_link_share()
+ .withf(|user_id| user_id == "macro|[email protected]")
+ .returning(move |_| Box::pin(std::future::ready(Ok(team_default))));
+ let created_metadata = make_test_metadata();
+ repo.expect_create_document()
+ .withf(move |_, share_permission| {
+ share_permission.link_share == expected_link_share
+ && share_permission.link_share_access_level == expected_access_level
+ })
+ .times(1)
+ .returning(move |_, _| Box::pin(std::future::ready(Ok(created_metadata.clone()))));
+ repo.expect_set_document_content()
+ .returning(|_, _| Box::pin(std::future::ready(Ok(()))));
+ repo.expect_get_team_task_metadata()
+ .returning(|_| Box::pin(std::future::ready(Ok(None))));
+
+ let (service, _event_broker) = make_test_service_with_event_broker(repo);
+
+ crate::domain::ports::DocumentService::create_document(
+ &service,
+ macro_user_id::user_id::MacroUserIdStr::parse_from_str("macro|[email protected]")
+ .unwrap()
+ .into_owned(),
+ create_document_repo_args(file_type),
+ None,
+ )
+ .await
+ .unwrap();
+}
+
+#[tokio::test]
+async fn create_document_repo_receives_team_derived_share_permission() {
+ use models_permissions::share_permission::access_level::AccessLevel;
+ use models_permissions::share_permission::{LinkShare, TeamLinkShareDefault};
+
+ // Team scope applies; a non-md doc has no entity level so it falls back to View.
+ create_document_with_team_default(
+ Some(TeamLinkShareDefault(Some(LinkShare::Team))),
+ FileType::Txt,
+ Some(LinkShare::Team),
+ Some(AccessLevel::View),
+ )
+ .await;
+
+ // Md keeps its Edit level under a team scope.
+ create_document_with_team_default(
+ Some(TeamLinkShareDefault(Some(LinkShare::Team))),
+ FileType::Md,
+ Some(LinkShare::Team),
+ Some(AccessLevel::Edit),
+ )
+ .await;
+}
+
+#[tokio::test]
+async fn create_document_repo_receives_entity_default_without_team() {
+ use models_permissions::share_permission::LinkShare;
+ use models_permissions::share_permission::access_level::AccessLevel;
+
+ create_document_with_team_default(
+ None,
+ FileType::Md,
+ Some(LinkShare::Public),
+ Some(AccessLevel::Edit),
+ )
+ .await;
+ create_document_with_team_default(None, FileType::Txt, None, None).await;
+}
+
+#[tokio::test]
+async fn create_document_repo_receives_disabled_share_when_team_turned_link_share_off() {
+ use models_permissions::share_permission::TeamLinkShareDefault;
+
+ create_document_with_team_default(Some(TeamLinkShareDefault(None)), FileType::Md, None, None)
+ .await;
+}
+
#[tokio::test]
async fn edited_interaction_bumps_document_before_publishing() {
let mut repo = make_mock_repo();
diff --git a/crates/documents/src/outbound/pg_document_repo.rs b/crates/documents/src/outbound/pg_document_repo.rs
index a2a14f4572..bd61eeadc0 100644
--- a/crates/documents/src/outbound/pg_document_repo.rs
+++ b/crates/documents/src/outbound/pg_document_repo.rs
@@ -14,6 +14,7 @@ mod share;
use document_sub_type::DocumentSubType;
use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
use model::document::{DocumentBasic, DocumentMetadata};
+use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
use sqlx::PgPool;
use model_entity::{Entity, EntityType};
@@ -403,10 +404,19 @@ impl DocumentRepo for PgDocumentRepo {
Ok(content.content)
}
- #[tracing::instrument(err, skip(self, args))]
+ #[tracing::instrument(err, skip(self))]
+ async fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> Result<Option<TeamLinkShareDefault>, Self::Err> {
+ share_permission_db_utils::get_team_default_link_share(&self.pool, user_id).await
+ }
+
+ #[tracing::instrument(err, skip(self, args, share_permission))]
async fn create_document(
&self,
args: CreateDocumentRepoArgs,
+ share_permission: SharePermissionV2,
) -> Result<DocumentMetadata, Self::Err> {
let CreateDocumentRepoArgs {
id,
@@ -472,7 +482,7 @@ impl DocumentRepo for PgDocumentRepo {
.await?;
// Create share permission
- create::set_share_permission(&mut transaction, &document_id, file_type).await?;
+ create::set_share_permission(&mut transaction, &document_id, &share_permission).await?;
// Add to user history (if not skipped)
if !skip_history {
@@ -1013,10 +1023,11 @@ impl DocumentRepo for PgDocumentRepo {
Ok(children)
}
- #[tracing::instrument(err, skip(self, args))]
+ #[tracing::instrument(err, skip(self, args, share_permission))]
async fn copy_document(
&self,
args: CopyDocumentRepoArgs,
+ share_permission: SharePermissionV2,
) -> Result<DocumentMetadata, Self::Err> {
let CopyDocumentRepoArgs {
original_document,
@@ -1059,9 +1070,7 @@ impl DocumentRepo for PgDocumentRepo {
}
// Create share permission
- create::set_share_permission(&mut transaction, &document_id, file_type).await?;
-
- // Insert user entity access (Owner level)
+ create::set_share_permission(&mut transaction, &document_id, &share_permission).await?;
// Insert user entity access (Owner level)
entity_access_db_utils::insert_entity_access_row(
diff --git a/crates/documents/src/outbound/pg_document_repo/create.rs b/crates/documents/src/outbound/pg_document_repo/create.rs
index 8291d274c4..a5c7aad731 100644
--- a/crates/documents/src/outbound/pg_document_repo/create.rs
+++ b/crates/documents/src/outbound/pg_document_repo/create.rs
@@ -152,14 +152,14 @@ pub async fn set_document_version(
}
/// Sets share permission for the document
-#[tracing::instrument(skip(transaction), err)]
+///
+/// The permission is resolved by the domain layer; this function persists it verbatim.
+#[tracing::instrument(skip(transaction, share_permission), err)]
pub async fn set_share_permission(
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
document_id: &uuid::Uuid,
- file_type: Option<FileType>,
-) -> Result<SharePermissionV2, sqlx::Error> {
- // Create share permission
- let share_permission = SharePermissionV2::new_document_share_permission(file_type);
+ share_permission: &SharePermissionV2,
+) -> Result<(), sqlx::Error> {
let link_share = share_permission.link_share.map(|value| value.to_string());
let link_share_access_level = share_permission.link_share_access_level;
@@ -192,7 +192,7 @@ pub async fn set_share_permission(
.execute(transaction.as_mut())
.await?;
- Ok(share_permission)
+ Ok(())
}
/// Set user history
diff --git a/crates/documents/src/outbound/pg_document_repo/tests.rs b/crates/documents/src/outbound/pg_document_repo/tests.rs
index 7ae651c213..f4f57b8c29 100644
--- a/crates/documents/src/outbound/pg_document_repo/tests.rs
+++ b/crates/documents/src/outbound/pg_document_repo/tests.rs
@@ -5,7 +5,9 @@ use models_permissions::share_permission::access_level::AccessLevel;
use models_permissions::share_permission::channel_share_permission::{
UpdateChannelSharePermission, UpdateOperation,
};
-use models_permissions::share_permission::{LinkShare, UpdateSharePermissionRequestV2};
+use models_permissions::share_permission::{
+ LinkShare, SharePermissionV2, TeamLinkShareDefault, UpdateSharePermissionRequestV2,
+};
use sqlx::{Pool, Postgres, Row};
use crate::domain::models::{
@@ -47,14 +49,23 @@ fn create_document_args(
}
}
+/// The no-team default permission for an md document — the repo persists whatever
+/// the domain layer resolved, so tests pass it explicitly.
+fn md_share_permission() -> SharePermissionV2 {
+ SharePermissionV2::new_document_share_permission(Some(model::document::FileType::Md), None)
+}
+
async fn create_task_for_team(
repo: &PgDocumentRepo,
user_id: &str,
team_id: uuid::Uuid,
) -> model::document::DocumentMetadata {
- repo.create_document(create_document_args(user_id, true, Some(team_id)))
- .await
- .unwrap()
+ repo.create_document(
+ create_document_args(user_id, true, Some(team_id)),
+ md_share_permission(),
+ )
+ .await
+ .unwrap()
}
async fn team_task_numbers(pool: &Pool<Postgres>, team_id: uuid::Uuid) -> Vec<i32> {
@@ -371,7 +382,10 @@ async fn test_get_user_view_location(pool: Pool<Postgres>) {
async fn test_create_document_writes_link_share_fields(pool: Pool<Postgres>) {
let repo = PgDocumentRepo::new(pool.clone());
let document = repo
- .create_document(create_document_args(TEST_DOCUMENT_OWNER_ID, false, None))
+ .create_document(
+ create_document_args(TEST_DOCUMENT_OWNER_ID, false, None),
+ md_share_permission(),
+ )
.await
.unwrap();
@@ -381,6 +395,29 @@ async fn test_create_document_writes_link_share_fields(pool: Pool<Postgres>) {
assert_eq!(result.link_share_access_level.as_deref(), Some("edit"));
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../fixtures", scripts("documents_test_data"))
+)]
+async fn test_create_document_persists_resolved_team_share_permission(pool: Pool<Postgres>) {
+ let repo = PgDocumentRepo::new(pool.clone());
+ let document = repo
+ .create_document(
+ create_document_args(TEST_DOCUMENT_OWNER_ID, false, None),
+ SharePermissionV2::new_document_share_permission(
+ Some(model::document::FileType::Md),
+ Some(TeamLinkShareDefault(Some(LinkShare::Team))),
+ ),
+ )
+ .await
+ .unwrap();
+
+ let result = share_permission_columns(&pool, &document.document_id).await;
+
+ assert_eq!(result.link_share.as_deref(), Some("TEAM"));
+ assert_eq!(result.link_share_access_level.as_deref(), Some("edit"));
+}
+
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
fixtures(path = "../../../fixtures", scripts("documents_test_data"))
@@ -881,7 +918,10 @@ async fn test_team_share_no_team_owner(pool: Pool<Postgres>) {
// Create a document owned by a user without a team
let metadata = repo
- .create_document(create_document_args("macro|[email protected]", false, None))
+ .create_document(
+ create_document_args("macro|[email protected]", false, None),
+ md_share_permission(),
+ )
.await
.unwrap();
@@ -1096,11 +1136,10 @@ async fn test_non_task_document_does_not_create_team_task_row(pool: Pool<Postgre
let repo = PgDocumentRepo::new(pool);
let metadata = repo
- .create_document(create_document_args(
- false,
- Some(TEST_TEAM_ID),
- ))
+ .create_document(
+ create_document_args("macro|[email protected]", false, Some(TEST_TEAM_ID)),
+ md_share_permission(),
+ )
.await
.unwrap();
@@ -1120,7 +1159,10 @@ async fn test_task_without_team_id_does_not_create_team_task_row(pool: Pool<Post
let repo = PgDocumentRepo::new(pool);
let metadata = repo
- .create_document(create_document_args("macro|[email protected]", true, None))
+ .create_document(
+ create_document_args("macro|[email protected]", true, None),
+ md_share_permission(),
+ )
.await
.unwrap();
@@ -1170,13 +1212,16 @@ async fn test_copying_task_allocates_new_team_task_number(pool: Pool<Postgres>)
let original = create_task_for_team(&repo, "macro|[email protected]", TEST_TEAM_ID).await;
let copied = repo
- .copy_document(CopyDocumentRepoArgs {
- original_document: original,
- user_id: user_id("macro|[email protected]"),
- document_name: "copied task".to_string(),
- file_type: Some(model::document::FileType::Md),
- team_id: Some(TEST_TEAM_ID),
- })
+ .copy_document(
+ CopyDocumentRepoArgs {
+ original_document: original,
+ user_id: user_id("macro|[email protected]"),
+ document_name: "copied task".to_string(),
+ file_type: Some(model::document::FileType::Md),
+ team_id: Some(TEST_TEAM_ID),
+ },
+ md_share_permission(),
+ )
.await
.unwrap();
diff --git a/crates/macro_db_client/migrations/20260818125246_add_team_default_link_share.sql b/crates/macro_db_client/migrations/20260818125246_add_team_default_link_share.sql
new file mode 100644
index 0000000000..38e3b766b5
--- /dev/null
+++ b/crates/macro_db_client/migrations/20260818125246_add_team_default_link_share.sql
@@ -0,0 +1,8 @@
+-- The team-wide default link-share scope applied when items are shared via
+-- link without an explicit choice. Mirrors "SharePermission"."linkShare":
+-- NULL = link sharing off by default, TEAM = team members with the link,
+-- PUBLIC = anyone with the link. Defaults to TEAM (backfills existing rows).
+ALTER TABLE team
+ ADD COLUMN default_link_share TEXT DEFAULT 'TEAM',
+ ADD CONSTRAINT team_default_link_share_check
+ CHECK (default_link_share IN ('PUBLIC', 'TEAM'));
diff --git a/crates/macro_db_client/src/document/create_blank_docx.rs b/crates/macro_db_client/src/document/create_blank_docx.rs
index 8ed4f40b41..6271e0014e 100644
--- a/crates/macro_db_client/src/document/create_blank_docx.rs
+++ b/crates/macro_db_client/src/document/create_blank_docx.rs
@@ -176,7 +176,7 @@ mod tests {
"document-name",
MacroUserIdStr::parse_from_str("macro|[email protected]").unwrap(),
None,
- &SharePermissionV2::new_document_share_permission(Some(FileType::Docx)),
+ &SharePermissionV2::new_document_share_permission(Some(FileType::Docx), None),
vec![SaveBomPart {
sha: "sha".to_string(),
path: "path".to_string(),
diff --git a/crates/macro_db_client/src/document/v2/create.rs b/crates/macro_db_client/src/document/v2/create.rs
index 09c8813100..20edf3dd00 100644
--- a/crates/macro_db_client/src/document/v2/create.rs
+++ b/crates/macro_db_client/src/document/v2/create.rs
@@ -351,9 +351,10 @@ mod tests {
file_type: Some(FileType::Pdf),
project_id: Some("project-one"),
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(
- FileType::Pdf,
- )),
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Pdf),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: Some(&ts),
@@ -380,9 +381,10 @@ mod tests {
file_type: Some(FileType::Docx),
project_id: None,
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(
- FileType::Docx,
- )),
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Docx),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: None,
@@ -421,9 +423,10 @@ mod tests {
file_type: Some(FileType::Pdf),
project_id: Some("project-one"),
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(
- FileType::Pdf,
- )),
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Pdf),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: Some(&ts),
@@ -453,9 +456,10 @@ mod tests {
file_type: Some(FileType::Docx),
project_id: None,
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(
- FileType::Docx,
- )),
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Docx),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: None,
@@ -487,9 +491,10 @@ mod tests {
file_type: Some(FileType::Pdf),
project_id: None,
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(
- FileType::Pdf,
- )),
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Pdf),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: None,
diff --git a/crates/macro_db_client/src/instructions/create.rs b/crates/macro_db_client/src/instructions/create.rs
index 467865e4f1..bdbef89193 100644
--- a/crates/macro_db_client/src/instructions/create.rs
+++ b/crates/macro_db_client/src/instructions/create.rs
@@ -31,7 +31,12 @@ pub async fn create_instructions_document(
file_type: Some(FileType::Md),
project_id: None,
project_name: None,
- share_permission: &SharePermissionV2::new_document_share_permission(Some(FileType::Md)),
+ // System-created singleton, not a user "creating an item": the
+ // team default link-share preference intentionally does not apply.
+ share_permission: &SharePermissionV2::new_document_share_permission(
+ Some(FileType::Md),
+ None,
+ ),
skip_history: false,
email_attachment_id: None,
created_at: None,
diff --git a/crates/macro_middleware/src/cloud_storage/thread/ensure_thread_exists.rs b/crates/macro_middleware/src/cloud_storage/thread/ensure_thread_exists.rs
index 99680ac270..6d0223e689 100644
--- a/crates/macro_middleware/src/cloud_storage/thread/ensure_thread_exists.rs
+++ b/crates/macro_middleware/src/cloud_storage/thread/ensure_thread_exists.rs
@@ -65,7 +65,9 @@ pub async fn insert_thread_share_permissions(
anyhow::bail!("thread not found");
};
- // Create a new share permission
+ // Create a new share permission. Threads are synced email, not user-created
+ // items, so the team default link-share preference intentionally does not
+ // apply: link sharing is always off initially.
let share_permission = SharePermissionV2 {
id: macro_uuid::generate_uuid_v7().to_string(),
link_share: None,
diff --git a/crates/models_permissions/src/share_permission/mod.rs b/crates/models_permissions/src/share_permission/mod.rs
index 82719d9f18..7590a95a0e 100644
--- a/crates/models_permissions/src/share_permission/mod.rs
+++ b/crates/models_permissions/src/share_permission/mod.rs
@@ -29,6 +29,12 @@ pub struct SharePermissionV2 {
pub channel_share_permissions: Option<Vec<ChannelSharePermission>>,
}
+/// The owner's team link-share preference. `Some(scope)` = the team wants new items link-shared
+/// at `scope`; `None` = the team wants link sharing off by default.
+/// (Wrapped so call sites can't confuse "no team" with "team says off".)
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TeamLinkShareDefault(pub Option<LinkShare>);
+
impl SharePermissionV2 {
fn new(link_share: Option<LinkShare>, link_share_access_level: Option<AccessLevel>) -> Self {
SharePermissionV2 {
@@ -40,24 +46,50 @@ impl SharePermissionV2 {
}
}
+ /// Resolves the initial link share for a new item: no team → the entity-type default; a team
+ /// scope → that scope with the entity's default level (else `View`); a team that turned link
+ /// sharing off → off.
+ fn resolve(
+ team_default: Option<TeamLinkShareDefault>,
+ entity_default: (Option<LinkShare>, Option<AccessLevel>),
+ ) -> (Option<LinkShare>, Option<AccessLevel>) {
+ match team_default {
+ None => entity_default,
+ Some(TeamLinkShareDefault(Some(scope))) => (
+ Some(scope),
+ Some(entity_default.1.unwrap_or(AccessLevel::View)),
+ ),
+ Some(TeamLinkShareDefault(None)) => (None, None),
+ }
+ }
+
/// Creates a new share permission object for a document
- pub fn new_document_share_permission(file_type: Option<FileType>) -> Self {
- let (link_share, link_share_access_level) = match file_type {
+ pub fn new_document_share_permission(
+ file_type: Option<FileType>,
+ team_default: Option<TeamLinkShareDefault>,
+ ) -> Self {
+ let entity_default = match file_type {
Some(FileType::Md) => (Some(LinkShare::Public), Some(AccessLevel::Edit)),
_ => (None, None),
};
+ let (link_share, link_share_access_level) = Self::resolve(team_default, entity_default);
Self::new(link_share, link_share_access_level)
}
/// Creates a new share permission object for an ai chat
- pub fn new_chat_share_permission() -> Self {
- Self::new(Some(LinkShare::Public), Some(AccessLevel::View))
+ pub fn new_chat_share_permission(team_default: Option<TeamLinkShareDefault>) -> Self {
+ let (link_share, link_share_access_level) = Self::resolve(
+ team_default,
+ (Some(LinkShare::Public), Some(AccessLevel::View)),
+ );
+ Self::new(link_share, link_share_access_level)
}
/// Creates a new share permission object for a project
- pub fn new_project_share_permission() -> Self {
- Self::new(None, None)
+ pub fn new_project_share_permission(team_default: Option<TeamLinkShareDefault>) -> Self {
+ let (link_share, link_share_access_level) = Self::resolve(team_default, (None, None));
+ Self::new(link_share, link_share_access_level)
}
}
diff --git a/crates/models_permissions/src/share_permission/test.rs b/crates/models_permissions/src/share_permission/test.rs
index de79e2f38b..90fa43b47e 100644
--- a/crates/models_permissions/src/share_permission/test.rs
+++ b/crates/models_permissions/src/share_permission/test.rs
@@ -2,59 +2,140 @@ use model_file_type::FileType;
use serde_json::json;
use super::{
- LinkShare, SharePermissionV2, UpdateSharePermissionRequestV2, access_level::AccessLevel,
+ LinkShare, SharePermissionV2, TeamLinkShareDefault, UpdateSharePermissionRequestV2,
+ access_level::AccessLevel,
};
+fn share(
+ link_share: Option<LinkShare>,
+ link_share_access_level: Option<AccessLevel>,
+) -> SharePermissionV2 {
+ SharePermissionV2 {
+ id: String::new(),
+ link_share,
+ link_share_access_level,
+ owner: String::new(),
+ channel_share_permissions: None,
+ }
+}
+
+const TEAM_PUBLIC: Option<TeamLinkShareDefault> =
+ Some(TeamLinkShareDefault(Some(LinkShare::Public)));
+const TEAM_TEAM: Option<TeamLinkShareDefault> = Some(TeamLinkShareDefault(Some(LinkShare::Team)));
+const TEAM_OFF: Option<TeamLinkShareDefault> = Some(TeamLinkShareDefault(None));
+
#[test]
-fn document_constructor_uses_expected_link_share_defaults() {
- assert_eq!(
- SharePermissionV2::new_document_share_permission(Some(FileType::Md)),
- SharePermissionV2 {
- id: String::new(),
- link_share: Some(LinkShare::Public),
- link_share_access_level: Some(AccessLevel::Edit),
- owner: String::new(),
- channel_share_permissions: None,
- }
+fn document_constructor_without_team_uses_entity_defaults() {
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Md), None),
+ share(Some(LinkShare::Public), Some(AccessLevel::Edit))
);
assert_eq!(
- SharePermissionV2::new_document_share_permission(Some(FileType::Pdf)),
- SharePermissionV2 {
- id: String::new(),
- link_share: None,
- link_share_access_level: None,
- owner: String::new(),
- channel_share_permissions: None,
- }
+ SharePermissionV2::new_document_share_permission(Some(FileType::Pdf), None),
+ share(None, None)
);
}
#[test]
-fn chat_constructor_enables_public_view_access() {
- assert_eq!(
- SharePermissionV2::new_chat_share_permission(),
- SharePermissionV2 {
- id: String::new(),
- link_share: Some(LinkShare::Public),
- link_share_access_level: Some(AccessLevel::View),
- owner: String::new(),
- channel_share_permissions: None,
- }
+fn document_constructor_follows_team_scope_and_keeps_entity_level() {
+ // Md keeps its Edit level; only the scope follows the team preference.
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Md), TEAM_TEAM),
+ share(Some(LinkShare::Team), Some(AccessLevel::Edit))
+ );
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Md), TEAM_PUBLIC),
+ share(Some(LinkShare::Public), Some(AccessLevel::Edit))
+ );
+ // Non-md docs have no entity level, so a team scope falls back to View.
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Pdf), TEAM_TEAM),
+ share(Some(LinkShare::Team), Some(AccessLevel::View))
+ );
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Pdf), TEAM_PUBLIC),
+ share(Some(LinkShare::Public), Some(AccessLevel::View))
);
}
#[test]
-fn project_constructor_disables_link_sharing() {
- assert_eq!(
- SharePermissionV2::new_project_share_permission(),
- SharePermissionV2 {
- id: String::new(),
- link_share: None,
- link_share_access_level: None,
- owner: String::new(),
- channel_share_permissions: None,
- }
+fn document_constructor_respects_team_link_share_off() {
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Md), TEAM_OFF),
+ share(None, None)
);
+ assert_eq!(
+ SharePermissionV2::new_document_share_permission(Some(FileType::Pdf), TEAM_OFF),
+ share(None, None)
+ );
+}
+
+#[test]
+fn chat_constructor_without_team_enables_public_view_access() {
+ assert_eq!(
+ SharePermissionV2::new_chat_share_permission(None),
+ share(Some(LinkShare::Public), Some(AccessLevel::View))
+ );
+}
+
+#[test]
+fn chat_constructor_follows_team_default() {
+ assert_eq!(
+ SharePermissionV2::new_chat_share_permission(TEAM_PUBLIC),
+ share(Some(LinkShare::Public), Some(AccessLevel::View))
+ );
+ assert_eq!(
+ SharePermissionV2::new_chat_share_permission(TEAM_TEAM),
+ share(Some(LinkShare::Team), Some(AccessLevel::View))
+ );
+ assert_eq!(
+ SharePermissionV2::new_chat_share_permission(TEAM_OFF),
+ share(None, None)
+ );
+}
+
+#[test]
+fn project_constructor_without_team_disables_link_sharing() {
+ assert_eq!(
+ SharePermissionV2::new_project_share_permission(None),
+ share(None, None)
+ );
+}
+
+#[test]
+fn project_constructor_follows_team_default() {
+ assert_eq!(
+ SharePermissionV2::new_project_share_permission(TEAM_PUBLIC),
+ share(Some(LinkShare::Public), Some(AccessLevel::View))
+ );
+ assert_eq!(
+ SharePermissionV2::new_project_share_permission(TEAM_TEAM),
+ share(Some(LinkShare::Team), Some(AccessLevel::View))
+ );
+ assert_eq!(
+ SharePermissionV2::new_project_share_permission(TEAM_OFF),
+ share(None, None)
+ );
+}
+
+#[test]
+fn resolved_permissions_never_have_a_level_without_a_scope() {
+ // Mirrors the DB check constraint: linkShareAccessLevel must be NULL when linkShare is NULL.
+ for team_default in [None, TEAM_PUBLIC, TEAM_TEAM, TEAM_OFF] {
+ for permission in [
+ SharePermissionV2::new_document_share_permission(Some(FileType::Md), team_default),
+ SharePermissionV2::new_document_share_permission(Some(FileType::Pdf), team_default),
+ SharePermissionV2::new_document_share_permission(None, team_default),
+ SharePermissionV2::new_chat_share_permission(team_default),
+ SharePermissionV2::new_project_share_permission(team_default),
+ ] {
+ if permission.link_share.is_none() {
+ assert_eq!(permission.link_share_access_level, None);
+ } else {
+ assert!(permission.link_share_access_level.is_some());
+ }
+ }
+ }
}
#[test]
diff --git a/crates/projects/Cargo.toml b/crates/projects/Cargo.toml
index c288b4d3d4..b127867517 100644
--- a/crates/projects/Cargo.toml
+++ b/crates/projects/Cargo.toml
@@ -31,6 +31,7 @@ outbound = [
"dep:entity_access_db_utils",
"dep:hex",
"dep:macro_sha_count_client",
+ "dep:share_permission_db_utils",
"dep:sqlx",
"dep:sqs_client",
"dep:system_properties",
@@ -99,6 +100,7 @@ dynamodb_client = { path = "../dynamodb_client", optional = true }
entity_access_db_utils = { path = "../entity_access_db_utils", optional = true }
hex = { workspace = true, optional = true }
macro_sha_count_client = { path = "../macro_sha_count_client", optional = true }
+share_permission_db_utils = { path = "../share_permission_db_utils", optional = true }
sqlx = { workspace = true, optional = true }
sqs_client = { path = "../sqs_client", default-features = false, features = [
"document",
diff --git a/crates/projects/src/domain/ports.rs b/crates/projects/src/domain/ports.rs
index bdbfa364f9..4b00a2f7d5 100644
--- a/crates/projects/src/domain/ports.rs
+++ b/crates/projects/src/domain/ports.rs
@@ -22,8 +22,8 @@ use models_bulk_upload::{
BulkUploadRequest, BulkUploadRequestDocuments, UploadExtractFolderRequest,
UploadExtractFolderResponseData,
};
-use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::{SharePermissionV2, TeamLinkShareDefault};
use s3_key::BulkUploadStagingKey;
use uuid::Uuid;
@@ -83,6 +83,13 @@ pub trait ProjectRepo: Send + Sync + 'static {
project_ids: &[String],
) -> impl Future<Output = Result<Vec<ProjectPreviewV2>, Self::Err>> + Send;
+ /// Get the link-share preference of the user's team, or `None` when the
+ /// user is not on a team.
+ fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> impl Future<Output = Result<Option<TeamLinkShareDefault>, Self::Err>> + Send;
+
/// Atomically create a project and its permission, history, and owner-access rows.
fn create_project(
&self,
diff --git a/crates/projects/src/domain/service.rs b/crates/projects/src/domain/service.rs
index 2016320a17..8d23c17067 100644
--- a/crates/projects/src/domain/service.rs
+++ b/crates/projects/src/domain/service.rs
@@ -314,6 +314,14 @@ where
) -> Result<Project, ProjectError> {
validate_project_name(&args.name)?;
+ // The owner's team default link-share preference decides the initial
+ // share permission; without a team, projects default to link sharing off.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(actor.as_ref())
+ .await
+ .map_err(|error| internal_error(error, "unable to resolve team default link share"))?;
+
let parent_id = args.project_parent_id.map(|id| id.to_string());
let project = self
.repo
@@ -321,7 +329,7 @@ where
user_id: actor.to_string(),
name: args.name,
parent_id: parent_id.clone(),
- share_permission: SharePermissionV2::new_project_share_permission(),
+ share_permission: SharePermissionV2::new_project_share_permission(team_default),
})
.await
.map_err(|error| internal_error(error, "unable to create project"))?;
@@ -605,11 +613,20 @@ where
let event_parent_project_id = args.parent_id.clone();
let root_folder = build_root_folder(&args.root_folder_name, args.content)
.map_err(|error| internal_error(error, "unable to prepare folder upload"))?;
+
+ // The uploaded projects and documents all share the owner's team-derived
+ // permission; without a team, link sharing defaults to off.
+ let team_default = self
+ .repo
+ .get_team_default_link_share(actor.as_ref())
+ .await
+ .map_err(|error| internal_error(error, "unable to resolve team default link share"))?;
+
let uploaded = self
.repo
.upload_folder(UploadFolderRepoArgs {
user_id: actor,
- share_permission: SharePermissionV2::new_project_share_permission(),
+ share_permission: SharePermissionV2::new_project_share_permission(team_default),
root_folder,
root_folder_name: args.root_folder_name,
upload_request_id: args.upload_request_id,
diff --git a/crates/projects/src/domain/service/tests.rs b/crates/projects/src/domain/service/tests.rs
index a25e109a41..b0bcd48626 100644
--- a/crates/projects/src/domain/service/tests.rs
+++ b/crates/projects/src/domain/service/tests.rs
@@ -647,6 +647,8 @@ async fn create_uses_grapheme_limit_and_orchestrates_parent_side_effects() {
let accepted_name = "👨‍👩‍👧‍👦".repeat(100);
let expected_name = accepted_name.clone();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_create_project()
.withf(move |args| {
args.name == expected_name
@@ -705,6 +707,8 @@ async fn create_project_publishes_repository_metadata_after_success() {
let created_at = chrono::Utc::now();
let expected_created_at = serde_json::to_value(created_at).unwrap();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_create_project().return_once(move |_| {
Box::pin(async move {
let mut created = project(
@@ -755,6 +759,8 @@ async fn create_project_publishes_repository_metadata_after_success() {
#[tokio::test]
async fn create_project_failures_publish_no_event() {
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_create_project()
.return_once(|_| Box::pin(async { Err(anyhow::anyhow!("database unavailable")) }));
let event_broker = TestEventBroker::default();
@@ -794,6 +800,8 @@ async fn create_project_failures_publish_no_event() {
async fn create_project_succeeds_when_event_publication_fails() {
let project_id = Uuid::new_v4();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_create_project().return_once(move |_| {
Box::pin(async move {
Ok(project(
@@ -824,6 +832,44 @@ async fn create_project_succeeds_when_event_publication_fails() {
assert_eq!(result.id, project_id.to_string());
}
+#[tokio::test]
+async fn create_project_resolves_share_permission_from_team_default() {
+ use models_permissions::share_permission::access_level::AccessLevel;
+ use models_permissions::share_permission::{LinkShare, TeamLinkShareDefault};
+
+ let project_id = Uuid::new_v4();
+ let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .withf(|user_id| user_id == "macro|[email protected]")
+ .returning(|_| Box::pin(async { Ok(Some(TeamLinkShareDefault(Some(LinkShare::Team)))) }));
+ repo.expect_create_project()
+ .withf(|args| {
+ args.share_permission.link_share == Some(LinkShare::Team)
+ && args.share_permission.link_share_access_level == Some(AccessLevel::View)
+ })
+ .return_once(move |_| {
+ Box::pin(async move {
+ Ok(project(
+ &project_id.to_string(),
+ None,
+ ))
+ })
+ });
+ let service = mutation_service(repo, RecordingEam::default(), RecordingIndexer::default());
+
+ service
+ .create_project(
+ user_id("macro|[email protected]"),
+ CreateProjectRequest {
+ name: "Project".to_string(),
+ project_parent_id: None,
+ },
+ )
+ .await
+ .unwrap();
+}
+
#[tokio::test]
async fn edit_project_publishes_requested_update_metadata() {
struct Case {
@@ -1986,6 +2032,8 @@ async fn upload_folder_publishes_uploaded_event() {
let project_ids = vec!["root-project".to_string(), "child-project".to_string()];
let expected_project_ids = project_ids.clone();
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_upload_folder()
.withf(|args| {
args.user_id.as_ref() == "macro|[email protected]"
@@ -2065,6 +2113,8 @@ async fn upload_folder_publishes_uploaded_event() {
#[tokio::test]
async fn upload_folder_with_no_project_ids_publishes_no_event() {
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_upload_folder().return_once(|_| {
Box::pin(async {
Ok(UploadFolderWithIdsResponse {
@@ -2101,6 +2151,8 @@ async fn upload_folder_with_no_project_ids_publishes_no_event() {
#[tokio::test]
async fn upload_folder_compensates_after_destination_failure() {
let mut repo = MockProjectRepo::new();
+ repo.expect_get_team_default_link_share()
+ .returning(|_| Box::pin(async { Ok(None) }));
repo.expect_upload_folder().return_once(|_| {
Box::pin(async {
Ok(UploadFolderWithIdsResponse {
diff --git a/crates/projects/src/outbound/pg_project_repo.rs b/crates/projects/src/outbound/pg_project_repo.rs
index bea0d2c163..c921b8aaec 100644
--- a/crates/projects/src/outbound/pg_project_repo.rs
+++ b/crates/projects/src/outbound/pg_project_repo.rs
@@ -42,6 +42,14 @@ impl PgProjectRepo {
impl ProjectRepo for PgProjectRepo {
type Err = sqlx::Error;
+ #[tracing::instrument(err, skip(self))]
+ async fn get_team_default_link_share(
+ &self,
+ user_id: &str,
+ ) -> Result<Option<models_permissions::share_permission::TeamLinkShareDefault>, Self::Err> {
+ share_permission_db_utils::get_team_default_link_share(&self.pool, user_id).await
+ }
+
#[tracing::instrument(err, skip(self))]
async fn get_basic_project(&self, project_id: &str) -> Result<Option<BasicProject>, Self::Err> {
sqlx::query!(
diff --git a/crates/projects/src/outbound/pg_project_repo/tests.rs b/crates/projects/src/outbound/pg_project_repo/tests.rs
index 9927a7791f..0978c74d42 100644
--- a/crates/projects/src/outbound/pg_project_repo/tests.rs
+++ b/crates/projects/src/outbound/pg_project_repo/tests.rs
@@ -207,7 +207,7 @@ async fn reads_share_permissions_and_bumps_modified_timestamp(
)]
async fn create_is_atomic_and_inserts_all_metadata(pool: Pool<Postgres>) -> anyhow::Result<()> {
let repo = PgProjectRepo::new(pool.clone());
- let permission = SharePermissionV2::new_project_share_permission();
+ let permission = SharePermissionV2::new_project_share_permission(None);
let project = repo
.create_project(CreateProjectArgs {
user_id: "macro|[email protected]".to_owned(),
@@ -265,7 +265,7 @@ async fn create_is_atomic_and_inserts_all_metadata(pool: Pool<Postgres>) -> anyh
)]
async fn create_defaults_enabled_link_share_to_view(pool: Pool<Postgres>) -> anyhow::Result<()> {
let repo = PgProjectRepo::new(pool.clone());
- let mut permission = SharePermissionV2::new_project_share_permission();
+ let mut permission = SharePermissionV2::new_project_share_permission(None);
permission.link_share = Some(LinkShare::Team);
let project = repo
@@ -619,7 +619,7 @@ async fn upload_folder_preserves_tree_metadata_and_compensates(
),
("Empty".to_owned(), FileSystemNode::Folder(HashMap::new())),
]));
- let mut share_permission = SharePermissionV2::new_project_share_permission();
+ let mut share_permission = SharePermissionV2::new_project_share_permission(None);
share_permission.link_share = Some(LinkShare::Team);
let result = repo
.upload_folder(UploadFolderRepoArgs {
diff --git a/crates/share_permission_db_utils/Cargo.toml b/crates/share_permission_db_utils/Cargo.toml
index d59ab99dc1..4512e89878 100644
--- a/crates/share_permission_db_utils/Cargo.toml
+++ b/crates/share_permission_db_utils/Cargo.toml
@@ -12,3 +12,7 @@ macro_uuid = { path = "../macro_uuid" }
models_permissions = { path = "../models_permissions" }
sqlx = { workspace = true }
workspace-hack = { version = "0.1", path = "../workspace-hack" }
+
+[dev-dependencies]
+macro_db_migrator = { path = "../macro_db_migrator" }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
diff --git a/crates/share_permission_db_utils/fixtures/team_link_share.sql b/crates/share_permission_db_utils/fixtures/team_link_share.sql
new file mode 100644
index 0000000000..5a2102dff8
--- /dev/null
+++ b/crates/share_permission_db_utils/fixtures/team_link_share.sql
@@ -0,0 +1,25 @@
+INSERT INTO macro_user (id, username, email, stripe_customer_id)
+VALUES
+ ('b1111111-1111-1111-1111-111111111111', '[email protected]', '[email protected]', 'cus_team_scope'),
+ ('b2222222-2222-2222-2222-222222222222', '[email protected]', '[email protected]', 'cus_public_scope'),
+ ('b3333333-3333-3333-3333-333333333333', '[email protected]', '[email protected]', 'cus_off_scope'),
+ ('b4444444-4444-4444-4444-444444444444', '[email protected]', '[email protected]', 'cus_no_team');
+
+INSERT INTO "User" (id, email, name, macro_user_id)
+VALUES
+ ('macro|[email protected]', '[email protected]', 'Team Scope', 'b1111111-1111-1111-1111-111111111111'),
+ ('macro|[email protected]', '[email protected]', 'Public Scope', 'b2222222-2222-2222-2222-222222222222'),
+ ('macro|[email protected]', '[email protected]', 'Off Scope', 'b3333333-3333-3333-3333-333333333333'),
+ ('macro|[email protected]', '[email protected]', 'No Team', 'b4444444-4444-4444-4444-444444444444');
+
+INSERT INTO team (id, name, owner_id, seat_count, default_link_share)
+VALUES
+ ('c1111111-1111-1111-1111-111111111111', 'team-default-team', 'macro|[email protected]', 1, 'TEAM'),
+ ('c2222222-2222-2222-2222-222222222222', 'team-default-public', 'macro|[email protected]', 1, 'PUBLIC'),
+ ('c3333333-3333-3333-3333-333333333333', 'team-default-off', 'macro|[email protected]', 1, NULL);
+
+INSERT INTO team_user (team_id, user_id, team_role)
+VALUES
+ ('c1111111-1111-1111-1111-111111111111', 'macro|[email protected]', 'owner'),
+ ('c2222222-2222-2222-2222-222222222222', 'macro|[email protected]', 'owner'),
+ ('c3333333-3333-3333-3333-333333333333', 'macro|[email protected]', 'member');
diff --git a/crates/share_permission_db_utils/src/lib.rs b/crates/share_permission_db_utils/src/lib.rs
index 231fcc3a67..0ef8e484fd 100644
--- a/crates/share_permission_db_utils/src/lib.rs
+++ b/crates/share_permission_db_utils/src/lib.rs
@@ -3,8 +3,42 @@
use anyhow::Context;
use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
use models_permissions::share_permission::access_level::AccessLevel;
+use models_permissions::share_permission::{LinkShare, TeamLinkShareDefault};
use sqlx::{Executor, PgPool, Postgres};
+#[cfg(test)]
+mod test;
+
+/// Look up the link-share preference of the user's team.
+///
+/// Returns `None` if the user is not on a team; otherwise the team's preference, where an inner
+/// `None` means the team turned link sharing off by default. If a user somehow belongs to
+/// multiple teams the strongest membership wins (`team_role` orders `member < admin < owner`),
+/// mirroring `entity_access`'s `get_user_team`.
+pub async fn get_team_default_link_share<'e, E>(
+ executor: E,
+ user_id: &str,
+) -> Result<Option<TeamLinkShareDefault>, sqlx::Error>
+where
+ E: Executor<'e, Database = Postgres>,
+{
+ let row = sqlx::query!(
+ r#"
+ SELECT t.default_link_share as "default_link_share: LinkShare"
+ FROM team_user tu
+ JOIN team t ON t.id = tu.team_id
+ WHERE tu.user_id = $1
+ ORDER BY tu.team_role DESC
+ LIMIT 1
+ "#,
+ user_id,
+ )
+ .fetch_optional(executor)
+ .await?;
+
+ Ok(row.map(|r| TeamLinkShareDefault(r.default_link_share)))
+}
+
/// The result of attempting to insert a channel share permission row.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum InsertChannelSharePermissionResult {
@@ -126,6 +160,10 @@ where
}
/// Ensure a thread has a share permission and owner entity-access row.
+///
+/// Threads are synced email, not user-created items, so the team default
+/// link-share preference intentionally does not apply: link sharing is always
+/// off initially (the insert below writes NULL link-share columns).
pub async fn ensure_thread_share_permission(pool: &PgPool, thread_id: &str) -> anyhow::Result<()> {
let existing_share_permission_id = sqlx::query_scalar!(
r#"
diff --git a/crates/share_permission_db_utils/src/test.rs b/crates/share_permission_db_utils/src/test.rs
new file mode 100644
index 0000000000..319b695178
--- /dev/null
+++ b/crates/share_permission_db_utils/src/test.rs
@@ -0,0 +1,48 @@
+use macro_db_migrator::MACRO_DB_MIGRATIONS;
+use sqlx::{Pool, Postgres};
+
+use super::*;
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("team_link_share"))
+)]
+async fn get_team_default_link_share_returns_the_team_preference(
+ pool: Pool<Postgres>,
+) -> anyhow::Result<()> {
+ // Note: `team_user` has a unique constraint on `user_id`, so the defensive
+ // multi-team tie-break in the query cannot be exercised with fixtures.
+ assert_eq!(
+ get_team_default_link_share(&pool, "macro|[email protected]").await?,
+ Some(TeamLinkShareDefault(Some(LinkShare::Team)))
+ );
+ assert_eq!(
+ get_team_default_link_share(&pool, "macro|[email protected]").await?,
+ Some(TeamLinkShareDefault(Some(LinkShare::Public)))
+ );
+ assert_eq!(
+ get_team_default_link_share(&pool, "macro|[email protected]").await?,
+ Some(TeamLinkShareDefault(None))
+ );
+
+ Ok(())
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("team_link_share"))
+)]
+async fn get_team_default_link_share_returns_none_without_a_team(
+ pool: Pool<Postgres>,
+) -> anyhow::Result<()> {
+ assert_eq!(
+ get_team_default_link_share(&pool, "macro|[email protected]").await?,
+ None
+ );
+ assert_eq!(
+ get_team_default_link_share(&pool, "macro|[email protected]").await?,
+ None
+ );
+
+ Ok(())
+}
diff --git a/crates/teams/Cargo.toml b/crates/teams/Cargo.toml
index 35ae8000dd..acd29ad9b7 100644
--- a/crates/teams/Cargo.toml
+++ b/crates/teams/Cargo.toml
@@ -60,6 +60,7 @@ macro_event_broker = { path = "../macro_event_broker", default-features = false
macro_event_topics = { path = "../macro_event_topics" }
macro_user_id = { path = "../macro_user_id" }
macro_uuid = { path = "../macro_uuid" }
+models_permissions = { path = "../models_permissions" }
non_empty = { path = "../non_empty" }
roles_and_permissions = { path = "../roles_and_permissions", default-features = false, features = [
"ports",
diff --git a/crates/teams/src/domain/model.rs b/crates/teams/src/domain/model.rs
index ed6114a268..054e8a877a 100644
--- a/crates/teams/src/domain/model.rs
+++ b/crates/teams/src/domain/model.rs
@@ -4,6 +4,7 @@ use std::collections::HashMap;
use chrono::{DateTime, Utc};
use macro_user_id::{email::Email, lowercased::Lowercase, user_id::MacroUserIdStr};
+use models_permissions::share_permission::LinkShare;
use roles_and_permissions::domain::model::UserRolesAndPermissionsError;
/// Team plans
@@ -238,6 +239,15 @@ pub struct TeamInviteDetails {
pub last_sent_at: DateTime<Utc>,
}
+/// Deserializes an optional field while preserving explicit `null` values.
+fn double_option<'de, T, D>(deserializer: D) -> Result<Option<Option<T>>, D::Error>
+where
+ T: serde::Deserialize<'de>,
+ D: serde::Deserializer<'de>,
+{
+ serde::Deserialize::deserialize(deserializer).map(Some)
+}
+
/// Request to update a team
#[derive(Debug, serde::Deserialize)]
#[cfg_attr(feature = "axum", derive(utoipa::ToSchema))]
@@ -248,6 +258,10 @@ pub struct PatchTeamRequest {
pub slug: Option<String>,
/// Role updates to apply to team users
pub user_role_updates: Option<Vec<PatchTeamUserRole>>,
+ /// The default link-share scope for items owned by the team. Omit to
+ /// leave unchanged or pass `null` to default to link sharing off.
+ #[serde(default, deserialize_with = "double_option")]
+ pub default_link_share: Option<Option<LinkShare>>,
}
/// Request to update the team plan
@@ -326,6 +340,10 @@ pub struct Team {
/// Whether non-admin members may invite users to the team. Defaults to
/// true; admins can turn it off so only admins/owners may invite.
pub(crate) allow_non_admin_invites: bool,
+ /// The default link-share scope applied when items owned by the team are
+ /// shared via link without an explicit choice. `None` means link sharing
+ /// is off by default. Defaults to [`LinkShare::Team`].
+ pub(crate) default_link_share: Option<LinkShare>,
}
impl Team {
@@ -348,6 +366,7 @@ impl Team {
auto_join_domain: None,
enterprise,
allow_non_admin_invites: true,
+ default_link_share: Some(LinkShare::Team),
}
}
}
@@ -392,6 +411,12 @@ impl Team {
pub fn allow_non_admin_invites(&self) -> bool {
self.allow_non_admin_invites
}
+
+ /// The default link-share scope for items owned by the team, or `None`
+ /// when link sharing is off by default
+ pub fn default_link_share(&self) -> Option<LinkShare> {
+ self.default_link_share
+ }
}
/// Request to create a new team
diff --git a/crates/teams/src/domain/model/test.rs b/crates/teams/src/domain/model/test.rs
index a3a76c34c7..8de9e28a32 100644
--- a/crates/teams/src/domain/model/test.rs
+++ b/crates/teams/src/domain/model/test.rs
@@ -44,6 +44,28 @@ fn serialized_team_preserves_enterprise_value() {
}
}
+#[test]
+fn new_team_defaults_link_share_to_team() {
+ let team = team_with_enterprise_status(false);
+ assert_eq!(team.default_link_share(), Some(LinkShare::Team));
+
+ let serialized = serde_json::to_value(team).unwrap();
+ assert_eq!(serialized["default_link_share"], "TEAM");
+}
+
+#[test]
+fn patch_team_request_distinguishes_omitted_and_null_default_link_share() {
+ let omitted: PatchTeamRequest = serde_json::from_str("{}").unwrap();
+ assert_eq!(omitted.default_link_share, None);
+
+ let null: PatchTeamRequest = serde_json::from_str(r#"{"default_link_share": null}"#).unwrap();
+ assert_eq!(null.default_link_share, Some(None));
+
+ let set: PatchTeamRequest =
+ serde_json::from_str(r#"{"default_link_share": "PUBLIC"}"#).unwrap();
+ assert_eq!(set.default_link_share, Some(Some(LinkShare::Public)));
+}
+
#[test]
fn invite_users_to_team_error_preserves_customer_storage_error() {
let error = InviteUsersToTeamError::from(customer_storage_error());
diff --git a/crates/teams/src/domain/team_service/test.rs b/crates/teams/src/domain/team_service/test.rs
index de3f22d1dd..567f012d35 100644
--- a/crates/teams/src/domain/team_service/test.rs
+++ b/crates/teams/src/domain/team_service/test.rs
@@ -3116,6 +3116,7 @@ async fn test_patch_team_rejects_owner_role_assignment() {
.into_owned(),
role: TeamRole::Owner,
}]),
+ default_link_share: None,
};
let receipt = test_team_receipt::<AdminTeamRole>(
@@ -3153,6 +3154,7 @@ async fn test_patch_team_rejects_owner_downgrade() {
team_user_id: owner_id.clone(),
role: TeamRole::Member,
}]),
+ default_link_share: None,
};
let receipt = test_team_receipt::<AdminTeamRole>(team_id, &owner_id);
@@ -3199,6 +3201,7 @@ async fn test_patch_team_applies_role_updates_and_name() {
role: TeamRole::Member,
},
]),
+ default_link_share: None,
};
let receipt = test_team_receipt::<AdminTeamRole>(team_id, &owner_id);
@@ -3249,6 +3252,7 @@ async fn test_patch_team_empty_role_updates() {
name: Some("New Name".to_string()),
slug: None,
user_role_updates: Some(Vec::new()),
+ default_link_share: None,
};
let receipt = test_team_receipt::<AdminTeamRole>(team_id, &owner_id);
@@ -3273,6 +3277,7 @@ async fn test_patch_team_metadata_publishes_updated_with_omitted_fields() {
name: Some("Renamed".to_string()),
slug: None,
user_role_updates: None,
+ default_link_share: None,
};
service
@@ -3316,6 +3321,7 @@ async fn test_patch_team_role_only_publishes_previous_role_without_updated_event
team_user_id: member.clone().into_owned(),
role: TeamRole::Admin,
}]),
+ default_link_share: None,
};
service
@@ -3370,6 +3376,7 @@ async fn test_patch_team_partial_role_failure_keeps_ordered_success_events() {
role: TeamRole::Member,
},
]),
+ default_link_share: None,
};
assert!(
@@ -3399,6 +3406,7 @@ async fn test_patch_team_repository_failure_does_not_publish_updated() {
name: Some("Renamed".to_string()),
slug: None,
user_role_updates: None,
+ default_link_share: None,
};
assert!(
diff --git a/crates/teams/src/outbound/team_repo.rs b/crates/teams/src/outbound/team_repo.rs
index b4c442e64a..08c3fde4b7 100644
--- a/crates/teams/src/outbound/team_repo.rs
+++ b/crates/teams/src/outbound/team_repo.rs
@@ -14,6 +14,7 @@ use macro_user_id::{
lowercased::Lowercase,
user_id::MacroUserIdStr,
};
+use models_permissions::share_permission::LinkShare;
use sqlx::{PgPool, Row};
use std::str::FromStr;
@@ -101,7 +102,8 @@ impl TeamRepositoryImpl {
r#"
INSERT INTO team (id, name, slug, owner_id, seat_count, subscription_id, paying)
VALUES ($1, $2, $3, $4, 1, $5, $6)
- RETURNING id, name, slug, owner_id, enterprise, allow_non_admin_invites
+ RETURNING id, name, slug, owner_id, enterprise, allow_non_admin_invites,
+ default_link_share as "default_link_share: LinkShare"
"#,
id,
team_name,
@@ -124,6 +126,7 @@ impl TeamRepositoryImpl {
auto_join_domain: None,
enterprise: row.enterprise,
allow_non_admin_invites: row.allow_non_admin_invites,
+ default_link_share: row.default_link_share,
})
})
.fetch_one(&mut *transaction)
@@ -1038,6 +1041,7 @@ impl TeamRepository for TeamRepositoryImpl {
r#"
SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,
t.allow_non_admin_invites,
+ t.default_link_share as "default_link_share: LinkShare",
COALESCE(tcs.crm_enabled, FALSE) AS "crm_enabled!"
FROM team t
LEFT JOIN team_crm_settings tcs ON tcs.team_id = t.id
@@ -1057,6 +1061,7 @@ impl TeamRepository for TeamRepositoryImpl {
auto_join_domain: row.auto_join_domain,
enterprise: row.enterprise,
allow_non_admin_invites: row.allow_non_admin_invites,
+ default_link_share: row.default_link_share,
})
})
.fetch_one(&self.pool)
@@ -1096,6 +1101,7 @@ impl TeamRepository for TeamRepositoryImpl {
r#"
SELECT t.id, t.name, t.slug, t.owner_id, t.auto_join_domain, t.enterprise,
t.allow_non_admin_invites,
+ t.default_link_share as "default_link_share: LinkShare",
COALESCE(tcs.crm_enabled, FALSE) AS "crm_enabled!"
FROM team t
JOIN team_user tu ON t.id = tu.team_id
@@ -1116,6 +1122,7 @@ impl TeamRepository for TeamRepositoryImpl {
auto_join_domain: row.auto_join_domain,
enterprise: row.enterprise,
allow_non_admin_invites: row.allow_non_admin_invites,
+ default_link_share: row.default_link_share,
})
})
.fetch_all(&self.pool)
@@ -1214,7 +1221,6 @@ impl TeamRepository for TeamRepositoryImpl {
}
#[tracing::instrument(skip(self), err)]
- #[allow(clippy::disallowed_methods, reason = "legacy code. fix later")]
async fn patch_team(
&self,
team_id: &uuid::Uuid,
@@ -1222,19 +1228,28 @@ impl TeamRepository for TeamRepositoryImpl {
) -> Result<(), TeamError> {
let normalized_slug = req.slug.as_deref().map(normalize_team_slug).transpose()?;
- if req.name.is_some() || normalized_slug.is_some() {
- let result = sqlx::query(
+ // default_link_share needs a separate "provided" flag: NULL is a
+ // meaningful new value (link sharing off), so COALESCE can't express
+ // "keep".
+ let default_link_share_provided = req.default_link_share.is_some();
+ let default_link_share = req.default_link_share.flatten();
+
+ if req.name.is_some() || normalized_slug.is_some() || default_link_share_provided {
+ let result = sqlx::query!(
r#"
UPDATE team
SET
name = COALESCE($2, name),
- slug = COALESCE($3, slug)
+ slug = COALESCE($3, slug),
+ default_link_share = CASE WHEN $4 THEN $5 ELSE default_link_share END
WHERE id = $1
"#,
+ team_id,
+ req.name.as_deref(),
+ normalized_slug.as_deref(),
+ default_link_share_provided,
+ default_link_share as Option<LinkShare>,
)
- .bind(team_id)
- .bind(req.name.as_deref())
- .bind(normalized_slug.as_deref())
.execute(&self.pool)
.await?;
diff --git a/crates/teams/src/outbound/team_repo/test.rs b/crates/teams/src/outbound/team_repo/test.rs
index fe1a79d883..a5e5ba1b1d 100644
--- a/crates/teams/src/outbound/team_repo/test.rs
+++ b/crates/teams/src/outbound/team_repo/test.rs
@@ -1394,6 +1394,7 @@ async fn test_patch_team_normalizes_slug_to_screaming_snake_case(
name: Some("New Name".to_string()),
slug: Some("my-team slug".to_string()),
user_role_updates: None,
+ default_link_share: None,
};
team_repo.patch_team(&team_id, &req).await?;
@@ -1422,6 +1423,7 @@ async fn test_patch_team_rejects_invalid_slug_without_updating_name(
name: Some("Should Not Apply".to_string()),
slug: Some("bad.slug".to_string()),
user_role_updates: None,
+ default_link_share: None,
};
let err = team_repo.patch_team(&team_id, &req).await.err().unwrap();
@@ -1449,6 +1451,7 @@ async fn test_patch_team_rejects_too_long_slug(pool: Pool<Postgres>) -> anyhow::
name: None,
slug: Some("THIS_SLUG_IS_WAY_TOO_LONG".to_string()),
user_role_updates: None,
+ default_link_share: None,
};
let err = team_repo.patch_team(&team_id, &req).await.err().unwrap();
@@ -1458,6 +1461,54 @@ async fn test_patch_team_rejects_too_long_slug(pool: Pool<Postgres>) -> anyhow::
Ok(())
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../fixtures", scripts("teams"))
+)]
+async fn test_patch_team_default_link_share_round_trip(pool: Pool<Postgres>) -> anyhow::Result<()> {
+ let team_repo = TeamRepositoryImpl::new(pool);
+ let team_id = macro_uuid::string_to_uuid("11111111-1111-1111-1111-111111111111")?;
+
+ // Existing teams default to TEAM via the column default.
+ let team = team_repo.get_team_by_id(&team_id).await?;
+ assert_eq!(team.team.default_link_share(), Some(LinkShare::Team));
+
+ // Providing a value updates it.
+ let req = PatchTeamRequest {
+ name: None,
+ slug: None,
+ user_role_updates: None,
+ default_link_share: Some(Some(LinkShare::Public)),
+ };
+ team_repo.patch_team(&team_id, &req).await?;
+ let team = team_repo.get_team_by_id(&team_id).await?;
+ assert_eq!(team.team.default_link_share(), Some(LinkShare::Public));
+
+ // Omitting the field leaves it unchanged.
+ let req = PatchTeamRequest {
+ name: Some("Renamed".to_string()),
+ slug: None,
+ user_role_updates: None,
+ default_link_share: None,
+ };
+ team_repo.patch_team(&team_id, &req).await?;
+ let team = team_repo.get_team_by_id(&team_id).await?;
+ assert_eq!(team.team.default_link_share(), Some(LinkShare::Public));
+
+ // An explicit null turns default link sharing off.
+ let req = PatchTeamRequest {
+ name: None,
+ slug: None,
+ user_role_updates: None,
+ default_link_share: Some(None),
+ };
+ team_repo.patch_team(&team_id, &req).await?;
+ let team = team_repo.get_team_by_id(&team_id).await?;
+ assert_eq!(team.team.default_link_share(), None);
+
+ Ok(())
+}
+
#[sqlx::test(
migrator = "MACRO_DB_MIGRATIONS",
fixtures(path = "../../../fixtures", scripts("teams"))
diff --git a/packages/sdk/generated/auth/index.ts b/packages/sdk/generated/auth/index.ts
index e7cadf72ac..a83cec060d 100644
--- a/packages/sdk/generated/auth/index.ts
+++ b/packages/sdk/generated/auth/index.ts
@@ -1,4 +1,4 @@
// This file is auto-generated by @hey-api/openapi-ts
export { type Options, Sdk } from './sdk.gen';
-export type { AbGroup, AppleLoginData, AppleLoginError, AppleLoginErrors, AppleLoginRequest, AppleLoginResponse, AppleLoginResponses, CheckGithubLinkStatusData, CheckGithubLinkStatusError, CheckGithubLinkStatusErrors, CheckGithubLinkStatusResponse, CheckGithubLinkStatusResponses, CheckGmailLinkStatusData, CheckGmailLinkStatusError, CheckGmailLinkStatusErrors, CheckGmailLinkStatusResponse, CheckGmailLinkStatusResponses, CheckoutSessionMetadata, ClientOptions, CreateAccountMergeRequest, CreateCheckoutSessionV2Data, CreateCheckoutSessionV2Error, CreateCheckoutSessionV2Errors, CreateCheckoutSessionV2Request, CreateCheckoutSessionV2Response, CreateCheckoutSessionV2Responses, CreateInProgressLinkData, CreateInProgressLinkError, CreateInProgressLinkErrors, CreateInProgressLinkResponse, CreateInProgressLinkResponse2, CreateInProgressLinkResponses, CreateMergeRequestData, CreateMergeRequestError, CreateMergeRequestErrors, CreateMergeRequestResponse, CreateMergeRequestResponses, CreatePortalSessionData, CreatePortalSessionError, CreatePortalSessionErrors, CreatePortalSessionRequest, CreatePortalSessionResponse, CreatePortalSessionResponses, CreateTeamData, CreateTeamError, CreateTeamErrors, CreateTeamRequest, CreateTeamResponse, CreateTeamResponses, CreateUserData, CreateUserError, CreateUserErrors, CreateUserRequest, CreateUserResponse, CreateUserResponses, DeleteGithubLinkData, DeleteGithubLinkError, DeleteGithubLinkErrors, DeleteGithubLinkResponse, DeleteGithubLinkResponses, DeleteTeamData, DeleteTeamError, DeleteTeamErrors, DeleteTeamInviteHandlerData, DeleteTeamInviteHandlerError, DeleteTeamInviteHandlerErrors, DeleteTeamInviteHandlerResponses, DeleteTeamResponses, DeleteUserData, DeleteUserError, DeleteUserErrors, DeleteUserResponse, DeleteUserResponses, EmptyResponse, EnrichedGithubPullRequest, EnrichGithubPullRequestsData, EnrichGithubPullRequestsError, EnrichGithubPullRequestsErrors, EnrichGithubPullRequestsProxyRequest, EnrichGithubPullRequestsResponse, EnrichGithubPullRequestsResponse2, EnrichGithubPullRequestsResponses, ErrorResponse, GenerateEmailLinkData, GenerateEmailLinkError, GenerateEmailLinkErrors, GenerateEmailLinkRequest, GenerateEmailLinkResponse, GenerateEmailLinkResponses, GenericSuccessResponse, GetLegacyUserPermissionsData, GetLegacyUserPermissionsError, GetLegacyUserPermissionsErrors, GetLegacyUserPermissionsResponse, GetLegacyUserPermissionsResponse2, GetLegacyUserPermissionsResponses, GetNamesWithEmailRequestBody, GetPermissionsData, GetPermissionsError, GetPermissionsErrors, GetPermissionsResponse, GetPermissionsResponses, GetProfilePicturesRequestBody, GetReferralCodeData, GetReferralCodeError, GetReferralCodeErrors, GetReferralCodeResponse, GetReferralCodeResponses, GetTeamData, GetTeamError, GetTeamErrors, GetTeamInvitesData, GetTeamInvitesError, GetTeamInvitesErrors, GetTeamInvitesResponse, GetTeamInvitesResponses, GetTeamResponse, GetTeamResponses, GetUserInfo, GetUserInfoData, GetUserInfoError, GetUserInfoErrors, GetUserInfoResponse, GetUserInfoResponses, GetUserInvitesData, GetUserInvitesError, GetUserInvitesErrors, GetUserInvitesResponse, GetUserInvitesResponses, GetUserLinkExistsData, GetUserLinkExistsError, GetUserLinkExistsErrors, GetUserLinkExistsResponse, GetUserLinkExistsResponses, GetUserNameData, GetUserNameError, GetUserNameErrors, GetUserNameResponse, GetUserNameResponses, GetUserNamesData, GetUserNamesError, GetUserNamesErrors, GetUserNamesResponse, GetUserNamesResponses, GetUserNamesWithEmailData, GetUserNamesWithEmailError, GetUserNamesWithEmailErrors, GetUserNamesWithEmailResponse, GetUserNamesWithEmailResponses, GetUserOrganizationData, GetUserOrganizationError, GetUserOrganizationErrors, GetUserOrganizationResponse, GetUserOrganizationResponses, GetUserPermissionsData, GetUserPermissionsError, GetUserPermissionsErrors, GetUserPermissionsResponse, GetUserPermissionsResponses, GetUserQuotaData, GetUserQuotaError, GetUserQuotaErrors, GetUserQuotaResponse, GetUserQuotaResponses, GetUserTeamsData, GetUserTeamsError, GetUserTeamsErrors, GetUserTeamsResponse, GetUserTeamsResponses, GithubLinkStatusResponse, GithubPullRequestCheckRun, GithubPullRequestComment, GithubPullRequestRef, GithubPullRequestStatus, GmailLinkStatusResponse, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, InitGithubLinkData, InitGithubLinkError, InitGithubLinkErrors, InitGithubLinkResponse, InitGithubLinkResponse2, InitGithubLinkResponses, InitGmailLinkData, InitGmailLinkError, InitGmailLinkErrors, InitGmailLinkResponse, InitGmailLinkResponse2, InitGmailLinkResponses, InitOutlookLinkData, InitOutlookLinkError, InitOutlookLinkErrors, InitOutlookLinkResponse, InitOutlookLinkResponse2, InitOutlookLinkResponses, InviteEntry, InviteToTeamData, InviteToTeamError, InviteToTeamErrors, InviteToTeamRequest, InviteToTeamResponses, JoinTeamData, JoinTeamError, JoinTeamErrors, JoinTeamResponses, LogoutData, LogoutResponse, LogoutResponses, MacroApiTokenData, MacroApiTokenError, MacroApiTokenErrors, MacroApiTokenResponse, MacroApiTokenResponse2, MacroApiTokenResponses, Oauth2CallbackData, Oauth2CallbackError, Oauth2CallbackErrors, Oauth2CallbackResponses, OauthRedirectData, OauthRedirectError, OauthRedirectErrors, OauthRedirectResponses, PasswordlessCallbackData, PasswordlessCallbackError, PasswordlessCallbackErrors, PasswordlessCallbackResponse, PasswordlessCallbackResponses, PasswordlessLoginData, PasswordlessLoginError, PasswordlessLoginErrors, PasswordlessLoginResponse, PasswordlessLoginResponses, PasswordlessRequest, PasswordlessStartedResponse, PasswordLoginData, PasswordLoginError, PasswordLoginErrors, PasswordLoginResponse, PasswordLoginResponses, PasswordRequest, PatchTeamCrmSettingsData, PatchTeamCrmSettingsError, PatchTeamCrmSettingsErrors, PatchTeamCrmSettingsRequest, PatchTeamCrmSettingsResponse, PatchTeamCrmSettingsResponse2, PatchTeamCrmSettingsResponses, PatchTeamData, PatchTeamError, PatchTeamErrors, PatchTeamRequest, PatchTeamResponses, PatchTeamUserRole, PatchUserGroupData, PatchUserGroupError, PatchUserGroupErrors, PatchUserGroupRequest, PatchUserGroupResponse, PatchUserGroupResponses, PatchUserOnboardingData, PatchUserOnboardingError, PatchUserOnboardingErrors, PatchUserOnboardingRequest, PatchUserOnboardingResponse, PatchUserOnboardingResponses, PatchUserTutorialData, PatchUserTutorialError, PatchUserTutorialErrors, PatchUserTutorialRequest, PatchUserTutorialResponse, PatchUserTutorialResponses, Permission, PostGetNamesRequestBody, PostProfilePicturesData, PostProfilePicturesError, PostProfilePicturesErrors, PostProfilePicturesResponse, PostProfilePicturesResponses, ProfilePictureQueryParams, ProfilePictures, PutProfilePictureData, PutProfilePictureError, PutProfilePictureErrors, PutProfilePictureResponse, PutProfilePictureResponses, PutUserNameData, PutUserNameError, PutUserNameErrors, PutUserNameQueryParams, PutUserNameResponse, PutUserNameResponses, RefreshData, RefreshError, RefreshErrors, RefreshResponse, RefreshResponses, RejectInvitationData, RejectInvitationError, RejectInvitationErrors, RejectInvitationResponses, RemoveUserFromTeamData, RemoveUserFromTeamError, RemoveUserFromTeamErrors, RemoveUserFromTeamResponses, ResendFusionauthVerifyUserEmailData, ResendFusionauthVerifyUserEmailError, ResendFusionauthVerifyUserEmailErrors, ResendFusionauthVerifyUserEmailRequest, ResendFusionauthVerifyUserEmailResponse, ResendFusionauthVerifyUserEmailResponses, SendInviteBody, SendMobileWelcomeEmailData, SendMobileWelcomeEmailError, SendMobileWelcomeEmailErrors, SendMobileWelcomeEmailRequest, SendMobileWelcomeEmailResponse, SendMobileWelcomeEmailResponse2, SendMobileWelcomeEmailResponses, SendReferralCodeData, SendReferralCodeError, SendReferralCodeErrors, SendReferralCodeResponse, SendReferralCodeResponses, SessionCreationData, SessionCreationError, SessionCreationErrors, SessionCreationResponse, SessionCreationResponses, SessionLoginData, SessionLoginError, SessionLoginErrors, SessionLoginResponse, SessionLoginResponses, SsoLoginData, SsoLoginError, SsoLoginErrors, SsoLoginResponses, SsoRequiredResponse, StripeSessionResponse, Team, TeamInviteDetails, TeamInvitesResponse, TeamMember, TeamPlan, TeamRole, TeamWithMembers, ToggleAutoJoinDomainResponse, ToggleNonAdminInvitesResponse, ToggleTeamAutoJoinDomainData, ToggleTeamAutoJoinDomainError, ToggleTeamAutoJoinDomainErrors, ToggleTeamAutoJoinDomainResponse, ToggleTeamAutoJoinDomainResponses, ToggleTeamNonAdminInvitesData, ToggleTeamNonAdminInvitesError, ToggleTeamNonAdminInvitesErrors, ToggleTeamNonAdminInvitesResponse, ToggleTeamNonAdminInvitesResponses, UserLinkResponse, UserName, UserNames, UserOrganizationResponse, UserProfilePicture, UserQuota, UserTokensResponse, VerifyEmailLinkData, VerifyEmailLinkError, VerifyEmailLinkErrors, VerifyEmailLinkResponse, VerifyEmailLinkResponses, VerifyFusionauthUserEmailData, VerifyFusionauthUserEmailError, VerifyFusionauthUserEmailErrors, VerifyFusionauthUserEmailResponse, VerifyFusionauthUserEmailResponses, VerifyMergeRequestData, VerifyMergeRequestError, VerifyMergeRequestErrors, VerifyMergeRequestResponse, VerifyMergeRequestResponses } from './types.gen';
+export type { AbGroup, AppleLoginData, AppleLoginError, AppleLoginErrors, AppleLoginRequest, AppleLoginResponse, AppleLoginResponses, CheckGithubLinkStatusData, CheckGithubLinkStatusError, CheckGithubLinkStatusErrors, CheckGithubLinkStatusResponse, CheckGithubLinkStatusResponses, CheckGmailLinkStatusData, CheckGmailLinkStatusError, CheckGmailLinkStatusErrors, CheckGmailLinkStatusResponse, CheckGmailLinkStatusResponses, CheckoutSessionMetadata, ClientOptions, CreateAccountMergeRequest, CreateCheckoutSessionV2Data, CreateCheckoutSessionV2Error, CreateCheckoutSessionV2Errors, CreateCheckoutSessionV2Request, CreateCheckoutSessionV2Response, CreateCheckoutSessionV2Responses, CreateInProgressLinkData, CreateInProgressLinkError, CreateInProgressLinkErrors, CreateInProgressLinkResponse, CreateInProgressLinkResponse2, CreateInProgressLinkResponses, CreateMergeRequestData, CreateMergeRequestError, CreateMergeRequestErrors, CreateMergeRequestResponse, CreateMergeRequestResponses, CreatePortalSessionData, CreatePortalSessionError, CreatePortalSessionErrors, CreatePortalSessionRequest, CreatePortalSessionResponse, CreatePortalSessionResponses, CreateTeamData, CreateTeamError, CreateTeamErrors, CreateTeamRequest, CreateTeamResponse, CreateTeamResponses, CreateUserData, CreateUserError, CreateUserErrors, CreateUserRequest, CreateUserResponse, CreateUserResponses, DeleteGithubLinkData, DeleteGithubLinkError, DeleteGithubLinkErrors, DeleteGithubLinkResponse, DeleteGithubLinkResponses, DeleteTeamData, DeleteTeamError, DeleteTeamErrors, DeleteTeamInviteHandlerData, DeleteTeamInviteHandlerError, DeleteTeamInviteHandlerErrors, DeleteTeamInviteHandlerResponses, DeleteTeamResponses, DeleteUserData, DeleteUserError, DeleteUserErrors, DeleteUserResponse, DeleteUserResponses, EmptyResponse, EnrichedGithubPullRequest, EnrichGithubPullRequestsData, EnrichGithubPullRequestsError, EnrichGithubPullRequestsErrors, EnrichGithubPullRequestsProxyRequest, EnrichGithubPullRequestsResponse, EnrichGithubPullRequestsResponse2, EnrichGithubPullRequestsResponses, ErrorResponse, GenerateEmailLinkData, GenerateEmailLinkError, GenerateEmailLinkErrors, GenerateEmailLinkRequest, GenerateEmailLinkResponse, GenerateEmailLinkResponses, GenericSuccessResponse, GetLegacyUserPermissionsData, GetLegacyUserPermissionsError, GetLegacyUserPermissionsErrors, GetLegacyUserPermissionsResponse, GetLegacyUserPermissionsResponse2, GetLegacyUserPermissionsResponses, GetNamesWithEmailRequestBody, GetPermissionsData, GetPermissionsError, GetPermissionsErrors, GetPermissionsResponse, GetPermissionsResponses, GetProfilePicturesRequestBody, GetReferralCodeData, GetReferralCodeError, GetReferralCodeErrors, GetReferralCodeResponse, GetReferralCodeResponses, GetTeamData, GetTeamError, GetTeamErrors, GetTeamInvitesData, GetTeamInvitesError, GetTeamInvitesErrors, GetTeamInvitesResponse, GetTeamInvitesResponses, GetTeamResponse, GetTeamResponses, GetUserInfo, GetUserInfoData, GetUserInfoError, GetUserInfoErrors, GetUserInfoResponse, GetUserInfoResponses, GetUserInvitesData, GetUserInvitesError, GetUserInvitesErrors, GetUserInvitesResponse, GetUserInvitesResponses, GetUserLinkExistsData, GetUserLinkExistsError, GetUserLinkExistsErrors, GetUserLinkExistsResponse, GetUserLinkExistsResponses, GetUserNameData, GetUserNameError, GetUserNameErrors, GetUserNameResponse, GetUserNameResponses, GetUserNamesData, GetUserNamesError, GetUserNamesErrors, GetUserNamesResponse, GetUserNamesResponses, GetUserNamesWithEmailData, GetUserNamesWithEmailError, GetUserNamesWithEmailErrors, GetUserNamesWithEmailResponse, GetUserNamesWithEmailResponses, GetUserOrganizationData, GetUserOrganizationError, GetUserOrganizationErrors, GetUserOrganizationResponse, GetUserOrganizationResponses, GetUserPermissionsData, GetUserPermissionsError, GetUserPermissionsErrors, GetUserPermissionsResponse, GetUserPermissionsResponses, GetUserQuotaData, GetUserQuotaError, GetUserQuotaErrors, GetUserQuotaResponse, GetUserQuotaResponses, GetUserTeamsData, GetUserTeamsError, GetUserTeamsErrors, GetUserTeamsResponse, GetUserTeamsResponses, GithubLinkStatusResponse, GithubPullRequestCheckRun, GithubPullRequestComment, GithubPullRequestRef, GithubPullRequestStatus, GmailLinkStatusResponse, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, InitGithubLinkData, InitGithubLinkError, InitGithubLinkErrors, InitGithubLinkResponse, InitGithubLinkResponse2, InitGithubLinkResponses, InitGmailLinkData, InitGmailLinkError, InitGmailLinkErrors, InitGmailLinkResponse, InitGmailLinkResponse2, InitGmailLinkResponses, InitOutlookLinkData, InitOutlookLinkError, InitOutlookLinkErrors, InitOutlookLinkResponse, InitOutlookLinkResponse2, InitOutlookLinkResponses, InviteEntry, InviteToTeamData, InviteToTeamError, InviteToTeamErrors, InviteToTeamRequest, InviteToTeamResponses, JoinTeamData, JoinTeamError, JoinTeamErrors, JoinTeamResponses, LinkShare, LogoutData, LogoutResponse, LogoutResponses, MacroApiTokenData, MacroApiTokenError, MacroApiTokenErrors, MacroApiTokenResponse, MacroApiTokenResponse2, MacroApiTokenResponses, Oauth2CallbackData, Oauth2CallbackError, Oauth2CallbackErrors, Oauth2CallbackResponses, OauthRedirectData, OauthRedirectError, OauthRedirectErrors, OauthRedirectResponses, PasswordlessCallbackData, PasswordlessCallbackError, PasswordlessCallbackErrors, PasswordlessCallbackResponse, PasswordlessCallbackResponses, PasswordlessLoginData, PasswordlessLoginError, PasswordlessLoginErrors, PasswordlessLoginResponse, PasswordlessLoginResponses, PasswordlessRequest, PasswordlessStartedResponse, PasswordLoginData, PasswordLoginError, PasswordLoginErrors, PasswordLoginResponse, PasswordLoginResponses, PasswordRequest, PatchTeamCrmSettingsData, PatchTeamCrmSettingsError, PatchTeamCrmSettingsErrors, PatchTeamCrmSettingsRequest, PatchTeamCrmSettingsResponse, PatchTeamCrmSettingsResponse2, PatchTeamCrmSettingsResponses, PatchTeamData, PatchTeamError, PatchTeamErrors, PatchTeamRequest, PatchTeamResponses, PatchTeamUserRole, PatchUserGroupData, PatchUserGroupError, PatchUserGroupErrors, PatchUserGroupRequest, PatchUserGroupResponse, PatchUserGroupResponses, PatchUserOnboardingData, PatchUserOnboardingError, PatchUserOnboardingErrors, PatchUserOnboardingRequest, PatchUserOnboardingResponse, PatchUserOnboardingResponses, PatchUserTutorialData, PatchUserTutorialError, PatchUserTutorialErrors, PatchUserTutorialRequest, PatchUserTutorialResponse, PatchUserTutorialResponses, Permission, PostGetNamesRequestBody, PostProfilePicturesData, PostProfilePicturesError, PostProfilePicturesErrors, PostProfilePicturesResponse, PostProfilePicturesResponses, ProfilePictureQueryParams, ProfilePictures, PutProfilePictureData, PutProfilePictureError, PutProfilePictureErrors, PutProfilePictureResponse, PutProfilePictureResponses, PutUserNameData, PutUserNameError, PutUserNameErrors, PutUserNameQueryParams, PutUserNameResponse, PutUserNameResponses, RefreshData, RefreshError, RefreshErrors, RefreshResponse, RefreshResponses, RejectInvitationData, RejectInvitationError, RejectInvitationErrors, RejectInvitationResponses, RemoveUserFromTeamData, RemoveUserFromTeamError, RemoveUserFromTeamErrors, RemoveUserFromTeamResponses, ResendFusionauthVerifyUserEmailData, ResendFusionauthVerifyUserEmailError, ResendFusionauthVerifyUserEmailErrors, ResendFusionauthVerifyUserEmailRequest, ResendFusionauthVerifyUserEmailResponse, ResendFusionauthVerifyUserEmailResponses, SendInviteBody, SendMobileWelcomeEmailData, SendMobileWelcomeEmailError, SendMobileWelcomeEmailErrors, SendMobileWelcomeEmailRequest, SendMobileWelcomeEmailResponse, SendMobileWelcomeEmailResponse2, SendMobileWelcomeEmailResponses, SendReferralCodeData, SendReferralCodeError, SendReferralCodeErrors, SendReferralCodeResponse, SendReferralCodeResponses, SessionCreationData, SessionCreationError, SessionCreationErrors, SessionCreationResponse, SessionCreationResponses, SessionLoginData, SessionLoginError, SessionLoginErrors, SessionLoginResponse, SessionLoginResponses, SsoLoginData, SsoLoginError, SsoLoginErrors, SsoLoginResponses, SsoRequiredResponse, StripeSessionResponse, Team, TeamInviteDetails, TeamInvitesResponse, TeamMember, TeamPlan, TeamRole, TeamWithMembers, ToggleAutoJoinDomainResponse, ToggleNonAdminInvitesResponse, ToggleTeamAutoJoinDomainData, ToggleTeamAutoJoinDomainError, ToggleTeamAutoJoinDomainErrors, ToggleTeamAutoJoinDomainResponse, ToggleTeamAutoJoinDomainResponses, ToggleTeamNonAdminInvitesData, ToggleTeamNonAdminInvitesError, ToggleTeamNonAdminInvitesErrors, ToggleTeamNonAdminInvitesResponse, ToggleTeamNonAdminInvitesResponses, UserLinkResponse, UserName, UserNames, UserOrganizationResponse, UserProfilePicture, UserQuota, UserTokensResponse, VerifyEmailLinkData, VerifyEmailLinkError, VerifyEmailLinkErrors, VerifyEmailLinkResponse, VerifyEmailLinkResponses, VerifyFusionauthUserEmailData, VerifyFusionauthUserEmailError, VerifyFusionauthUserEmailErrors, VerifyFusionauthUserEmailResponse, VerifyFusionauthUserEmailResponses, VerifyMergeRequestData, VerifyMergeRequestError, VerifyMergeRequestErrors, VerifyMergeRequestResponse, VerifyMergeRequestResponses } from './types.gen';
diff --git a/packages/sdk/generated/auth/types.gen.ts b/packages/sdk/generated/auth/types.gen.ts
index ac8d990fc3..4a273b6452 100644
--- a/packages/sdk/generated/auth/types.gen.ts
+++ b/packages/sdk/generated/auth/types.gen.ts
@@ -505,6 +505,11 @@ export type InviteToTeamRequest = {
invites: Array<InviteEntry>;
};
+/**
+ * Defines who can access an item through its share link.
+ */
+export type LinkShare = 'PUBLIC' | 'TEAM';
+
export type MacroApiTokenResponse = {
/**
* The newly created macro_api_token
@@ -590,6 +595,7 @@ export type PatchTeamCrmSettingsResponse = {
* Request to update a team
*/
export type PatchTeamRequest = {
+ default_link_share?: null | LinkShare;
/**
* The new name for the team
*/
@@ -752,6 +758,7 @@ export type Team = {
* `false` when no row exists).
*/
crm_enabled: boolean;
+ default_link_share?: null | LinkShare;
/**
* Whether this team is on an enterprise license. Enterprise teams are
* billed out-of-band; membership changes skip all Stripe subscription
diff --git a/packages/sdk/specs/auth.json b/packages/sdk/specs/auth.json
index 146c67288f..85352aed8b 100644
--- a/packages/sdk/specs/auth.json
+++ b/packages/sdk/specs/auth.json
@@ -4188,6 +4188,11 @@
}
}
},
+ "LinkShare": {
+ "type": "string",
+ "description": "Defines who can access an item through its share link.",
+ "enum": ["PUBLIC", "TEAM"]
+ },
"MacroApiTokenResponse": {
"type": "object",
"required": ["macro_api_token"],
@@ -4288,6 +4293,17 @@
"type": "object",
"description": "Request to update a team",
"properties": {
+ "default_link_share": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/LinkShare",
+ "description": "The default link-share scope for items owned by the team. Omit to\nleave unchanged or pass `null` to default to link sharing off."
+ }
+ ]
+ },
"name": {
"type": ["string", "null"],
"description": "The new name for the team"
@@ -4509,6 +4525,17 @@
"type": "boolean",
"description": "Whether the CRM is enabled for this team (from `team_crm_settings`;\n`false` when no row exists)."
},
+ "default_link_share": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/LinkShare",
+ "description": "The default link-share scope applied when items owned by the team are\nshared via link without an explicit choice. `None` means link sharing\nis off by default. Defaults to [`LinkShare::Team`]."
+ }
+ ]
+ },
"enterprise": {
"type": "boolean",
"description": "Whether this team is on an enterprise license. Enterprise teams are\nbilled out-of-band; membership changes skip all Stripe subscription\nbookkeeping (no seat counts, no subscription backfill, no paying check)."
diff --git a/packages/sdk/src/entities/teams/team.ts b/packages/sdk/src/entities/teams/team.ts
index 6459ad6ae0..9e307c4a46 100644
--- a/packages/sdk/src/entities/teams/team.ts
+++ b/packages/sdk/src/entities/teams/team.ts
@@ -51,6 +51,12 @@ export class Team extends MacroEntity<TeamRecord> {
/** The team's slug (its URL identifier). */
readonly slug = this.field('slug');
+ /**
+ * The team's default link-share scope for newly shared items, or null when
+ * link sharing is off by default.
+ */
+ readonly defaultLinkShare = this.field('default_link_share');
+
/** The user who owns the team. */
readonly owner = this.mappedField('owner_id', (id) =>
User.byId(this.client, id),
diff --git a/services/authentication_service/Cargo.toml b/services/authentication_service/Cargo.toml
index 283d561939..56befdd8d7 100644
--- a/services/authentication_service/Cargo.toml
+++ b/services/authentication_service/Cargo.toml
@@ -108,6 +108,7 @@ mobile_welcome_email_db_client = { path = "../../crates/mobile_welcome_email_db_
mockall = { workspace = true }
model = { path = "../../crates/model" }
model-entity = { path = "../../crates/model-entity" }
+models_permissions = { path = "../../crates/models_permissions" }
model_notifications = { path = "../../crates/model_notifications" }
native_app_service = { path = "../../crates/native_app_service" }
non_empty = { path = "../../crates/non_empty" }
diff --git a/services/authentication_service/src/api/swagger.rs b/services/authentication_service/src/api/swagger.rs
index ae13ac3915..917aebb7e1 100644
--- a/services/authentication_service/src/api/swagger.rs
+++ b/services/authentication_service/src/api/swagger.rs
@@ -209,6 +209,7 @@ use model::user::{
PatchUserOnboardingRequest,
// Teams
+ models_permissions::share_permission::LinkShare,
TeamRole,
TeamMember,
Team,
diff --git a/services/document_cognition_service/Cargo.toml b/services/document_cognition_service/Cargo.toml
index 0db8ab19ce..5ede1caef2 100644
--- a/services/document_cognition_service/Cargo.toml
+++ b/services/document_cognition_service/Cargo.toml
@@ -70,6 +70,7 @@ macro_auth = { path = "../../crates/macro_auth" }
macro_aws_config = { path = "../../crates/macro_aws_config", features = ["s3"] }
macro_cors = { path = "../../crates/macro_cors" }
macro_config = { path = "../../crates/macro_config" }
+share_permission_db_utils = { path = "../../crates/share_permission_db_utils" }
macro_db_client = { path = "../../crates/macro_db_client" }
macro_entrypoint = { path = "../../crates/macro_entrypoint" }
macro_env = { path = "../../crates/macro_env" }
diff --git a/services/document_cognition_service/src/api/stream/chat_message/mod.rs b/services/document_cognition_service/src/api/stream/chat_message/mod.rs
index 8caa671b06..5f76236dbd 100644
--- a/services/document_cognition_service/src/api/stream/chat_message/mod.rs
+++ b/services/document_cognition_service/src/api/stream/chat_message/mod.rs
@@ -365,7 +365,20 @@ async fn create_new_chat(
model: &str,
stream_id: &str,
) -> Result<(crate::model::chats::ChatResponse, String), ChatMessageError> {
- let share_permission = SharePermissionV2::new_chat_share_permission();
+ // The owner's team default link-share preference decides the initial
+ // share permission; without a team the chat default (public/view) applies.
+ let team_default =
+ share_permission_db_utils::get_team_default_link_share(&ctx.db, (**user_id).as_ref())
+ .await
+ .map_err(|err| {
+ tracing::error!(error=?err, "failed to resolve team default link share");
+ ChatMessageError {
+ error: "Failed to create chat".to_string(),
+ stream_id: Some(stream_id.to_string()),
+ status: None,
+ }
+ })?;
+ let share_permission = SharePermissionV2::new_chat_share_permission(team_default);
let new_chat_id = create_chat::create_chat_v2(
&ctx.db,
(**user_id).clone(),
diff --git a/services/document_storage_service/src/api/documents/initialize_user_documents.rs b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
index 21547b92a3..54ad6d09e3 100644
--- a/services/document_storage_service/src/api/documents/initialize_user_documents.rs
+++ b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
@@ -76,8 +76,10 @@ pub async fn handler(
.into_response()
})?;
- // Create default share permission
- let share_permission = SharePermissionV2::new_project_share_permission();
+ // Create default share permission. Onboarding documents are created at
+ // signup, before team membership is meaningful, so the team default
+ // link-share preference intentionally does not apply.
+ let share_permission = SharePermissionV2::new_project_share_permission(None);
let start_time = std::time::Instant::now();
let project =
diff --git a/services/scheduled_action/Cargo.toml b/services/scheduled_action/Cargo.toml
index 1b871f2a94..07608e2192 100644
--- a/services/scheduled_action/Cargo.toml
+++ b/services/scheduled_action/Cargo.toml
@@ -48,6 +48,8 @@ ai_toolset = { path = "../../crates/ai_toolset" }
aws-sdk-sqs = { workspace = true }
chat = { path = "../../crates/chat" }
connection_gateway_client = { path = "../../crates/connection_gateway_client" }
+share_permission_db_utils = { path = "../../crates/share_permission_db_utils" }
+models_permissions = { path = "../../crates/models_permissions" }
macro_db_client = { path = "../../crates/macro_db_client" }
memory = { path = "../../crates/memory" }
model = { path = "../../crates/model" }
diff --git a/services/scheduled_action/src/outbound/inprocess_executor/agent_task.rs b/services/scheduled_action/src/outbound/inprocess_executor/agent_task.rs
index cd8973a1b8..e0fbd2e8ef 100644
--- a/services/scheduled_action/src/outbound/inprocess_executor/agent_task.rs
+++ b/services/scheduled_action/src/outbound/inprocess_executor/agent_task.rs
@@ -83,6 +83,18 @@ async fn fetch_user_memory(
async fn create_chat(db: &PgPool, action: &ScheduledAction) -> Result<String> {
let chat_repo = PgChatRepo::new(db.clone());
+
+ // Scheduled-agent chats belong to the action's owner, so the owner's team
+ // default link-share preference decides the initial share permission.
+ let team_default =
+ share_permission_db_utils::get_team_default_link_share(db, action.owner.as_ref())
+ .await
+ .context("failed to resolve team default link share")?;
+ let share_permission =
+ models_permissions::share_permission::SharePermissionV2::new_chat_share_permission(
+ team_default,
+ );
+
chat_repo
.create(
action.owner.clone(),
@@ -90,6 +102,7 @@ async fn create_chat(db: &PgPool, action: &ScheduledAction) -> Result<String> {
name: action.name.clone(),
project_id: None,
},
+ share_permission,
)
.await
.map_err(|e| anyhow::anyhow!(e))