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(ownership): entity_access_db_utils idempotent typed owner grant helper (#6412)

Will Hutchinson1bd2bcf799e8
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.json
index a311233d60..ebb3bf4243 100644
--- a/.github/workspace-dep-closures.json
+++ b/.github/workspace-dep-closures.json
@@ -107,6 +107,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -211,6 +212,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -332,6 +334,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -465,6 +468,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -566,6 +570,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -633,6 +638,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -702,6 +708,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -798,6 +805,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -898,6 +906,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -999,6 +1008,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -1181,6 +1191,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -1308,6 +1319,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -1405,6 +1417,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -1522,6 +1535,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -1625,6 +1639,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -1725,6 +1740,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -1774,6 +1790,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -1852,6 +1869,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -1971,6 +1989,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -2066,6 +2085,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -2325,6 +2345,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -2395,6 +2416,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -2467,6 +2489,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -2583,6 +2606,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -2706,6 +2730,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -2867,6 +2892,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3052,6 +3078,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -3133,6 +3160,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -3210,6 +3238,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3294,6 +3323,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -3419,6 +3449,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3492,6 +3523,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3580,6 +3612,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3661,6 +3694,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_email",
@@ -3730,6 +3764,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -3777,6 +3812,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -3846,17 +3882,20 @@
"crates/workspace-hack"
],
"entity_access_db_utils": [
+ "crates/bot_id",
"crates/cowlike",
"crates/entity_access_db_utils",
"crates/macro_user_id",
"crates/macro_uuid",
"crates/model-entity",
"crates/model_file_type",
+ "crates/model_owner",
"crates/models_entity_access_management",
"crates/models_permissions",
"crates/workspace-hack"
],
"entity_access_management": [
+ "crates/bot_id",
"crates/cowlike",
"crates/entity_access_db_utils",
"crates/entity_access_management",
@@ -3864,6 +3903,7 @@
"crates/macro_uuid",
"crates/model-entity",
"crates/model_file_type",
+ "crates/model_owner",
"crates/models_entity_access_management",
"crates/models_permissions",
"crates/workspace-hack"
@@ -4067,6 +4107,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -4182,6 +4223,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -4274,6 +4316,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -4363,6 +4406,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -4475,6 +4519,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -4632,6 +4677,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -4719,6 +4765,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -4847,6 +4894,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -4909,6 +4957,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -5059,6 +5108,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -5177,6 +5227,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -5250,6 +5301,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -5481,6 +5533,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -5619,6 +5672,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -5880,6 +5934,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -5971,6 +6026,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -6042,6 +6098,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -6221,6 +6278,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -6292,6 +6350,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -6372,6 +6431,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -6445,6 +6505,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -6553,6 +6614,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -6623,6 +6685,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -6676,6 +6739,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -6892,6 +6956,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -7017,6 +7082,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -7121,6 +7187,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -7212,6 +7279,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -7338,6 +7406,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -7383,12 +7452,14 @@
"services/sha_cleanup_worker"
],
"share_permission_db_utils": [
+ "crates/bot_id",
"crates/cowlike",
"crates/entity_access_db_utils",
"crates/macro_user_id",
"crates/macro_uuid",
"crates/model-entity",
"crates/model_file_type",
+ "crates/model_owner",
"crates/models_entity_access_management",
"crates/models_permissions",
"crates/share_permission_db_utils",
@@ -7452,6 +7523,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -7546,6 +7618,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -7633,6 +7706,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -7719,6 +7793,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_entity_access_management",
@@ -7809,6 +7884,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -7889,6 +7965,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -8147,6 +8224,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -8246,6 +8324,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -8320,6 +8399,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
@@ -8384,6 +8464,7 @@
"crates/model-entity",
"crates/model-error-response",
"crates/model_file_type",
+ "crates/model_owner",
"crates/model_user",
"crates/models_bulk_upload",
"crates/models_dcs",
@@ -8469,6 +8550,7 @@
"crates/model-error-response",
"crates/model_file_type",
"crates/model_notifications",
+ "crates/model_owner",
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
diff --git a/.sqlx/query-3a0bbf70ad3943105dab9c4e8970eb6dbbe98d078ec279bb9dcb184f96245c5a.json b/.sqlx/query-3a0bbf70ad3943105dab9c4e8970eb6dbbe98d078ec279bb9dcb184f96245c5a.json
new file mode 100644
index 0000000000..c96553c907
--- /dev/null
+++ b/.sqlx/query-3a0bbf70ad3943105dab9c4e8970eb6dbbe98d078ec279bb9dcb184f96245c5a.json
@@ -0,0 +1,29 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO entity_access (entity_id, entity_type, source_id, source_type, access_level)\n VALUES ($1, $2, $3, $4, 'owner')\n ON CONFLICT (entity_id, entity_type, source_id, source_type)\n WHERE granted_from_project_id IS NULL\n DO UPDATE SET access_level = EXCLUDED.access_level, updated_at = NOW()\n WHERE entity_access.access_level != 'owner'\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text",
+ "Text",
+ {
+ "Custom": {
+ "name": "entity_access_source_type",
+ "kind": {
+ "Enum": [
+ "channel",
+ "team",
+ "user",
+ "bot"
+ ]
+ }
+ }
+ }
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "3a0bbf70ad3943105dab9c4e8970eb6dbbe98d078ec279bb9dcb184f96245c5a"
+}
diff --git a/Cargo.lock b/Cargo.lock
index b90504dbc3..8f403d7331 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6272,6 +6272,7 @@ dependencies = [
"macro_user_id",
"macro_uuid",
"model-entity",
+ "model_owner",
"models_entity_access_management",
"models_permissions",
"serde",
diff --git a/crates/entity_access_db_utils/Cargo.toml b/crates/entity_access_db_utils/Cargo.toml
index 1a050c111f..1d09d9f624 100644
--- a/crates/entity_access_db_utils/Cargo.toml
+++ b/crates/entity_access_db_utils/Cargo.toml
@@ -14,6 +14,7 @@ tracing = { workspace = true }
macro_user_id = { path = "../macro_user_id" }
model-entity = { path = "../model-entity" }
+model_owner = { path = "../model_owner" }
models_entity_access_management = { path = "../models_entity_access_management", features = [
"db",
] }
diff --git a/crates/entity_access_db_utils/src/lib.rs b/crates/entity_access_db_utils/src/lib.rs
index 16b3e153f2..e26007b29d 100644
--- a/crates/entity_access_db_utils/src/lib.rs
+++ b/crates/entity_access_db_utils/src/lib.rs
@@ -9,6 +9,7 @@ pub mod team_share;
use macro_user_id::user_id::MacroUserIdStr;
pub use model_entity::EntityType;
+use model_owner::Owner;
pub use models_entity_access_management::EntityAccessSourceType;
pub use models_permissions::share_permission::access_level::AccessLevel;
use models_permissions::share_permission::channel_share_permission::{
@@ -44,6 +45,59 @@ pub async fn insert_entity_access_row(
Ok(())
}
+struct OwnerGrantSource {
+ source_type: EntityAccessSourceType,
+ source_id: String,
+}
+
+impl OwnerGrantSource {
+ fn from_owner(owner: &Owner) -> Self {
+ let source_type = match owner {
+ Owner::User(_) => EntityAccessSourceType::User,
+ Owner::Bot(_) => EntityAccessSourceType::Bot,
+ Owner::Team(_) => EntityAccessSourceType::Team,
+ };
+ Self {
+ source_type,
+ source_id: owner.principal_id(),
+ }
+ }
+}
+
+/// Inserts or raises `owner`'s direct grant on the entity to `Owner`.
+///
+/// Does not authorize and does not commit.
+///
+/// A no-op still holds the conflicting row lock until the caller commits.
+#[tracing::instrument(skip(transaction), err)]
+pub async fn upsert_owner_grant(
+ transaction: &mut Transaction<'_, Postgres>,
+ entity_id: &macro_uuid::Uuid,
+ entity_type: EntityType,
+ owner: &Owner,
+) -> Result<(), sqlx::Error> {
+ let source = OwnerGrantSource::from_owner(owner);
+ // Conflict WHERE only steers index inference onto the direct unique index.
+ sqlx::query!(
+ r#"
+ INSERT INTO entity_access (entity_id, entity_type, source_id, source_type, access_level)
+ VALUES ($1, $2, $3, $4, 'owner')
+ ON CONFLICT (entity_id, entity_type, source_id, source_type)
+ WHERE granted_from_project_id IS NULL
+ DO UPDATE SET access_level = EXCLUDED.access_level, updated_at = NOW()
+ WHERE entity_access.access_level != 'owner'
+ "#,
+ entity_id,
+ entity_type.as_ref(),
+ source.source_id,
+ source.source_type as _,
+ )
+ .execute(transaction.as_mut())
+ .await?;
+
+ Ok(())
+}
+
/// Removes all user source level entity access rows for the provided entity aside from the owner
/// one.
/// This is used when an item goes from public to private.
diff --git a/crates/entity_access_db_utils/src/test.rs b/crates/entity_access_db_utils/src/test.rs
index 83f88ba180..c837b31dc6 100644
--- a/crates/entity_access_db_utils/src/test.rs
+++ b/crates/entity_access_db_utils/src/test.rs
@@ -1,11 +1,13 @@
use macro_db_migrator::MACRO_DB_MIGRATIONS;
use macro_uuid::Uuid;
use model_entity::EntityType;
+use model_owner::{Owner, OwnerType};
use models_permissions::share_permission::access_level::AccessLevel;
use models_permissions::share_permission::channel_share_permission::{
UpdateChannelSharePermission, UpdateOperation,
};
use sqlx::Row as _;
+use sqlx::types::chrono::{DateTime, Utc};
use sqlx::{Pool, Postgres, Transaction};
use super::*;
@@ -152,6 +154,8 @@ struct EntityAccessRow {
source_type: String,
access_level: AccessLevel,
granted_from_project_id: Option<String>,
+ created_at: DateTime<Utc>,
+ updated_at: DateTime<Utc>,
}
async fn insert_entity_access_for_test(
@@ -202,7 +206,9 @@ async fn fetch_entity_access_rows(
source_id,
source_type::text AS source_type,
access_level,
- granted_from_project_id
+ granted_from_project_id,
+ created_at,
+ updated_at
FROM entity_access
WHERE entity_id = $1 AND entity_type = $2
ORDER BY source_type, source_id, granted_from_project_id NULLS FIRST
@@ -215,6 +221,8 @@ async fn fetch_entity_access_rows(
source_type: r.get("source_type"),
access_level: r.get("access_level"),
granted_from_project_id: r.get("granted_from_project_id"),
+ created_at: r.get("created_at"),
+ updated_at: r.get("updated_at"),
})
.fetch_all(pool)
.await
@@ -710,3 +718,153 @@ async fn remove_non_owner_user_entity_access_preserves_non_user_inherited_and_ot
assert_eq!(other_type_rows[0].access_level, AccessLevel::View);
assert!(other_type_rows[0].granted_from_project_id.is_none());
}
+
+const OWNER_TEAM_ID: Uuid = Uuid::from_u128(0x0000000a_0000_0000_0000_00000000000a);
+const BOT_PRINCIPAL: &str = "bot|0000000b-0000-0000-0000-00000000000b";
+
+fn user_owner() -> Owner {
+ Owner::User(MacroUserIdStr::try_from_email("[email protected]").unwrap())
+}
+
+async fn grant_owner_committed(pool: &Pool<Postgres>, entity_id: &Uuid, owner: &Owner) {
+ let mut tx = pool.begin().await.unwrap();
+ upsert_owner_grant(&mut tx, entity_id, EntityType::Document, owner)
+ .await
+ .unwrap();
+ tx.commit().await.unwrap();
+}
+
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn owner_grant_twice_is_a_no_op(pool: Pool<Postgres>) {
+ let entity_id = Uuid::from_u128(0x0a01);
+ grant_owner_committed(&pool, &entity_id, &user_owner()).await;
+ grant_owner_committed(&pool, &entity_id, &user_owner()).await;
+
+ let rows = fetch_entity_access_rows(&pool, &entity_id, EntityType::Document).await;
+ assert_eq!(rows.len(), 1);
+ assert_eq!(rows[0].access_level, AccessLevel::Owner);
+ assert!(rows[0].granted_from_project_id.is_none());
+ assert_eq!(rows[0].updated_at, rows[0].created_at);
+}
+
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn owner_grant_raises_direct_edit_to_owner_and_leaves_other_principals(pool: Pool<Postgres>) {
+ let entity_id = Uuid::from_u128(0x0a02);
+ let owner = user_owner();
+ let mut tx = pool.begin().await.unwrap();
+ insert_entity_access_for_test(
+ &mut tx,
+ &entity_id,
+ EntityType::Document,
+ &owner.principal_id(),
+ EntityAccessSourceType::User,
+ AccessLevel::Edit,
+ None,
+ )
+ .await;
+ insert_entity_access_for_test(
+ &mut tx,
+ &entity_id,
+ EntityType::Document,
+ EntityAccessSourceType::User,
+ AccessLevel::View,
+ None,
+ )
+ .await;
+ tx.commit().await.unwrap();
+
+ let before = fetch_entity_access_rows(&pool, &entity_id, EntityType::Document).await;
+ let before_owner = before
+ .iter()
+ .find(|row| row.source_id == owner.principal_id())
+ .unwrap();
+ let before_updated_at = before_owner.updated_at;
+
+ grant_owner_committed(&pool, &entity_id, &owner).await;
+
+ let rows = fetch_entity_access_rows(&pool, &entity_id, EntityType::Document).await;
+ assert_eq!(rows.len(), 2, "updated in place, not duplicated");
+ let owner_row = rows
+ .iter()
+ .find(|row| row.source_id == owner.principal_id())
+ .unwrap();
+ assert_eq!(owner_row.access_level, AccessLevel::Owner);
+ assert!(owner_row.granted_from_project_id.is_none());
+ assert!(owner_row.updated_at > before_updated_at);
+ let viewer_row = rows
+ .iter()
+ .find(|row| row.source_id == "macro|[email protected]")
+ .unwrap();
+ assert_eq!(viewer_row.access_level, AccessLevel::View);
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../fixtures", scripts("upsert_test_data"))
+)]
+async fn owner_grant_leaves_project_inherited_rows_untouched(pool: Pool<Postgres>) {
+ let owner = user_owner();
+ let root = ROOT_PROJECT_ID.to_string();
+ let mut tx = pool.begin().await.unwrap();
+ insert_entity_access_for_test(
+ &mut tx,
+ &DOC_ROOT_ID,
+ EntityType::Document,
+ &owner.principal_id(),
+ EntityAccessSourceType::User,
+ AccessLevel::Edit,
+ Some(&root),
+ )
+ .await;
+ tx.commit().await.unwrap();
+
+ grant_owner_committed(&pool, &DOC_ROOT_ID, &owner).await;
+ grant_owner_committed(&pool, &DOC_ROOT_ID, &owner).await;
+
+ let rows = fetch_entity_access_rows(&pool, &DOC_ROOT_ID, EntityType::Document).await;
+ assert_eq!(rows.len(), 2, "inherited row and direct row coexist");
+ let inherited = rows
+ .iter()
+ .find(|row| row.granted_from_project_id.is_some())
+ .unwrap();
+ assert_eq!(
+ inherited.granted_from_project_id.as_deref(),
+ Some(root.as_str())
+ );
+ assert_eq!(inherited.access_level, AccessLevel::Edit);
+ assert_eq!(inherited.updated_at, inherited.created_at);
+ let direct = rows
+ .iter()
+ .find(|row| row.granted_from_project_id.is_none())
+ .unwrap();
+ assert_eq!(direct.access_level, AccessLevel::Owner);
+}
+
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn owner_grant_maps_user_bot_and_team_to_their_access_source(pool: Pool<Postgres>) {
+ let cases = [
+ (user_owner(), "user", "macro|[email protected]".to_owned()),
+ (
+ Owner::parse(OwnerType::Bot, BOT_PRINCIPAL).unwrap(),
+ "bot",
+ BOT_PRINCIPAL.to_owned(),
+ ),
+ (
+ Owner::Team(OWNER_TEAM_ID),
+ "team",
+ OWNER_TEAM_ID.to_string(),
+ ),
+ ];
+ for (i, (owner, expected_source_type, expected_source_id)) in cases.into_iter().enumerate() {
+ let entity_id = Uuid::from_u128(0x0a10 + i as u128);
+ grant_owner_committed(&pool, &entity_id, &owner).await;
+
+ let rows = fetch_entity_access_rows(&pool, &entity_id, EntityType::Document).await;
+ assert_eq!(rows.len(), 1, "{owner:?}");
+ assert_eq!(rows[0].source_type, expected_source_type, "{owner:?}");
+ assert_eq!(rows[0].source_id, expected_source_id, "{owner:?}");
+ assert_eq!(rows[0].access_level, AccessLevel::Owner);
+ assert!(rows[0].granted_from_project_id.is_none());
+ }
+}