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.

refactor(entity_access): resolve TEAM link sharing from typed owners (#6806)

Will Hutchinson627b3eb120d0
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.json
index 506a19f86e..4e5d9415a7 100644
--- a/.github/workspace-dep-closures.json
+++ b/.github/workspace-dep-closures.json
@@ -6855,10 +6855,12 @@
"crates/workspace-hack"
],
"models_permissions": [
+ "crates/bot_id",
"crates/cowlike",
"crates/macro_user_id",
"crates/model-entity",
"crates/model_file_type",
+ "crates/model_owner",
"crates/models_permissions",
"crates/workspace-hack"
],
diff --git a/.sqlx/query-cfe9d5b1e363c8b0e2b2fbfe4caa006ca5e7668b10410232d8ffe05316d65272.json b/.sqlx/query-0aebe9b87261ba81fef8a4e2753d21270607b1be37420fda53df8cc71cf96f8b.json
similarity index 72%
rename from .sqlx/query-cfe9d5b1e363c8b0e2b2fbfe4caa006ca5e7668b10410232d8ffe05316d65272.json
rename to .sqlx/query-0aebe9b87261ba81fef8a4e2753d21270607b1be37420fda53df8cc71cf96f8b.json
index 0c0834a063..bc81b392ec 100644
--- a/.sqlx/query-cfe9d5b1e363c8b0e2b2fbfe4caa006ca5e7668b10410232d8ffe05316d65272.json
+++ b/.sqlx/query-0aebe9b87261ba81fef8a4e2753d21270607b1be37420fda53df8cc71cf96f8b.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n sp.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_team.team_id AS \"owner_team_id!\"\n FROM \"SharePermission\" sp\n JOIN \"ProjectPermission\" pp ON pp.\"sharePermissionId\" = sp.id\n JOIN \"Project\" p ON p.id = pp.\"projectId\"\n JOIN team_user owner_team\n ON owner_team.user_id = p.\"userId\"\n AND owner_team.team_id::text = ANY($2)\n WHERE pp.\"projectId\" = $1\n AND sp.\"linkShare\" = 'TEAM'\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n ",
+ "query": "\n SELECT\n sp.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_team.team_id AS \"owner_team_id!\"\n FROM \"SharePermission\" sp\n JOIN \"ProjectPermission\" pp ON pp.\"sharePermissionId\" = sp.id\n JOIN \"Project\" p ON p.id = pp.\"projectId\"\n JOIN owner_team(p.\"userId\") owner_team\n ON owner_team.team_id::text = ANY($2)\n WHERE pp.\"projectId\" = $1\n AND sp.\"linkShare\" = 'TEAM'\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n ",
"describe": {
"columns": [
{
@@ -34,8 +34,8 @@
},
"nullable": [
true,
- false
+ null
]
},
- "hash": "cfe9d5b1e363c8b0e2b2fbfe4caa006ca5e7668b10410232d8ffe05316d65272"
+ "hash": "0aebe9b87261ba81fef8a4e2753d21270607b1be37420fda53df8cc71cf96f8b"
}
diff --git a/.sqlx/query-1f8d142bdc2b0cb6c27bd33526becdf1a2f532bce63df0c858e5c317d1dc52ab.json b/.sqlx/query-1368860a177951b6f1d6b605030601e5835b098f3096a052ce68f6c54c3eb118.json
similarity index 78%
rename from .sqlx/query-1f8d142bdc2b0cb6c27bd33526becdf1a2f532bce63df0c858e5c317d1dc52ab.json
rename to .sqlx/query-1368860a177951b6f1d6b605030601e5835b098f3096a052ce68f6c54c3eb118.json
index 6f51a504bd..5e137caec0 100644
--- a/.sqlx/query-1f8d142bdc2b0cb6c27bd33526becdf1a2f532bce63df0c858e5c317d1dc52ab.json
+++ b/.sqlx/query-1368860a177951b6f1d6b605030601e5835b098f3096a052ce68f6c54c3eb118.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'project'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: project link share permission\n SELECT\n sp.\"linkShareAccessLevel\"::text AS access_level\n FROM \"SharePermission\" sp\n WHERE sp.\"linkShareAccessLevel\" IS NOT NULL\n AND sp.id IN (\n SELECT \"sharePermissionId\" FROM \"ProjectPermission\" WHERE \"projectId\" = $3\n )\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM \"Project\" p\n JOIN team_user owner_team ON owner_team.user_id = p.\"userId\"\n WHERE p.id = $3\n AND owner_team.team_id::text = ANY($2)\n )\n )\n )\n ) AS combined_access\n ",
+ "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'project'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: project link share permission\n SELECT\n sp.\"linkShareAccessLevel\"::text AS access_level\n FROM \"SharePermission\" sp\n WHERE sp.\"linkShareAccessLevel\" IS NOT NULL\n AND sp.id IN (\n SELECT \"sharePermissionId\" FROM \"ProjectPermission\" WHERE \"projectId\" = $3\n )\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM \"Project\" p\n CROSS JOIN owner_team(p.\"userId\") owner_team\n WHERE p.id = $3\n AND owner_team.team_id::text = ANY($2)\n )\n )\n )\n ) AS combined_access\n ",
"describe": {
"columns": [
{
@@ -20,5 +20,5 @@
null
]
},
- "hash": "1f8d142bdc2b0cb6c27bd33526becdf1a2f532bce63df0c858e5c317d1dc52ab"
+ "hash": "1368860a177951b6f1d6b605030601e5835b098f3096a052ce68f6c54c3eb118"
}
diff --git a/.sqlx/query-ff96096a9ac83c19f76d4392d718e18a042b3358de4837f0e6eb7c4f263ea7c9.json b/.sqlx/query-15b501ff3b8e305bd26dc995516b253483d9adcc7c8a4918de445177fea438d0.json
similarity index 73%
rename from .sqlx/query-ff96096a9ac83c19f76d4392d718e18a042b3358de4837f0e6eb7c4f263ea7c9.json
rename to .sqlx/query-15b501ff3b8e305bd26dc995516b253483d9adcc7c8a4918de445177fea438d0.json
index 60000f0db0..9f11c4157a 100644
--- a/.sqlx/query-ff96096a9ac83c19f76d4392d718e18a042b3358de4837f0e6eb7c4f263ea7c9.json
+++ b/.sqlx/query-15b501ff3b8e305bd26dc995516b253483d9adcc7c8a4918de445177fea438d0.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n share_permission.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_team.team_id AS \"owner_team_id!\"\n FROM \"Document\" document\n JOIN \"DocumentPermission\" document_permission\n ON document_permission.\"documentId\" = document.id\n JOIN \"SharePermission\" share_permission\n ON share_permission.id = document_permission.\"sharePermissionId\"\n JOIN team_user owner_team\n ON owner_team.user_id = document.owner\n AND owner_team.team_id::text = ANY($2)\n WHERE document.id = $1\n AND share_permission.\"linkShare\" = 'TEAM'\n AND share_permission.\"linkShareAccessLevel\" IS NOT NULL\n ",
+ "query": "\n SELECT\n share_permission.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_team.team_id AS \"owner_team_id!\"\n FROM \"Document\" document\n JOIN \"DocumentPermission\" document_permission\n ON document_permission.\"documentId\" = document.id\n JOIN \"SharePermission\" share_permission\n ON share_permission.id = document_permission.\"sharePermissionId\"\n JOIN owner_team(document.owner) owner_team\n ON owner_team.team_id::text = ANY($2)\n WHERE document.id = $1\n AND share_permission.\"linkShare\" = 'TEAM'\n AND share_permission.\"linkShareAccessLevel\" IS NOT NULL\n ",
"describe": {
"columns": [
{
@@ -34,8 +34,8 @@
},
"nullable": [
true,
- false
+ null
]
},
- "hash": "ff96096a9ac83c19f76d4392d718e18a042b3358de4837f0e6eb7c4f263ea7c9"
+ "hash": "15b501ff3b8e305bd26dc995516b253483d9adcc7c8a4918de445177fea438d0"
}
diff --git a/.sqlx/query-b8c05125895f4c325da647bebffb2db1950fd2277202062b81ceadee2a7c5b77.json b/.sqlx/query-27502a40d581a1fe1e734caa9189eb88cfe6dc30a05f3b7ae37b65803b8d832f.json
similarity index 73%
rename from .sqlx/query-b8c05125895f4c325da647bebffb2db1950fd2277202062b81ceadee2a7c5b77.json
rename to .sqlx/query-27502a40d581a1fe1e734caa9189eb88cfe6dc30a05f3b7ae37b65803b8d832f.json
index bf4e656b19..39778e3379 100644
--- a/.sqlx/query-b8c05125895f4c325da647bebffb2db1950fd2277202062b81ceadee2a7c5b77.json
+++ b/.sqlx/query-27502a40d581a1fe1e734caa9189eb88cfe6dc30a05f3b7ae37b65803b8d832f.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n sp.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_tu.team_id AS \"owner_team_id!\"\n FROM \"SharePermission\" sp\n JOIN \"ChatPermission\" cp ON cp.\"sharePermissionId\" = sp.id\n JOIN \"Chat\" c ON c.id = cp.\"chatId\"\n JOIN team_user owner_tu\n ON owner_tu.user_id = c.\"userId\"\n AND owner_tu.team_id::text = ANY($2)\n WHERE cp.\"chatId\" = $1\n AND sp.\"linkShare\" = 'TEAM'\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n ",
+ "query": "\n SELECT\n sp.\"linkShareAccessLevel\" AS \"access_level!: AccessLevel\",\n owner_tu.team_id AS \"owner_team_id!\"\n FROM \"SharePermission\" sp\n JOIN \"ChatPermission\" cp ON cp.\"sharePermissionId\" = sp.id\n JOIN \"Chat\" c ON c.id = cp.\"chatId\"\n JOIN owner_team(c.\"userId\") owner_tu\n ON owner_tu.team_id::text = ANY($2)\n WHERE cp.\"chatId\" = $1\n AND sp.\"linkShare\" = 'TEAM'\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n ",
"describe": {
"columns": [
{
@@ -34,8 +34,8 @@
},
"nullable": [
true,
- false
+ null
]
},
- "hash": "b8c05125895f4c325da647bebffb2db1950fd2277202062b81ceadee2a7c5b77"
+ "hash": "27502a40d581a1fe1e734caa9189eb88cfe6dc30a05f3b7ae37b65803b8d832f"
}
diff --git a/.sqlx/query-33806b4a47804361303ba141ecae712fadaacad258646bdce61d1d457bb44c80.json b/.sqlx/query-33806b4a47804361303ba141ecae712fadaacad258646bdce61d1d457bb44c80.json
new file mode 100644
index 0000000000..886f0793a3
--- /dev/null
+++ b/.sqlx/query-33806b4a47804361303ba141ecae712fadaacad258646bdce61d1d457bb44c80.json
@@ -0,0 +1,16 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "INSERT INTO comms_attachments (id, message_id, entity_type, entity_id)\n VALUES ($1, $2, 'document', $3)",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Uuid",
+ "Varchar"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "33806b4a47804361303ba141ecae712fadaacad258646bdce61d1d457bb44c80"
+}
diff --git a/.sqlx/query-eb5df4d78a5fe9a4f59a061a12bef33bf55ef84c02418ca2ca95793b107d9ef1.json b/.sqlx/query-41c48309fbd1896389132c869eaa3fbd2f5f07de849d739f47b1bfa4c78e5cd0.json
similarity index 74%
rename from .sqlx/query-eb5df4d78a5fe9a4f59a061a12bef33bf55ef84c02418ca2ca95793b107d9ef1.json
rename to .sqlx/query-41c48309fbd1896389132c869eaa3fbd2f5f07de849d739f47b1bfa4c78e5cd0.json
index 6d8883b4c4..8061230403 100644
--- a/.sqlx/query-eb5df4d78a5fe9a4f59a061a12bef33bf55ef84c02418ca2ca95793b107d9ef1.json
+++ b/.sqlx/query-41c48309fbd1896389132c869eaa3fbd2f5f07de849d739f47b1bfa4c78e5cd0.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'chat'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: chat link share permission\n SELECT\n sp.\"linkShareAccessLevel\"::text AS access_level\n FROM \"SharePermission\" sp\n JOIN \"ChatPermission\" cp ON cp.\"sharePermissionId\" = sp.id\n WHERE cp.\"chatId\" = $3\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM \"Chat\" c\n JOIN team_user owner_tu ON owner_tu.user_id = c.\"userId\"\n WHERE c.id = $3\n AND owner_tu.team_id::text = ANY($2)\n )\n )\n )\n ) AS combined_access\n ",
+ "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'chat'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: chat link share permission\n SELECT\n sp.\"linkShareAccessLevel\"::text AS access_level\n FROM \"SharePermission\" sp\n JOIN \"ChatPermission\" cp ON cp.\"sharePermissionId\" = sp.id\n WHERE cp.\"chatId\" = $3\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM \"Chat\" c\n CROSS JOIN owner_team(c.\"userId\") owner_tu\n WHERE c.id = $3\n AND owner_tu.team_id::text = ANY($2)\n )\n )\n )\n ) AS combined_access\n ",
"describe": {
"columns": [
{
@@ -20,5 +20,5 @@
null
]
},
- "hash": "eb5df4d78a5fe9a4f59a061a12bef33bf55ef84c02418ca2ca95793b107d9ef1"
+ "hash": "41c48309fbd1896389132c869eaa3fbd2f5f07de849d739f47b1bfa4c78e5cd0"
}
diff --git a/.sqlx/query-575b2fcbff22f2e979f0e9bf10143459e72efb66b4a60d415852096f22990a2f.json b/.sqlx/query-575b2fcbff22f2e979f0e9bf10143459e72efb66b4a60d415852096f22990a2f.json
new file mode 100644
index 0000000000..a1d37c5727
--- /dev/null
+++ b/.sqlx/query-575b2fcbff22f2e979f0e9bf10143459e72efb66b4a60d415852096f22990a2f.json
@@ -0,0 +1,22 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "SELECT team_id FROM owner_team($1)",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "team_id",
+ "type_info": "Uuid"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ null
+ ]
+ },
+ "hash": "575b2fcbff22f2e979f0e9bf10143459e72efb66b4a60d415852096f22990a2f"
+}
diff --git a/.sqlx/query-5945fa9d910fb96c378548d1ecbfa70afe5c760ad115d1d652a562e7d4258b35.json b/.sqlx/query-5945fa9d910fb96c378548d1ecbfa70afe5c760ad115d1d652a562e7d4258b35.json
new file mode 100644
index 0000000000..83e920965c
--- /dev/null
+++ b/.sqlx/query-5945fa9d910fb96c378548d1ecbfa70afe5c760ad115d1d652a562e7d4258b35.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "INSERT INTO comms_messages (id, sender_id, content, parent_entity_type, parent_entity_id)\n VALUES ($1, 'macro|[email protected]', 'attachment', 'document', $2)",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "5945fa9d910fb96c378548d1ecbfa70afe5c760ad115d1d652a562e7d4258b35"
+}
diff --git a/.sqlx/query-a464a5dd3b8f0149e9bf0daf1da30a84a7f01438235e353a9b2fdcd0f90b8ab3.json b/.sqlx/query-5a43284afd685db881048bdef2b122f44f1ffef896d82631461a081a380f29d4.json
similarity index 77%
rename from .sqlx/query-a464a5dd3b8f0149e9bf0daf1da30a84a7f01438235e353a9b2fdcd0f90b8ab3.json
rename to .sqlx/query-5a43284afd685db881048bdef2b122f44f1ffef896d82631461a081a380f29d4.json
index 5ee629522a..bd9c26f516 100644
--- a/.sqlx/query-a464a5dd3b8f0149e9bf0daf1da30a84a7f01438235e353a9b2fdcd0f90b8ab3.json
+++ b/.sqlx/query-5a43284afd685db881048bdef2b122f44f1ffef896d82631461a081a380f29d4.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "WITH entity AS (\n SELECT d.owner, dp.\"sharePermissionId\" AS permission_id\n FROM \"Document\" d LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n WHERE $2 = 'document' AND d.id = $1\n UNION ALL\n SELECT p.\"userId\", pp.\"sharePermissionId\"\n FROM \"Project\" p LEFT JOIN \"ProjectPermission\" pp ON pp.\"projectId\" = p.id\n WHERE $2 = 'project' AND p.id = $1\n UNION ALL\n SELECT c.\"userId\", cp.\"sharePermissionId\"\n FROM \"Chat\" c LEFT JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n WHERE $2 = 'chat' AND c.id = $1\n UNION ALL\n SELECT l.macro_id, tp.\"sharePermissionId\"\n FROM email_threads t JOIN email_links l ON l.id = t.link_id\n LEFT JOIN \"EmailThreadPermission\" tp ON tp.\"threadId\" = t.id::text\n WHERE $2 = 'email_thread' AND t.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM calls c\n WHERE $2 = 'call' AND c.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM call_records c\n WHERE $2 = 'call' AND c.id = $3 AND NOT EXISTS (SELECT 1 FROM calls WHERE id = $3)\n UNION ALL\n SELECT i.owner_user_id, i.share_permission_id FROM initiative i\n WHERE $2 = 'initiative' AND i.id = $3\n UNION ALL\n SELECT s.owner_id, s.share_permission_id FROM agent_session s\n WHERE $2 = 'agent_session' AND s.id = $3\n )\n SELECT e.owner AS \"owner!\", e.permission_id,\n sp.id AS \"stored_permission_id?\",\n sp.team_share_access_level AS \"level: AccessLevel\",\n sp.team_share_team_id AS team_id, sp.team_share_revision AS \"revision?\",\n (SELECT tu.team_id FROM team_user tu WHERE tu.user_id = e.owner\n ORDER BY tu.team_role DESC LIMIT 1) AS owner_team_id\n FROM entity e LEFT JOIN \"SharePermission\" sp ON sp.id = e.permission_id",
+ "query": "WITH entity AS (\n SELECT d.owner, dp.\"sharePermissionId\" AS permission_id\n FROM \"Document\" d LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n WHERE $2 = 'document' AND d.id = $1\n UNION ALL\n SELECT p.\"userId\", pp.\"sharePermissionId\"\n FROM \"Project\" p LEFT JOIN \"ProjectPermission\" pp ON pp.\"projectId\" = p.id\n WHERE $2 = 'project' AND p.id = $1\n UNION ALL\n SELECT c.\"userId\", cp.\"sharePermissionId\"\n FROM \"Chat\" c LEFT JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n WHERE $2 = 'chat' AND c.id = $1\n UNION ALL\n SELECT l.macro_id, tp.\"sharePermissionId\"\n FROM email_threads t JOIN email_links l ON l.id = t.link_id\n LEFT JOIN \"EmailThreadPermission\" tp ON tp.\"threadId\" = t.id::text\n WHERE $2 = 'email_thread' AND t.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM calls c\n WHERE $2 = 'call' AND c.id = $3\n UNION ALL\n SELECT c.created_by, c.share_permission_id FROM call_records c\n WHERE $2 = 'call' AND c.id = $3 AND NOT EXISTS (SELECT 1 FROM calls WHERE id = $3)\n UNION ALL\n SELECT i.owner_user_id, i.share_permission_id FROM initiative i\n WHERE $2 = 'initiative' AND i.id = $3\n UNION ALL\n SELECT s.owner_id, s.share_permission_id FROM agent_session s\n WHERE $2 = 'agent_session' AND s.id = $3\n )\n SELECT e.owner AS \"owner!\", e.permission_id,\n sp.id AS \"stored_permission_id?\",\n sp.team_share_access_level AS \"level: AccessLevel\",\n sp.team_share_team_id AS team_id, sp.team_share_revision AS \"revision?\",\n tu.team_id AS \"user_team?\", b.team_id AS \"bot_team?\", btu.team_id AS \"bot_user_team?\"\n FROM entity e LEFT JOIN \"SharePermission\" sp ON sp.id = e.permission_id\n LEFT JOIN team_user tu ON tu.user_id = e.owner\n LEFT JOIN bots b ON b.id = CASE\n WHEN e.owner ~ '^bot\\|[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'\n THEN substring(e.owner FROM 5)::uuid END\n LEFT JOIN team_user btu ON btu.user_id = b.owner_user_id",
"describe": {
"columns": [
{
@@ -47,7 +47,17 @@
},
{
"ordinal": 6,
- "name": "owner_team_id",
+ "name": "user_team?",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 7,
+ "name": "bot_team?",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 8,
+ "name": "bot_user_team?",
"type_info": "Uuid"
}
],
@@ -65,8 +75,10 @@
true,
true,
false,
- null
+ false,
+ true,
+ false
]
},
- "hash": "a464a5dd3b8f0149e9bf0daf1da30a84a7f01438235e353a9b2fdcd0f90b8ab3"
+ "hash": "5a43284afd685db881048bdef2b122f44f1ffef896d82631461a081a380f29d4"
}
diff --git a/.sqlx/query-1c20c8229b98cd0b34389fbacc465d3ed0b7be6dfedfe06905d2b9fed99b9a43.json b/.sqlx/query-5fd3c489c808a670cb395763fcca2e2229d8ce9b9be85a0de70e205a10ee276c.json
similarity index 67%
rename from .sqlx/query-1c20c8229b98cd0b34389fbacc465d3ed0b7be6dfedfe06905d2b9fed99b9a43.json
rename to .sqlx/query-5fd3c489c808a670cb395763fcca2e2229d8ce9b9be85a0de70e205a10ee276c.json
index f2ef4869fe..ad099d215f 100644
--- a/.sqlx/query-1c20c8229b98cd0b34389fbacc465d3ed0b7be6dfedfe06905d2b9fed99b9a43.json
+++ b/.sqlx/query-5fd3c489c808a670cb395763fcca2e2229d8ce9b9be85a0de70e205a10ee276c.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n WITH RECURSIVE parent_projects AS (\n SELECT p.id, p.\"parentId\", p.\"userId\"\n FROM \"Project\" p\n JOIN \"Document\" d ON d.\"projectId\" = p.id\n WHERE d.id = $1 AND d.\"deletedAt\" IS NULL AND p.\"deletedAt\" IS NULL\n UNION\n SELECT p.id, p.\"parentId\", p.\"userId\"\n FROM \"Project\" p\n JOIN parent_projects child ON p.id = child.\"parentId\"\n WHERE p.\"deletedAt\" IS NULL\n ), document_permissions AS (\n SELECT d.owner, sp.id, sp.\"linkShare\", sp.\"linkShareAccessLevel\"\n FROM \"Document\" d\n LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n LEFT JOIN \"SharePermission\" sp ON sp.id = dp.\"sharePermissionId\"\n WHERE d.id = $1 AND d.\"deletedAt\" IS NULL\n )\n SELECT 'owner'::text AS \"level!\" FROM document_permissions WHERE owner = $2\n UNION ALL\n SELECT \"linkShareAccessLevel\"::text FROM document_permissions p\n WHERE \"linkShareAccessLevel\" IS NOT NULL\n AND (\n \"linkShare\" = 'PUBLIC'\n OR (\n \"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1 FROM team_user t\n WHERE t.user_id = p.owner AND t.team_id::text = ANY($3)\n )\n )\n )\n UNION ALL\n SELECT c.access_level::text FROM document_permissions p\n JOIN \"ChannelSharePermission\" c ON c.share_permission_id = p.id\n WHERE c.channel_id = ANY($3)\n UNION ALL\n SELECT 'edit'::text FROM parent_projects WHERE \"userId\" = $2\n UNION ALL\n SELECT a.access_level::text FROM entity_access a\n JOIN parent_projects p ON a.entity_id::text = p.id\n WHERE a.entity_type = 'project' AND a.source_id = ANY($3)\n ",
+ "query": "\n WITH RECURSIVE parent_projects AS (\n SELECT p.id, p.\"parentId\", p.\"userId\"\n FROM \"Project\" p\n JOIN \"Document\" d ON d.\"projectId\" = p.id\n WHERE d.id = $1 AND d.\"deletedAt\" IS NULL AND p.\"deletedAt\" IS NULL\n UNION\n SELECT p.id, p.\"parentId\", p.\"userId\"\n FROM \"Project\" p\n JOIN parent_projects child ON p.id = child.\"parentId\"\n WHERE p.\"deletedAt\" IS NULL\n ), document_permissions AS (\n SELECT d.owner, sp.id, sp.\"linkShare\", sp.\"linkShareAccessLevel\"\n FROM \"Document\" d\n LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = d.id\n LEFT JOIN \"SharePermission\" sp ON sp.id = dp.\"sharePermissionId\"\n WHERE d.id = $1 AND d.\"deletedAt\" IS NULL\n )\n SELECT 'owner'::text AS \"level!\" FROM document_permissions WHERE owner = $2\n UNION ALL\n SELECT \"linkShareAccessLevel\"::text FROM document_permissions p\n WHERE \"linkShareAccessLevel\" IS NOT NULL\n AND (\n \"linkShare\" = 'PUBLIC'\n OR (\n \"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1 FROM owner_team(p.owner) t\n WHERE t.team_id::text = ANY($3)\n )\n )\n )\n UNION ALL\n SELECT c.access_level::text FROM document_permissions p\n JOIN \"ChannelSharePermission\" c ON c.share_permission_id = p.id\n WHERE c.channel_id = ANY($3)\n UNION ALL\n SELECT 'edit'::text FROM parent_projects WHERE \"userId\" = $2\n UNION ALL\n SELECT a.access_level::text FROM entity_access a\n JOIN parent_projects p ON a.entity_id::text = p.id\n WHERE a.entity_type = 'project' AND a.source_id = ANY($3)\n ",
"describe": {
"columns": [
{
@@ -20,5 +20,5 @@
null
]
},
- "hash": "1c20c8229b98cd0b34389fbacc465d3ed0b7be6dfedfe06905d2b9fed99b9a43"
+ "hash": "5fd3c489c808a670cb395763fcca2e2229d8ce9b9be85a0de70e205a10ee276c"
}
diff --git a/.sqlx/query-6661357a095607aed2b703595ba91cf812e17df57ebc8a54ee72d15e7dc18cd1.json b/.sqlx/query-6661357a095607aed2b703595ba91cf812e17df57ebc8a54ee72d15e7dc18cd1.json
new file mode 100644
index 0000000000..623d35fbee
--- /dev/null
+++ b/.sqlx/query-6661357a095607aed2b703595ba91cf812e17df57ebc8a54ee72d15e7dc18cd1.json
@@ -0,0 +1,14 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "DELETE FROM comms_attachments WHERE id = $1",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "6661357a095607aed2b703595ba91cf812e17df57ebc8a54ee72d15e7dc18cd1"
+}
diff --git a/.sqlx/query-c6a7c0f79caa2cb4f5f29ee9c7e40a310aa3da512e914357ea6f9783c389a232.json b/.sqlx/query-66cae1636d85b0b656311e09c4d4c666e782334a2afa7e5c54f062cabc71a65d.json
similarity index 77%
rename from .sqlx/query-c6a7c0f79caa2cb4f5f29ee9c7e40a310aa3da512e914357ea6f9783c389a232.json
rename to .sqlx/query-66cae1636d85b0b656311e09c4d4c666e782334a2afa7e5c54f062cabc71a65d.json
index b9ed77682b..8c0289586e 100644
--- a/.sqlx/query-c6a7c0f79caa2cb4f5f29ee9c7e40a310aa3da512e914357ea6f9783c389a232.json
+++ b/.sqlx/query-66cae1636d85b0b656311e09c4d4c666e782334a2afa7e5c54f062cabc71a65d.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n WITH user_source_ids AS (\n SELECT cp.channel_id::text as source_id FROM comms_channel_participants cp\n WHERE cp.user_id = $2 AND cp.left_at IS NULL\n UNION ALL\n SELECT t.team_id::text FROM team_user t\n WHERE t.user_id = $2\n UNION ALL\n SELECT $2\n )\n SELECT\n chat_id,\n access_level\n FROM (\n -- Source 1: entity_access for chats\n SELECT\n ea.entity_id::text as chat_id,\n ea.access_level::text as access_level\n FROM entity_access ea\n WHERE ea.source_id = ANY(SELECT source_id FROM user_source_ids)\n AND ea.entity_id = ANY(SELECT id::uuid FROM \"Chat\" WHERE id = ANY($1) AND \"deletedAt\" IS NULL)\n AND ea.entity_type = 'chat'\n UNION ALL\n -- Source 2: Direct chat link permissions\n SELECT\n c.id as chat_id,\n sp.\"linkShareAccessLevel\"::text as access_level\n FROM \"Chat\" c\n JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n JOIN \"SharePermission\" sp ON sp.id = cp.\"sharePermissionId\"\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM team_user owner_team\n WHERE owner_team.user_id = c.\"userId\"\n AND owner_team.team_id::text = ANY(\n SELECT source_id FROM user_source_ids\n )\n )\n )\n )\n WHERE c.id = ANY($1) AND c.\"deletedAt\" IS NULL\n ) as all_levels\n ",
+ "query": "\n WITH user_source_ids AS (\n SELECT cp.channel_id::text as source_id FROM comms_channel_participants cp\n WHERE cp.user_id = $2 AND cp.left_at IS NULL\n UNION ALL\n SELECT t.team_id::text FROM team_user t\n WHERE t.user_id = $2\n UNION ALL\n SELECT $2\n )\n SELECT\n chat_id,\n access_level\n FROM (\n -- Source 1: entity_access for chats\n SELECT\n ea.entity_id::text as chat_id,\n ea.access_level::text as access_level\n FROM entity_access ea\n WHERE ea.source_id = ANY(SELECT source_id FROM user_source_ids)\n AND ea.entity_id = ANY(SELECT id::uuid FROM \"Chat\" WHERE id = ANY($1) AND \"deletedAt\" IS NULL)\n AND ea.entity_type = 'chat'\n UNION ALL\n -- Source 2: Direct chat link permissions\n SELECT\n c.id as chat_id,\n sp.\"linkShareAccessLevel\"::text as access_level\n FROM \"Chat\" c\n JOIN \"ChatPermission\" cp ON cp.\"chatId\" = c.id\n JOIN \"SharePermission\" sp ON sp.id = cp.\"sharePermissionId\"\n AND sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM owner_team(c.\"userId\") owner_team\n WHERE owner_team.team_id::text = ANY(\n SELECT source_id FROM user_source_ids\n )\n )\n )\n )\n WHERE c.id = ANY($1) AND c.\"deletedAt\" IS NULL\n ) as all_levels\n ",
"describe": {
"columns": [
{
@@ -25,5 +25,5 @@
null
]
},
- "hash": "c6a7c0f79caa2cb4f5f29ee9c7e40a310aa3da512e914357ea6f9783c389a232"
+ "hash": "66cae1636d85b0b656311e09c4d4c666e782334a2afa7e5c54f062cabc71a65d"
}
diff --git a/.sqlx/query-8611553ad006066cda380b1e22f586bdac484ea189aae8dca521d3070c13e76e.json b/.sqlx/query-8611553ad006066cda380b1e22f586bdac484ea189aae8dca521d3070c13e76e.json
new file mode 100644
index 0000000000..43c6aa13dc
--- /dev/null
+++ b/.sqlx/query-8611553ad006066cda380b1e22f586bdac484ea189aae8dca521d3070c13e76e.json
@@ -0,0 +1,25 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'document'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: document link share permission\n SELECT\n share_permission.\"linkShareAccessLevel\"::text AS access_level\n FROM \"Document\" document\n JOIN \"DocumentPermission\" document_permission\n ON document_permission.\"documentId\" = document.id\n JOIN \"SharePermission\" share_permission\n ON share_permission.id = document_permission.\"sharePermissionId\"\n WHERE document.id = $3\n AND share_permission.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n share_permission.\"linkShare\" = 'PUBLIC'\n OR (\n share_permission.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM owner_team(document.owner) owner_team\n WHERE owner_team.team_id::text = ANY($2)\n )\n )\n )\n\n UNION ALL\n -- Source 3: email-attachment documents inherit access from any\n -- linked thread the caller can reach. Owning or being delegated\n -- the thread's inbox (macro_user_links) grants Edit, mirroring\n -- calendar-event delegation. A thread-level entity_access grant\n -- inherits as View regardless of its level: a SHA-deduped document\n -- can back attachments in other threads with different audiences,\n -- so a per-thread share must not confer write access to it.\n SELECT CASE\n WHEN l.macro_id = $4\n OR EXISTS (\n SELECT 1\n FROM macro_user_links mul\n WHERE mul.link_id = l.id\n AND mul.primary_macro_id = $4\n )\n THEN 'edit'\n ELSE 'view'\n END AS access_level\n FROM document_email de\n JOIN email_attachments ea ON ea.id = de.email_attachment_id\n JOIN email_messages em ON em.id = ea.message_id\n JOIN email_threads t ON t.id = em.thread_id\n JOIN email_links l ON l.id = t.link_id\n WHERE de.document_id = $3\n AND (\n l.macro_id = $4\n OR EXISTS (\n SELECT 1\n FROM macro_user_links mul\n WHERE mul.link_id = l.id\n AND mul.primary_macro_id = $4\n )\n OR EXISTS (\n SELECT 1\n FROM entity_access thread_access\n WHERE thread_access.entity_id = t.id\n AND thread_access.entity_type = 'email_thread'\n AND thread_access.source_id = ANY($2)\n )\n )\n\n UNION ALL\n -- Source 4: a file attached to a document discussion is visible to\n -- current viewers of that document. Removing the attachment, the\n -- discussion, or the parent grant removes this path; it never\n -- shares the parent itself.\n SELECT 'view' AS access_level\n FROM comms_attachments a\n JOIN comms_messages m ON m.id = a.message_id\n JOIN comms_message_threads mt ON mt.root_id = COALESCE(m.thread_id, m.id)\n JOIN \"Document\" parent_doc\n ON m.parent_entity_type = 'document' AND parent_doc.id = m.parent_entity_id\n LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = parent_doc.id\n LEFT JOIN \"SharePermission\" sp ON sp.id = dp.\"sharePermissionId\"\n WHERE a.entity_type = 'document'\n AND a.entity_id = $3\n AND m.deleted_at IS NULL\n AND mt.deleted_at IS NULL\n AND parent_doc.\"deletedAt\" IS NULL\n AND (\n parent_doc.owner = $4\n OR EXISTS (\n SELECT 1\n FROM entity_access pa\n WHERE pa.entity_type = 'document'\n AND pa.entity_id::text = parent_doc.id\n AND pa.source_id = ANY($2)\n )\n OR (\n sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM owner_team(parent_doc.owner) tu\n WHERE tu.team_id::text = ANY($2)\n )\n )\n )\n )\n )\n ) AS combined_access\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "access_level",
+ "type_info": "Text"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "TextArray",
+ "Text",
+ "Text"
+ ]
+ },
+ "nullable": [
+ null
+ ]
+ },
+ "hash": "8611553ad006066cda380b1e22f586bdac484ea189aae8dca521d3070c13e76e"
+}
diff --git a/.sqlx/query-8dd50c91dde939b322679a644cf23233e369590188fd0900d807549f1220af7f.json b/.sqlx/query-8dd50c91dde939b322679a644cf23233e369590188fd0900d807549f1220af7f.json
new file mode 100644
index 0000000000..539fb176a0
--- /dev/null
+++ b/.sqlx/query-8dd50c91dde939b322679a644cf23233e369590188fd0900d807549f1220af7f.json
@@ -0,0 +1,14 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "INSERT INTO \"Document\" (id, name, owner)\n VALUES ($1, 'Attachment', 'macro|[email protected]')",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "8dd50c91dde939b322679a644cf23233e369590188fd0900d807549f1220af7f"
+}
diff --git a/.sqlx/query-e938e87e0c773be447001cb2aa0e5e05417c90096c03813cb0fae1e413af04f6.json b/.sqlx/query-e938e87e0c773be447001cb2aa0e5e05417c90096c03813cb0fae1e413af04f6.json
deleted file mode 100644
index 5aa1109dba..0000000000
--- a/.sqlx/query-e938e87e0c773be447001cb2aa0e5e05417c90096c03813cb0fae1e413af04f6.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT access_level FROM (\n -- Source 1: entity_access source_id match\n SELECT\n access_level::text FROM entity_access\n WHERE entity_id = $1\n AND entity_type = 'document'\n AND source_id = ANY($2)\n\n UNION ALL\n -- Source 2: document link share permission\n SELECT\n share_permission.\"linkShareAccessLevel\"::text AS access_level\n FROM \"Document\" document\n JOIN \"DocumentPermission\" document_permission\n ON document_permission.\"documentId\" = document.id\n JOIN \"SharePermission\" share_permission\n ON share_permission.id = document_permission.\"sharePermissionId\"\n WHERE document.id = $3\n AND share_permission.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n share_permission.\"linkShare\" = 'PUBLIC'\n OR (\n share_permission.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM team_user owner_team\n WHERE owner_team.user_id = document.owner\n AND owner_team.team_id::text = ANY($2)\n )\n )\n )\n\n UNION ALL\n -- Source 3: email-attachment documents inherit access from any\n -- linked thread the caller can reach. Owning or being delegated\n -- the thread's inbox (macro_user_links) grants Edit, mirroring\n -- calendar-event delegation. A thread-level entity_access grant\n -- inherits as View regardless of its level: a SHA-deduped document\n -- can back attachments in other threads with different audiences,\n -- so a per-thread share must not confer write access to it.\n SELECT CASE\n WHEN l.macro_id = $4\n OR EXISTS (\n SELECT 1\n FROM macro_user_links mul\n WHERE mul.link_id = l.id\n AND mul.primary_macro_id = $4\n )\n THEN 'edit'\n ELSE 'view'\n END AS access_level\n FROM document_email de\n JOIN email_attachments ea ON ea.id = de.email_attachment_id\n JOIN email_messages em ON em.id = ea.message_id\n JOIN email_threads t ON t.id = em.thread_id\n JOIN email_links l ON l.id = t.link_id\n WHERE de.document_id = $3\n AND (\n l.macro_id = $4\n OR EXISTS (\n SELECT 1\n FROM macro_user_links mul\n WHERE mul.link_id = l.id\n AND mul.primary_macro_id = $4\n )\n OR EXISTS (\n SELECT 1\n FROM entity_access thread_access\n WHERE thread_access.entity_id = t.id\n AND thread_access.entity_type = 'email_thread'\n AND thread_access.source_id = ANY($2)\n )\n )\n\n UNION ALL\n -- Source 4: a file attached to a document discussion is visible to\n -- current viewers of that document. Removing the attachment, the\n -- discussion, or the parent grant removes this path; it never\n -- shares the parent itself.\n SELECT 'view' AS access_level\n FROM comms_attachments a\n JOIN comms_messages m ON m.id = a.message_id\n JOIN comms_message_threads mt ON mt.root_id = COALESCE(m.thread_id, m.id)\n JOIN \"Document\" parent_doc\n ON m.parent_entity_type = 'document' AND parent_doc.id = m.parent_entity_id\n LEFT JOIN \"DocumentPermission\" dp ON dp.\"documentId\" = parent_doc.id\n LEFT JOIN \"SharePermission\" sp ON sp.id = dp.\"sharePermissionId\"\n WHERE a.entity_type = 'document'\n AND a.entity_id = $3\n AND m.deleted_at IS NULL\n AND mt.deleted_at IS NULL\n AND parent_doc.\"deletedAt\" IS NULL\n AND (\n parent_doc.owner = $4\n OR EXISTS (\n SELECT 1\n FROM entity_access pa\n WHERE pa.entity_type = 'document'\n AND pa.entity_id::text = parent_doc.id\n AND pa.source_id = ANY($2)\n )\n OR (\n sp.\"linkShareAccessLevel\" IS NOT NULL\n AND (\n sp.\"linkShare\" = 'PUBLIC'\n OR (\n sp.\"linkShare\" = 'TEAM'\n AND EXISTS (\n SELECT 1\n FROM team_user tu\n WHERE tu.user_id = parent_doc.owner\n AND tu.team_id::text = ANY($2)\n )\n )\n )\n )\n )\n ) AS combined_access\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "access_level",
- "type_info": "Text"
- }
- ],
- "parameters": {
- "Left": [
- "Uuid",
- "TextArray",
- "Text",
- "Text"
- ]
- },
- "nullable": [
- null
- ]
- },
- "hash": "e938e87e0c773be447001cb2aa0e5e05417c90096c03813cb0fae1e413af04f6"
-}
diff --git a/Cargo.lock b/Cargo.lock
index 6f9f2c9a9d..630f325f62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11369,6 +11369,7 @@ dependencies = [
"macro_user_id",
"model-entity",
"model_file_type",
+ "model_owner",
"schemars 1.2.1",
"serde",
"serde_json",
@@ -15712,6 +15713,7 @@ dependencies = [
"macro_user_id",
"macro_uuid",
"model-entity",
+ "model_owner",
"models_permissions",
"rootcause",
"sqlx",
diff --git a/crates/agent_session/src/domain/sharing/test.rs b/crates/agent_session/src/domain/sharing/test.rs
index 859ee8776b..3d5a6c041c 100644
--- a/crates/agent_session/src/domain/sharing/test.rs
+++ b/crates/agent_session/src/domain/sharing/test.rs
@@ -42,7 +42,7 @@ impl SessionSharingRepo for Repo {
async fn team_share_facts(&self, _: AgentSessionId) -> Result<TeamShareFacts> {
Ok(TeamShareFacts {
entity: EntityType::AgentSession.with_entity_string(self.id.to_string()),
- owner: user(OWNER),
+ owner: user(OWNER).into(),
owner_team_id: Some(macro_uuid::generate_uuid_v7()),
current: None,
revision: 0,
diff --git a/crates/call/src/domain/service/test.rs b/crates/call/src/domain/service/test.rs
index 21c5ac82b4..ec65aac74e 100644
--- a/crates/call/src/domain/service/test.rs
+++ b/crates/call/src/domain/service/test.rs
@@ -1599,7 +1599,7 @@ const CREATOR_TEAM_ID: Uuid = Uuid::from_u128(42);
fn team_share_facts() -> TeamShareFacts {
TeamShareFacts {
entity: EntityType::Call.with_entity_string(MUTATED_EVENT_CALL_ID.to_string()),
- owner: user("[email protected]"),
+ owner: user("[email protected]").into(),
owner_team_id: Some(CREATOR_TEAM_ID),
current: None,
revision: 0,
diff --git a/crates/call/src/outbound/pg_call_repo/team_share/test.rs b/crates/call/src/outbound/pg_call_repo/team_share/test.rs
index edf0052ee2..4c0c33881b 100644
--- a/crates/call/src/outbound/pg_call_repo/team_share/test.rs
+++ b/crates/call/src/outbound/pg_call_repo/team_share/test.rs
@@ -58,7 +58,7 @@ fn live_args(share: bool, custom_name: Option<&str>) -> EditCallRecordRepoArgs {
/// Authorize `level` exactly as the domain service would for the persisted creator.
fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {
authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
facts,
TeamShareRequest {
access_level: Some(level),
@@ -73,7 +73,7 @@ fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeam
/// Authorize the deprecated `shareWithTeam` alias as the domain service would.
fn legacy_command(facts: &TeamShareFacts, enabled: bool) -> AuthorizedTeamShareCommand {
authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
facts,
TeamShareRequest {
access_level: None,
@@ -221,7 +221,7 @@ async fn get_team_share_facts_reads_creator_team_and_null_state(
facts.entity,
EntityType::Call.with_entity_string(call_id.to_string())
);
- assert_eq!(facts.owner.as_ref(), USER_A.as_ref());
+ assert!(facts.owner.is_user(&USER_A));
assert_eq!(facts.owner_team_id, Some(TEAM_ID));
assert_eq!(facts.current, None);
assert_eq!(facts.revision, 0);
diff --git a/crates/chat/src/domain/service/chat/test.rs b/crates/chat/src/domain/service/chat/test.rs
index 56c8214294..511afb7cba 100644
--- a/crates/chat/src/domain/service/chat/test.rs
+++ b/crates/chat/src/domain/service/chat/test.rs
@@ -906,7 +906,7 @@ fn team_share_facts(
) -> TeamShareFacts {
TeamShareFacts {
entity: EntityType::Chat.with_entity_str(CHAT_ID),
- owner,
+ owner: owner.into(),
owner_team_id,
current: None,
revision,
diff --git a/crates/chat/src/outbound/postgres/team_share/test.rs b/crates/chat/src/outbound/postgres/team_share/test.rs
index 3a6e2fd622..2c6725e9ff 100644
--- a/crates/chat/src/outbound/postgres/team_share/test.rs
+++ b/crates/chat/src/outbound/postgres/team_share/test.rs
@@ -50,7 +50,7 @@ fn team_share_request(level: Option<AccessLevel>) -> UpdateSharePermissionReques
/// Authorize `level` exactly as the domain service would for the persisted owner.
fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {
authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
facts,
TeamShareRequest {
access_level: Some(level),
@@ -147,7 +147,7 @@ async fn get_team_share_facts_reads_owner_team_and_null_state(pool: PgPool) {
assert_eq!(facts.entity.entity_type, EntityType::Chat);
assert_eq!(facts.entity.entity_id, chat_id);
- assert_eq!(facts.owner, owner());
+ assert!(facts.owner.is_user(&owner()));
assert_eq!(facts.owner_team_id, Some(TEAM_ID));
assert_eq!(facts.current, None);
assert_eq!(facts.revision, 0);
diff --git a/crates/documents/src/domain/service/tests.rs b/crates/documents/src/domain/service/tests.rs
index 2b4dbf36dd..1ceba46bca 100644
--- a/crates/documents/src/domain/service/tests.rs
+++ b/crates/documents/src/domain/service/tests.rs
@@ -1512,9 +1512,7 @@ fn owner_receipt(document_id: &str) -> EntityAccessReceipt<OwnerAccessLevel> {
}
fn team_share_facts() -> models_permissions::share_permission::team_share::TeamShareFacts {
- let Owner::User(owner) = task_document_context("doc-1").owner else {
- panic!("test document owner is a user");
- };
+ let owner = task_document_context("doc-1").owner;
models_permissions::share_permission::team_share::TeamShareFacts {
entity: EntityType::Document.with_entity_str("doc-1"),
owner,
@@ -1644,7 +1642,7 @@ fn owner_bot_edit_receipt() -> EntityAccessReceipt<EditAccessLevel> {
EntityAccessReceipt::try_new_bot(
bot_id().into_storage_id(),
BotReceiptScope::User {
- acting_user: team_share_facts().owner,
+ acting_user: team_share_facts().owner.as_user().unwrap().clone(),
},
Entity {
entity_id: "doc-1".to_string(),
diff --git a/crates/documents/src/outbound/pg_document_repo/share.rs b/crates/documents/src/outbound/pg_document_repo/share.rs
index 02cd6aa75e..7478d0ac0d 100644
--- a/crates/documents/src/outbound/pg_document_repo/share.rs
+++ b/crates/documents/src/outbound/pg_document_repo/share.rs
@@ -8,6 +8,9 @@ use sqlx::{PgPool, Postgres, Transaction};
use crate::domain::models::{DocumentError, DocumentTeamShare};
+#[cfg(test)]
+mod test;
+
// Existing repository operations retain their SQLx error type; conditional edits
// expose domain errors so authorization conflicts reach callers without becoming 500s.
impl From<sqlx::Error> for DocumentError {
diff --git a/crates/documents/src/outbound/pg_document_repo/share/test.rs b/crates/documents/src/outbound/pg_document_repo/share/test.rs
new file mode 100644
index 0000000000..7a1ad5f5b4
--- /dev/null
+++ b/crates/documents/src/outbound/pg_document_repo/share/test.rs
@@ -0,0 +1,67 @@
+use super::*;
+use entity_access_db_utils::team_share::{acquire_guard, upsert_direct};
+use macro_db_migrator::MACRO_DB_MIGRATIONS;
+use models_permissions::share_permission::access_level::AccessLevel;
+use uuid::Uuid;
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(
+ path = "../../../../../entity_access/fixtures",
+ scripts("typed_owner_team")
+ )
+)]
+async fn typed_owner_toggle_reads_audience_and_adopts_only_its_legacy_grant(pool: PgPool) {
+ let team = Uuid::parse_str("90000000-0000-0000-0000-000000000011").unwrap();
+ let other_team = Uuid::parse_str("90000000-0000-0000-0000-000000000012").unwrap();
+ for (suffix, has_team) in [
+ (31, true),
+ (32, false),
+ (33, true),
+ (34, true),
+ (35, true),
+ (36, false),
+ (37, false),
+ ] {
+ let id = format!("90000000-0000-0000-0000-{suffix:012}");
+ let uuid = Uuid::parse_str(&id).unwrap();
+ let initial = get_team_share(&pool, &id).await.unwrap();
+ assert_eq!(initial.team_id, has_team.then_some(team));
+ assert!(!initial.shared_with_team);
+
+ // Foreign direct grants must not make the owner's toggle look enabled.
+ let mut tx = pool.begin().await.unwrap();
+ acquire_guard(&mut tx).await.unwrap();
+ upsert_direct(
+ tx.as_mut(),
+ &uuid,
+ EntityType::Document,
+ other_team,
+ AccessLevel::Comment,
+ )
+ .await
+ .unwrap();
+ tx.commit().await.unwrap();
+ assert!(!get_team_share(&pool, &id).await.unwrap().shared_with_team);
+
+ if has_team {
+ let mut tx = pool.begin().await.unwrap();
+ acquire_guard(&mut tx).await.unwrap();
+ upsert_direct(
+ tx.as_mut(),
+ &uuid,
+ EntityType::Document,
+ team,
+ AccessLevel::Comment,
+ )
+ .await
+ .unwrap();
+ tx.commit().await.unwrap();
+ let shared = get_team_share(&pool, &id).await.unwrap();
+ assert_eq!(shared.team_id, Some(team));
+ assert!(shared.shared_with_team);
+ let facts = get_team_share_facts(&pool, &id).await.unwrap();
+ assert_eq!(facts.current.unwrap().team_id, team);
+ }
+ }
+}
diff --git a/crates/documents/src/outbound/pg_document_repo/tests.rs b/crates/documents/src/outbound/pg_document_repo/tests.rs
index 1c391dbfe4..69c8af2ac4 100644
--- a/crates/documents/src/outbound/pg_document_repo/tests.rs
+++ b/crates/documents/src/outbound/pg_document_repo/tests.rs
@@ -29,7 +29,7 @@ async fn set_legacy_team_share(
) -> Result<crate::domain::models::DocumentTeamShare, crate::domain::models::DocumentError> {
let facts = repo.get_team_share_facts(document_id).await?;
let command = authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
&facts,
TeamShareRequest {
access_level: None,
@@ -45,7 +45,7 @@ async fn set_legacy_team_share(
async fn set_comment_share(repo: &PgDocumentRepo) {
let facts = repo.get_team_share_facts(TEST_DOCUMENT_ID).await.unwrap();
let command = authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
&facts,
TeamShareRequest {
access_level: Some(Some(AccessLevel::Comment)),
@@ -61,7 +61,7 @@ async fn set_comment_share(repo: &PgDocumentRepo) {
async fn team_edit_args(repo: &PgDocumentRepo, level: Option<AccessLevel>) -> EditDocumentRepoArgs {
let facts = repo.get_team_share_facts(TEST_DOCUMENT_ID).await.unwrap();
let command = authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
&facts,
TeamShareRequest {
access_level: Some(level),
diff --git a/crates/entity_access/fixtures/typed_owner_team.sql b/crates/entity_access/fixtures/typed_owner_team.sql
new file mode 100644
index 0000000000..57bc3421a9
--- /dev/null
+++ b/crates/entity_access/fixtures/typed_owner_team.sql
@@ -0,0 +1,49 @@
+INSERT INTO macro_user (id, username, email, stripe_customer_id) VALUES
+('90000000-0000-0000-0000-000000000001', 'typed-owner', '[email protected]', 'typed-owner'),
+('90000000-0000-0000-0000-000000000002', 'typed-other', '[email protected]', 'typed-other'),
+('90000000-0000-0000-0000-000000000003', 'typed-teamless', '[email protected]', 'typed-teamless');
+INSERT INTO "User" (id, email, macro_user_id) VALUES
+('macro|[email protected]', '[email protected]', '90000000-0000-0000-0000-000000000001'),
+('macro|[email protected]', '[email protected]', '90000000-0000-0000-0000-000000000002'),
+('macro|[email protected]', '[email protected]', '90000000-0000-0000-0000-000000000003');
+INSERT INTO team (id, name, owner_id) VALUES
+('90000000-0000-0000-0000-000000000011', 'Owner team', 'macro|[email protected]'),
+('90000000-0000-0000-0000-000000000012', 'Other team', 'macro|[email protected]');
+INSERT INTO team_user (team_id, user_id, team_role) VALUES
+('90000000-0000-0000-0000-000000000011', 'macro|[email protected]', 'owner'),
+('90000000-0000-0000-0000-000000000012', 'macro|[email protected]', 'owner');
+INSERT INTO bots (id, kind, owner_user_id, team_id, name, handle, created_by) VALUES
+('90000000-0000-0000-0000-000000000021', 'owned', NULL, '90000000-0000-0000-0000-000000000011', 'Team bot', 'team-bot', 'macro|[email protected]'),
+('90000000-0000-0000-0000-000000000022', 'owned', 'macro|[email protected]', NULL, 'User bot', 'user-bot', 'macro|[email protected]'),
+('90000000-0000-0000-0000-000000000023', 'owned', 'macro|[email protected]', NULL, 'Teamless bot', 'teamless-bot', 'macro|[email protected]');
+-- Legacy entity owner columns still reference User. Test-only principal rows let
+-- us exercise typed reads without dropping FKs or changing production ownership.
+INSERT INTO "User" (id, email, macro_user_id)
+SELECT id, email, '90000000-0000-0000-0000-000000000001'::uuid FROM (VALUES
+('90000000-0000-0000-0000-000000000011', '[email protected]'),
+('bot|90000000-0000-0000-0000-000000000021', '[email protected]'),
+('bot|90000000-0000-0000-0000-000000000022', '[email protected]'),
+('bot|90000000-0000-0000-0000-000000000023', '[email protected]'),
+('bot|90000000-0000-0000-0000-000000000024', '[email protected]')) AS principals(id, email);
+-- A legacy principal row's membership must not override its typed ownership.
+INSERT INTO team_user (team_id, user_id, team_role) VALUES
+('90000000-0000-0000-0000-000000000012', '90000000-0000-0000-0000-000000000011', 'member'),
+('90000000-0000-0000-0000-000000000012', 'bot|90000000-0000-0000-0000-000000000021', 'member'),
+('90000000-0000-0000-0000-000000000012', 'bot|90000000-0000-0000-0000-000000000022', 'member'),
+('90000000-0000-0000-0000-000000000012', 'bot|90000000-0000-0000-0000-000000000023', 'member'),
+('90000000-0000-0000-0000-000000000012', 'bot|90000000-0000-0000-0000-000000000024', 'member');
+INSERT INTO "Document" (id, name, owner) VALUES
+('90000000-0000-0000-0000-000000000031', 'User', 'macro|[email protected]'),
+('90000000-0000-0000-0000-000000000032', 'Teamless user', 'macro|[email protected]'),
+('90000000-0000-0000-0000-000000000033', 'Team', '90000000-0000-0000-0000-000000000011'),
+('90000000-0000-0000-0000-000000000034', 'Team bot', 'bot|90000000-0000-0000-0000-000000000021'),
+('90000000-0000-0000-0000-000000000035', 'User bot', 'bot|90000000-0000-0000-0000-000000000022'),
+('90000000-0000-0000-0000-000000000036', 'Teamless bot', 'bot|90000000-0000-0000-0000-000000000023'),
+('90000000-0000-0000-0000-000000000037', 'Missing bot', 'bot|90000000-0000-0000-0000-000000000024');
+INSERT INTO "Project" (id, name, "userId") SELECT id, name, owner FROM "Document";
+INSERT INTO "Chat" (id, name, "userId") SELECT id, name, owner FROM "Document";
+INSERT INTO "SharePermission" (id, "linkShare", "linkShareAccessLevel")
+SELECT id, 'TEAM', 'comment' FROM "Document";
+INSERT INTO "DocumentPermission" ("documentId", "sharePermissionId") SELECT id, id FROM "Document";
+INSERT INTO "ProjectPermission" ("projectId", "sharePermissionId") SELECT id, id FROM "Project";
+INSERT INTO "ChatPermission" ("chatId", "sharePermissionId") SELECT id, id FROM "Chat";
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries.rs b/crates/entity_access/src/outbound/pg_access_repo/queries.rs
index 7b0fe4b2df..92c29f183b 100644
--- a/crates/entity_access/src/outbound/pg_access_repo/queries.rs
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries.rs
@@ -38,6 +38,8 @@ pub mod thread_access;
#[cfg(test)]
mod test;
+#[cfg(test)]
+mod typed_owner_test;
/// Type safety for source ids for entity_access table
#[derive(Debug, Clone)]
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/chat_access.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/chat_access.rs
index cd76ba8497..f63be70f6c 100644
--- a/crates/entity_access/src/outbound/pg_access_repo/queries/chat_access.rs
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries/chat_access.rs
@@ -66,7 +66,7 @@ pub async fn get_chat_access(
AND EXISTS (
SELECT 1
FROM "Chat" c
- JOIN team_user owner_tu ON owner_tu.user_id = c."userId"
+ CROSS JOIN owner_team(c."userId") owner_tu
WHERE c.id = $3
AND owner_tu.team_id::text = ANY($2)
)
@@ -131,9 +131,8 @@ pub async fn explain_chat_access(
FROM "SharePermission" sp
JOIN "ChatPermission" cp ON cp."sharePermissionId" = sp.id
JOIN "Chat" c ON c.id = cp."chatId"
- JOIN team_user owner_tu
- ON owner_tu.user_id = c."userId"
- AND owner_tu.team_id::text = ANY($2)
+ JOIN owner_team(c."userId") owner_tu
+ ON owner_tu.team_id::text = ANY($2)
WHERE cp."chatId" = $1
AND sp."linkShare" = 'TEAM'
AND sp."linkShareAccessLevel" IS NOT NULL
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/document_access.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/document_access.rs
index b424fd0fdc..7c4756c860 100644
--- a/crates/entity_access/src/outbound/pg_access_repo/queries/document_access.rs
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries/document_access.rs
@@ -72,9 +72,8 @@ pub async fn get_document_access(
share_permission."linkShare" = 'TEAM'
AND EXISTS (
SELECT 1
- FROM team_user owner_team
- WHERE owner_team.user_id = document.owner
- AND owner_team.team_id::text = ANY($2)
+ FROM owner_team(document.owner) owner_team
+ WHERE owner_team.team_id::text = ANY($2)
)
)
)
@@ -156,9 +155,8 @@ pub async fn get_document_access(
sp."linkShare" = 'TEAM'
AND EXISTS (
SELECT 1
- FROM team_user tu
- WHERE tu.user_id = parent_doc.owner
- AND tu.team_id::text = ANY($2)
+ FROM owner_team(parent_doc.owner) tu
+ WHERE tu.team_id::text = ANY($2)
)
)
)
@@ -248,9 +246,8 @@ async fn explain_document_link_shares(
ON document_permission."documentId" = document.id
JOIN "SharePermission" share_permission
ON share_permission.id = document_permission."sharePermissionId"
- JOIN team_user owner_team
- ON owner_team.user_id = document.owner
- AND owner_team.team_id::text = ANY($2)
+ JOIN owner_team(document.owner) owner_team
+ ON owner_team.team_id::text = ANY($2)
WHERE document.id = $1
AND share_permission."linkShare" = 'TEAM'
AND share_permission."linkShareAccessLevel" IS NOT NULL
@@ -372,8 +369,8 @@ pub async fn get_legacy_document_access(
OR (
"linkShare" = 'TEAM'
AND EXISTS (
- SELECT 1 FROM team_user t
- WHERE t.user_id = p.owner AND t.team_id::text = ANY($3)
+ SELECT 1 FROM owner_team(p.owner) t
+ WHERE t.team_id::text = ANY($3)
)
)
)
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/project_access.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/project_access.rs
index 3d89aa486f..5bfc2e2be0 100644
--- a/crates/entity_access/src/outbound/pg_access_repo/queries/project_access.rs
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries/project_access.rs
@@ -68,7 +68,7 @@ pub async fn get_project_access(
AND EXISTS (
SELECT 1
FROM "Project" p
- JOIN team_user owner_team ON owner_team.user_id = p."userId"
+ CROSS JOIN owner_team(p."userId") owner_team
WHERE p.id = $3
AND owner_team.team_id::text = ANY($2)
)
@@ -135,9 +135,8 @@ pub async fn explain_project_access(
FROM "SharePermission" sp
JOIN "ProjectPermission" pp ON pp."sharePermissionId" = sp.id
JOIN "Project" p ON p.id = pp."projectId"
- JOIN team_user owner_team
- ON owner_team.user_id = p."userId"
- AND owner_team.team_id::text = ANY($2)
+ JOIN owner_team(p."userId") owner_team
+ ON owner_team.team_id::text = ANY($2)
WHERE pp."projectId" = $1
AND sp."linkShare" = 'TEAM'
AND sp."linkShareAccessLevel" IS NOT NULL
diff --git a/crates/entity_access/src/outbound/pg_access_repo/queries/typed_owner_test.rs b/crates/entity_access/src/outbound/pg_access_repo/queries/typed_owner_test.rs
new file mode 100644
index 0000000000..96c26a2ea5
--- /dev/null
+++ b/crates/entity_access/src/outbound/pg_access_repo/queries/typed_owner_test.rs
@@ -0,0 +1,147 @@
+//! All typed TEAM-link query implementations must agree, including explanations.
+use super::{SourceIds, chat_access, document_access, project_access};
+use crate::domain::models::AccessLevel;
+use macro_db_migrator::MACRO_DB_MIGRATIONS;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../../fixtures", scripts("typed_owner_team"))
+)]
+async fn discussion_attachments_use_the_parents_typed_owner_audience(
+ pool: PgPool,
+) -> anyhow::Result<()> {
+ let child = fixture_entity_id(40);
+ sqlx::query!(
+ r#"INSERT INTO "Document" (id, name, owner)
+ VALUES ($1, 'Attachment', 'macro|[email protected]')"#,
+ child.to_string()
+ )
+ .execute(&pool)
+ .await?;
+ let sources = SourceIds(vec!["90000000-0000-0000-0000-000000000011".to_string()]);
+ let other = SourceIds(vec!["90000000-0000-0000-0000-000000000012".to_string()]);
+ for (suffix, has_team) in [
+ (31, true),
+ (32, false),
+ (33, true),
+ (34, true),
+ (35, true),
+ (36, false),
+ (37, false),
+ ] {
+ let message = Uuid::now_v7();
+ let attachment = Uuid::now_v7();
+ sqlx::query!(
+ r#"INSERT INTO comms_messages (id, sender_id, content, parent_entity_type, parent_entity_id)
+ VALUES ($1, 'macro|[email protected]', 'attachment', 'document', $2)"#,
+ message,
+ fixture_entity_id(suffix).to_string()
+ )
+ .execute(&pool)
+ .await?;
+ sqlx::query!(
+ r#"INSERT INTO comms_attachments (id, message_id, entity_type, entity_id)
+ VALUES ($1, $2, 'document', $3)"#,
+ attachment,
+ message,
+ child.to_string()
+ )
+ .execute(&pool)
+ .await?;
+ assert_eq!(
+ document_access::get_document_access(&pool, &child, &sources, None).await?,
+ has_team.then_some(AccessLevel::View)
+ );
+ assert_eq!(
+ document_access::get_document_access(&pool, &child, &other, None).await?,
+ None
+ );
+ sqlx::query!("DELETE FROM comms_attachments WHERE id = $1", attachment)
+ .execute(&pool)
+ .await?;
+ assert_eq!(
+ document_access::get_document_access(&pool, &child, &sources, None).await?,
+ None
+ );
+ }
+ Ok(())
+}
+
+fn fixture_entity_id(suffix: u8) -> Uuid {
+ Uuid::parse_str(&format!("90000000-0000-0000-0000-{suffix:012}")).unwrap()
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../../fixtures", scripts("typed_owner_team"))
+)]
+async fn typed_owner_team_links_allow_only_the_resolved_audience(
+ pool: PgPool,
+) -> anyhow::Result<()> {
+ let team = Uuid::parse_str("90000000-0000-0000-0000-000000000011")?;
+ for (suffix, has_team) in [
+ (31, true),
+ (32, false),
+ (33, true),
+ (34, true),
+ (35, true),
+ (36, false),
+ (37, false),
+ ] {
+ let id = fixture_entity_id(suffix);
+ for (sources, matches_team) in [
+ (vec![team.to_string()], true),
+ (
+ vec!["90000000-0000-0000-0000-000000000012".to_string()],
+ false,
+ ),
+ (vec!["macro|[email protected]".to_string()], false),
+ (vec![], false),
+ ] {
+ let sources = SourceIds(sources);
+ let expected = (has_team && matches_team).then_some(AccessLevel::Comment);
+ assert_eq!(
+ document_access::get_document_access(&pool, &id, &sources, None).await?,
+ expected,
+ "document {suffix}"
+ );
+ assert_eq!(
+ document_access::get_legacy_document_access(&pool, &id.to_string(), &sources, None)
+ .await?,
+ expected,
+ "legacy {suffix}"
+ );
+ assert_eq!(
+ project_access::get_project_access(&pool, &id, &sources).await?,
+ expected,
+ "project {suffix}"
+ );
+ assert_eq!(
+ chat_access::get_chat_access(&pool, &id, &sources).await?,
+ expected,
+ "chat {suffix}"
+ );
+
+ #[cfg(feature = "explain_binary")]
+ for grants in [
+ document_access::explain_document_access(&pool, &id, &sources, None).await?,
+ project_access::explain_project_access(&pool, &id, &sources).await?,
+ chat_access::explain_chat_access(&pool, &id, &sources).await?,
+ ] {
+ use crate::domain::models::AccessGrant;
+ let expected = expected.map(|access_level| AccessGrant::TeamLink {
+ access_level,
+ owner_team_id: team,
+ });
+ assert_eq!(
+ grants,
+ expected.into_iter().collect::<Vec<_>>(),
+ "explanation {suffix}"
+ );
+ }
+ }
+ }
+ Ok(())
+}
diff --git a/crates/initiative/src/domain/service/test.rs b/crates/initiative/src/domain/service/test.rs
index d1619236ec..e0cbdccc80 100644
--- a/crates/initiative/src/domain/service/test.rs
+++ b/crates/initiative/src/domain/service/test.rs
@@ -124,7 +124,7 @@ fn share_update() -> UpdateSharePermissionRequestV2 {
fn team_facts(entity_type: EntityType, entity_id: String, owner: &str) -> TeamShareFacts {
TeamShareFacts {
entity: entity_type.with_entity_string(entity_id),
- owner: user(owner),
+ owner: user(owner).into(),
owner_team_id: Some(uuid::Uuid::from_u128(7)),
current: None,
revision: 0,
diff --git a/crates/initiative/src/outbound/pg_initiative_repo/test.rs b/crates/initiative/src/outbound/pg_initiative_repo/test.rs
index 2fdcce5e40..ee42642055 100644
--- a/crates/initiative/src/outbound/pg_initiative_repo/test.rs
+++ b/crates/initiative/src/outbound/pg_initiative_repo/test.rs
@@ -423,7 +423,7 @@ async fn create_links_description_document_and_mirrors_member_and_team_grants_as
assert_eq!(facts.initiative.revision, 1);
assert_eq!(facts.description.current, grant);
assert_eq!(facts.description.revision, 1);
- assert_eq!(facts.description.owner.as_ref(), OWNER);
+ assert_eq!(facts.description.owner.principal_id(), OWNER);
let basic = repo.get_basic(id).await?.expect("created initiative");
assert_eq!(basic.name, "Launch");
diff --git a/crates/macro_db_client/migrations/20260922200142_resolve_typed_owner_team.sql b/crates/macro_db_client/migrations/20260922200142_resolve_typed_owner_team.sql
new file mode 100644
index 0000000000..753838e77f
--- /dev/null
+++ b/crates/macro_db_client/migrations/20260922200142_resolve_typed_owner_team.sql
@@ -0,0 +1,26 @@
+-- Set-based implementation of model_owner::team::owner_team (Q10).
+-- Keep this SQL function inlinable: user owners retain the indexed team_user
+-- lookup, with no per-entity client round trips. Membership is unique by user_id.
+-- This resolves a link audience only, never the principal allowed to edit shares.
+CREATE FUNCTION public.owner_team(principal text)
+RETURNS TABLE (team_id uuid)
+LANGUAGE sql STABLE PARALLEL SAFE
+AS $$
+ SELECT tu.team_id
+ FROM public.team_user tu
+ WHERE tu.user_id = principal
+ -- Retain legacy user ids, but never treat a typed bot/team as a user.
+ AND principal NOT LIKE 'bot|%'
+ AND principal !~ '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+ UNION ALL
+ SELECT CASE WHEN principal ~ '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+ THEN principal::uuid END
+ WHERE principal ~ '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+ UNION ALL
+ SELECT COALESCE(b.team_id, tu.team_id)
+ FROM public.bots b
+ LEFT JOIN public.team_user tu ON b.team_id IS NULL AND tu.user_id = b.owner_user_id
+ WHERE b.id = CASE WHEN principal ~ '^bot\|[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+ THEN substring(principal FROM 5)::uuid END
+ AND COALESCE(b.team_id, tu.team_id) IS NOT NULL
+$$;
diff --git a/crates/macro_db_client/src/share_permission/access_level/chat.rs b/crates/macro_db_client/src/share_permission/access_level/chat.rs
index 7c8f7e84ad..0a3a0aa52c 100644
--- a/crates/macro_db_client/src/share_permission/access_level/chat.rs
+++ b/crates/macro_db_client/src/share_permission/access_level/chat.rs
@@ -63,9 +63,8 @@ pub async fn get_highest_access_level_for_chats(
sp."linkShare" = 'TEAM'
AND EXISTS (
SELECT 1
- FROM team_user owner_team
- WHERE owner_team.user_id = c."userId"
- AND owner_team.team_id::text = ANY(
+ FROM owner_team(c."userId") owner_team
+ WHERE owner_team.team_id::text = ANY(
SELECT source_id FROM user_source_ids
)
)
diff --git a/crates/macro_db_client/src/share_permission/access_level/chat_tests.rs b/crates/macro_db_client/src/share_permission/access_level/chat_tests.rs
index 71c0477b8e..362a9a22d6 100644
--- a/crates/macro_db_client/src/share_permission/access_level/chat_tests.rs
+++ b/crates/macro_db_client/src/share_permission/access_level/chat_tests.rs
@@ -147,6 +147,33 @@ async fn test_batch_team_link_denies_other_team_user(
Ok(())
}
+#[sqlx::test(fixtures(
+ path = "../../../../entity_access/fixtures",
+ scripts("typed_owner_team")
+))]
+async fn typed_owner_team_links_match_batch_access(pool: sqlx::PgPool) -> anyhow::Result<()> {
+ let ids: Vec<_> = (31..=37)
+ .map(|suffix| format!("90000000-0000-0000-0000-{suffix:012}"))
+ .collect();
+ for (user, member) in [
+ ("macro|[email protected]", true),
+ ("macro|[email protected]", false),
+ ("macro|[email protected]", false),
+ ] {
+ let levels = get_highest_access_level_for_chats(&pool, &ids, user).await?;
+ for (id, has_team) in ids
+ .iter()
+ .zip([true, false, true, true, true, false, false])
+ {
+ assert_eq!(
+ levels.get(id),
+ Some(&(member && has_team).then_some(AccessLevel::Comment))
+ );
+ }
+ }
+ Ok(())
+}
+
#[sqlx::test(fixtures(path = "../../../fixtures", scripts("highest_access_level_for_chat")))]
async fn test_batch_empty_input(pool: sqlx::Pool<sqlx::Postgres>) -> anyhow::Result<()> {
// SCENARIO: Test with empty chat_ids vector
diff --git a/crates/model_owner/src/lib.rs b/crates/model_owner/src/lib.rs
index 7a5e1a55a3..973cee6e7e 100644
--- a/crates/model_owner/src/lib.rs
+++ b/crates/model_owner/src/lib.rs
@@ -24,6 +24,8 @@ use uuid::Uuid;
#[cfg(test)]
mod test;
+pub mod team;
+
const USER_PRINCIPAL_PREFIX: &str = "macro|";
const BOT_PRINCIPAL_PREFIX: &str = "bot|";
const TEAM_UUID_HYPHENATED_LEN: usize = 36;
@@ -154,6 +156,12 @@ impl Display for Owner {
}
}
+impl From<MacroUserIdStr<'static>> for Owner {
+ fn from(user: MacroUserIdStr<'static>) -> Self {
+ Self::User(user)
+ }
+}
+
impl From<Owner> for String {
fn from(value: Owner) -> Self {
value.principal_id()
diff --git a/crates/model_owner/src/team.rs b/crates/model_owner/src/team.rs
new file mode 100644
index 0000000000..53af0dbbdc
--- /dev/null
+++ b/crates/model_owner/src/team.rs
@@ -0,0 +1,36 @@
+//! Team-link audience policy. Resolving an audience never confers ownership.
+//!
+//! PostgreSQL's `owner_team` is the set-based implementation of this policy;
+//! adapter tests check it against this function for every owner kind.
+
+use uuid::Uuid;
+
+use crate::Owner;
+
+#[cfg(test)]
+mod test;
+
+/// Repository-derived membership and bot ownership facts, not caller-supplied teams.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct OwnerTeamFacts {
+ /// The user's membership for a user owner.
+ pub user_team: Option<Uuid>,
+ /// The bot's explicit team, if it is team-owned.
+ pub bot_team: Option<Uuid>,
+ /// The owning user's membership, if the bot is user-owned.
+ pub bot_user_team: Option<Uuid>,
+}
+
+/// Resolve the team-link audience for a typed owner.
+///
+/// Users retain their current membership; teams are their own audience. A bot's
+/// explicit team takes precedence over its owning user's membership. Missing
+/// bots and teamless users have no audience. This does not authorize share edits.
+#[must_use]
+pub fn owner_team(owner: &Owner, facts: OwnerTeamFacts) -> Option<Uuid> {
+ match owner {
+ Owner::User(_) => facts.user_team,
+ Owner::Team(team) => Some(*team),
+ Owner::Bot(_) => facts.bot_team.or(facts.bot_user_team),
+ }
+}
diff --git a/crates/model_owner/src/team/test.rs b/crates/model_owner/src/team/test.rs
new file mode 100644
index 0000000000..0ef2a12336
--- /dev/null
+++ b/crates/model_owner/src/team/test.rs
@@ -0,0 +1,33 @@
+use super::*;
+
+#[test]
+fn resolves_only_the_typed_owners_audience() {
+ let user = Owner::from_principal_str("macro|[email protected]").unwrap();
+ let bot = Owner::from_principal_str("bot|00000000-0000-0000-0000-000000000001").unwrap();
+ let team = Uuid::from_u128(2);
+ let other = Uuid::from_u128(3);
+ let facts = OwnerTeamFacts {
+ user_team: Some(other),
+ bot_team: Some(team),
+ bot_user_team: Some(other),
+ };
+ assert_eq!(owner_team(&user, facts), Some(other));
+ assert_eq!(owner_team(&bot, facts), Some(team));
+ assert_eq!(owner_team(&Owner::Team(team), facts), Some(team));
+ assert_eq!(
+ owner_team(
+ &bot,
+ OwnerTeamFacts {
+ bot_team: None,
+ ..facts
+ }
+ ),
+ Some(other)
+ );
+ assert_eq!(owner_team(&user, OwnerTeamFacts::default()), None);
+ assert_eq!(owner_team(&bot, OwnerTeamFacts::default()), None);
+ assert_eq!(
+ owner_team(&Owner::Team(team), OwnerTeamFacts::default()),
+ Some(team)
+ );
+}
diff --git a/crates/models_permissions/Cargo.toml b/crates/models_permissions/Cargo.toml
index 6ee8e9a07e..4301cd8d7d 100644
--- a/crates/models_permissions/Cargo.toml
+++ b/crates/models_permissions/Cargo.toml
@@ -8,6 +8,7 @@ version = "0.1.0"
macro_user_id = { path = "../macro_user_id" }
model-entity = { path = "../model-entity" }
model_file_type = { path = "../model_file_type" }
+model_owner = { path = "../model_owner" }
schemars = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
diff --git a/crates/models_permissions/src/share_permission/team_share.rs b/crates/models_permissions/src/share_permission/team_share.rs
index b21969e6e7..9d96e7ecfe 100644
--- a/crates/models_permissions/src/share_permission/team_share.rs
+++ b/crates/models_permissions/src/share_permission/team_share.rs
@@ -7,6 +7,7 @@
use macro_user_id::user_id::MacroUserIdStr;
use model_entity::Entity;
+use model_owner::Owner;
use uuid::Uuid;
use super::access_level::AccessLevel;
@@ -63,8 +64,8 @@ pub struct TeamShareFacts {
/// The entity whose ownership and sharing state were loaded.
pub entity: Entity<'static>,
/// Persisted actual owner, not an actor with an effective Owner grant.
- pub owner: MacroUserIdStr<'static>,
- /// The actual owner's current team membership, if any.
+ pub owner: Owner,
+ /// The actual owner's team-link audience, if any; not an ownership grant.
pub owner_team_id: Option<Uuid>,
/// Canonical explicit state; inherited or unexplained grants must not populate this.
pub current: Option<TeamShareGrant>,
@@ -139,6 +140,8 @@ pub enum TeamSharePolicyError {
/// The entity service supplies `acting_user` from its verified receipt's
/// `acting_user_id()`; it must not substitute the persisted owner for a missing actor.
/// Omission deliberately skips owner/team checks and causes no revision or grant writes.
+/// Supplied user edits require a matching `Owner::User`; resolving a bot/team audience
+/// does not authorize its creator, owning user, team member, or administrator to edit it.
/// Document legacy enable uses Edit; call legacy enable uses View. When both inputs
/// are supplied, the explicit level wins if their enabled/disabled states agree.
pub fn authorize_team_share(
@@ -152,7 +155,7 @@ pub fn authorize_team_share(
}
let actor = acting_user.ok_or(TeamSharePolicyError::MissingActor)?;
- if actor != &facts.owner {
+ if !facts.owner.is_user(actor) {
return Err(TeamSharePolicyError::NotOwner);
}
diff --git a/crates/models_permissions/src/share_permission/team_share/test.rs b/crates/models_permissions/src/share_permission/team_share/test.rs
index 1525518aad..ad30672be5 100644
--- a/crates/models_permissions/src/share_permission/team_share/test.rs
+++ b/crates/models_permissions/src/share_permission/team_share/test.rs
@@ -8,7 +8,7 @@ fn owner() -> MacroUserIdStr<'static> {
fn facts() -> TeamShareFacts {
TeamShareFacts {
entity: EntityType::Document.with_entity_string("document-id".to_string()),
- owner: owner(),
+ owner: owner().into(),
owner_team_id: Some(Uuid::from_u128(1)),
current: None,
revision: 7,
@@ -86,6 +86,34 @@ fn every_supplied_operation_requires_the_actual_owner() {
}
}
+#[test]
+fn resolving_a_bot_or_team_audience_does_not_authorize_a_user_to_edit_sharing() {
+ for owner in [
+ Owner::Team(Uuid::from_u128(1)),
+ Owner::from_principal_str("bot|00000000-0000-0000-0000-000000000002").unwrap(),
+ ] {
+ let facts = TeamShareFacts { owner, ..facts() };
+ for request in [
+ request(Some(AccessLevel::Edit)),
+ request(None),
+ TeamShareRequest {
+ legacy_enabled: Some(true),
+ ..Default::default()
+ },
+ TeamShareRequest {
+ legacy_enabled: Some(false),
+ ..Default::default()
+ },
+ ] {
+ assert_eq!(
+ authorize(&facts, request),
+ Err(TeamSharePolicyError::NotOwner)
+ );
+ }
+ assert_eq!(authorize(&facts, TeamShareRequest::default()), Ok(None));
+ }
+}
+
#[test]
fn repeated_clear_without_a_team_still_requires_the_owner() {
let mut facts = facts();
diff --git a/crates/projects/src/domain/service/tests.rs b/crates/projects/src/domain/service/tests.rs
index 22beee030c..3fa499ec2d 100644
--- a/crates/projects/src/domain/service/tests.rs
+++ b/crates/projects/src/domain/service/tests.rs
@@ -2304,7 +2304,7 @@ fn team_share_facts(
) -> TeamShareFacts {
TeamShareFacts {
entity: EntityType::Project.with_entity_string(project_id.to_string()),
- owner,
+ owner: owner.into(),
owner_team_id,
current: None,
revision,
diff --git a/crates/projects/src/outbound/pg_project_repo/team_share/test.rs b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
index 8627fff3d1..59804e9ed8 100644
--- a/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
+++ b/crates/projects/src/outbound/pg_project_repo/team_share/test.rs
@@ -41,7 +41,7 @@ fn team_share_request(level: Option<AccessLevel>) -> UpdateSharePermissionReques
fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {
authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
facts,
TeamShareRequest {
access_level: Some(level),
@@ -171,7 +171,7 @@ async fn get_team_share_facts_reads_owner_team_and_null_state(pool: PgPool) {
assert_eq!(facts.entity.entity_type, EntityType::Project);
assert_eq!(facts.entity.entity_id, project_id);
- assert_eq!(facts.owner.as_ref(), OWNER);
+ assert_eq!(facts.owner.principal_id(), OWNER);
assert_eq!(facts.owner_team_id, Some(TEAM_ID));
assert_eq!(facts.current, None);
assert_eq!(facts.revision, 0);
diff --git a/crates/share_permission_db_utils/Cargo.toml b/crates/share_permission_db_utils/Cargo.toml
index a516eab226..822d125342 100644
--- a/crates/share_permission_db_utils/Cargo.toml
+++ b/crates/share_permission_db_utils/Cargo.toml
@@ -10,6 +10,7 @@ entity_access_db_utils = { path = "../entity_access_db_utils" }
macro_user_id = { path = "../macro_user_id" }
macro_uuid = { path = "../macro_uuid" }
model-entity = { path = "../model-entity" }
+model_owner = { path = "../model_owner" }
models_permissions = { path = "../models_permissions" }
rootcause = { workspace = true }
sqlx = { workspace = true }
diff --git a/crates/share_permission_db_utils/src/team_share.rs b/crates/share_permission_db_utils/src/team_share.rs
index 8740f7e7ed..e62d2aecb0 100644
--- a/crates/share_permission_db_utils/src/team_share.rs
+++ b/crates/share_permission_db_utils/src/team_share.rs
@@ -10,9 +10,13 @@ pub use entity_access_db_utils::team_share::acquire_guard;
use entity_access_db_utils::team_share::{
delete_direct, direct_level, replace_project_contributions, upsert_direct,
};
-use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
+use macro_user_id::cowlike::CowLike;
use macro_uuid::Uuid;
use model_entity::{Entity, EntityType};
+use model_owner::{
+ Owner,
+ team::{OwnerTeamFacts, owner_team},
+};
use models_permissions::share_permission::{
access_level::AccessLevel,
team_share::{
@@ -64,7 +68,7 @@ pub struct TeamShareCleanupSnapshot {
/// Explicit sharing root, not a descendant receiving inherited access.
pub root: Entity<'static>,
/// Actual owner at snapshot time, for ownership-change eligibility checks.
- pub owner: MacroUserIdStr<'static>,
+ pub owner: Owner,
/// Historical managed team, retained after membership removal.
pub managed_team_id: Uuid,
/// Exact historical level.
@@ -155,9 +159,13 @@ async fn load_state(connection: &mut PgConnection, entity: &Entity<'_>) -> TeamS
sp.id AS "stored_permission_id?",
sp.team_share_access_level AS "level: AccessLevel",
sp.team_share_team_id AS team_id, sp.team_share_revision AS "revision?",
- (SELECT tu.team_id FROM team_user tu WHERE tu.user_id = e.owner
- ORDER BY tu.team_role DESC LIMIT 1) AS owner_team_id
- FROM entity e LEFT JOIN "SharePermission" sp ON sp.id = e.permission_id"#,
+ tu.team_id AS "user_team?", b.team_id AS "bot_team?", btu.team_id AS "bot_user_team?"
+ FROM entity e LEFT JOIN "SharePermission" sp ON sp.id = e.permission_id
+ LEFT JOIN team_user tu ON tu.user_id = e.owner
+ LEFT JOIN bots b ON b.id = CASE
+ WHEN e.owner ~ '^bot\|[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+ THEN substring(e.owner FROM 5)::uuid END
+ LEFT JOIN team_user btu ON btu.user_id = b.owner_user_id"#,
entity.entity_id.as_ref(),
entity.entity_type.as_ref(),
uuid,
@@ -188,13 +196,20 @@ async fn load_state(connection: &mut PgConnection, entity: &Entity<'_>) -> TeamS
if revision < 0 {
return Err(report!(TeamShareError::InvalidState));
}
+ let owner = Owner::from_principal_str(&row.owner).context(TeamShareError::Infrastructure)?;
+ let owner_team_id = owner_team(
+ &owner,
+ OwnerTeamFacts {
+ user_team: row.user_team,
+ bot_team: row.bot_team,
+ bot_user_team: row.bot_user_team,
+ },
+ );
Ok(State {
facts: TeamShareFacts {
entity: entity.clone().into_owned(),
- owner: MacroUserIdStr::parse_from_str(&row.owner)
- .context(TeamShareError::Infrastructure)?
- .into_owned(),
- owner_team_id: row.owner_team_id,
+ owner,
+ owner_team_id,
current,
revision,
},
diff --git a/crates/share_permission_db_utils/src/team_share/test.rs b/crates/share_permission_db_utils/src/team_share/test.rs
index 7f74cd6095..95cebbd728 100644
--- a/crates/share_permission_db_utils/src/team_share/test.rs
+++ b/crates/share_permission_db_utils/src/team_share/test.rs
@@ -33,7 +33,7 @@ fn archived_call() -> Entity<'static> {
fn command(facts: &TeamShareFacts, level: Option<AccessLevel>) -> AuthorizedTeamShareCommand {
authorize_team_share(
- Some(&facts.owner),
+ facts.owner.as_user(),
facts,
TeamShareRequest {
access_level: Some(level),
@@ -227,7 +227,7 @@ async fn load_facts_prefers_active_call_over_archived_record_with_same_id(
let facts = load_facts(&mut tx, &active_call()).await?;
- assert_eq!(facts.owner.as_ref(), "macro|[email protected]");
+ assert_eq!(facts.owner.principal_id(), "macro|[email protected]");
assert_eq!(facts.current, None);
Ok(())
}
@@ -416,6 +416,69 @@ async fn apply_project_team_share_copies_and_clears_nested_contents(
Ok(())
}
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../../entity_access/fixtures", scripts("typed_owner_team"))
+)]
+async fn typed_owner_facts_match_sql_audiences_without_owner_escalation(
+ pool: PgPool,
+) -> rootcause::Result<()> {
+ use macro_user_id::user_id::MacroUserIdStr;
+ use models_permissions::share_permission::team_share::TeamSharePolicyError;
+
+ let team = Uuid::parse_str("90000000-0000-0000-0000-000000000011")?;
+ let actor = MacroUserIdStr::parse_from_str("macro|[email protected]")?;
+ let mut tx = pool.begin().await?;
+ for (suffix, has_team) in [
+ (31, true),
+ (32, false),
+ (33, true),
+ (34, true),
+ (35, true),
+ (36, false),
+ (37, false),
+ ] {
+ for kind in [EntityType::Document, EntityType::Project, EntityType::Chat] {
+ let entity = kind.with_entity_string(format!("90000000-0000-0000-0000-{suffix:012}"));
+ let facts = load_facts(&mut tx, &entity).await?;
+ let expected = has_team.then_some(team);
+ assert_eq!(facts.owner_team_id, expected, "{entity:?}");
+ let sql_team = sqlx::query_scalar!(
+ "SELECT team_id FROM owner_team($1)",
+ facts.owner.principal_id()
+ )
+ .fetch_optional(tx.as_mut())
+ .await?
+ .flatten();
+ assert_eq!(sql_team, facts.owner_team_id, "domain/SQL policy parity");
+
+ let request = TeamShareRequest {
+ legacy_enabled: Some(true),
+ ..Default::default()
+ };
+ let authorized =
+ authorize_team_share(Some(&actor), &facts, request, TeamShareLevel::Edit);
+ if suffix == 31 {
+ assert!(authorized?.is_some());
+ } else {
+ assert_eq!(authorized, Err(TeamSharePolicyError::NotOwner));
+ }
+ if suffix == 32 {
+ assert_eq!(
+ authorize_team_share(
+ facts.owner.as_user(),
+ &facts,
+ request,
+ TeamShareLevel::Edit
+ ),
+ Err(TeamSharePolicyError::MissingTeam)
+ );
+ }
+ }
+ }
+ Ok(())
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn load_facts_rejects_unsupported_entity_type(pool: PgPool) -> rootcause::Result<()> {
let entity =