Refactor UserStamped -> Audited, reference Actors, & change globals to align

Author: CarsonF

dbschema/common.esdl

@@ -1,6 +1,7 @@
 module default {
-  global currentUserId: uuid;
-  alias currentUser := <User>(global currentUserId);
+  global currentActorId: uuid;
+  global currentActor := (select Actor filter .id = global currentActorId);
+  global currentUser := (select User filter .id = global currentActorId);
 
   scalar type ReportPeriod extending enum<Monthly, Quarterly>;
 

dbschema/engagement.esdl

@@ -76,8 +76,8 @@ module default {
       insert Engagement::DedicationCeremony {
         createdAt := datetime_of_statement(),
         modifiedAt := datetime_of_statement(),
-        createdBy := assert_exists(currentUser),
-        modifiedBy := assert_exists(currentUser),
+        createdBy := assert_exists(global currentActor),
+        modifiedBy := assert_exists(global currentActor),
         engagement := __new__,
         project := __new__.project,
         projectContext := __new__.projectContext,
@@ -130,8 +130,8 @@ module default {
       insert Engagement::CertificationCeremony {
         createdAt := datetime_of_statement(),
         modifiedAt := datetime_of_statement(),
-        createdBy := assert_exists(currentUser),
-        modifiedBy := assert_exists(currentUser),
+        createdBy := assert_exists(global currentActor),
+        modifiedBy := assert_exists(global currentActor),
         engagement := __new__,
         project := __new__.project,
         projectContext := __new__.projectContext,

dbschema/progress-report.esdl

@@ -75,7 +75,7 @@ module ProgressReport {
     };
     required who: default::User {
       readonly := true;
-      default := default::currentUser;
+      default := global default::currentUser;
     };
     required at: datetime {
       readonly := true;

dbschema/project.esdl

@@ -72,7 +72,7 @@ module default {
     financialReportPeriod: ReportPeriod;
 
     multi link members := .<project[is Project::Member];
-    single link membership := (select .members filter .user.id = global default::currentUserId limit 1);
+    single link membership := (select .members filter .user = global default::currentUser limit 1);
 
 #     multi link engagements := .<project[is Engagement];
     property engagementTotal := count(.<project[is Engagement]);
@@ -106,8 +106,8 @@ module default {
       insert default::Budget {
         createdAt := datetime_of_statement(),
         modifiedAt := datetime_of_statement(),
-        createdBy := assert_exists(currentUser),
-        modifiedBy := assert_exists(currentUser),
+        createdBy := assert_exists(global currentActor),
+        modifiedBy := assert_exists(global currentActor),
         project := __new__,
         projectContext := __new__.projectContext,
       }

dbschema/prompt-variant-response.esdl

@@ -6,7 +6,7 @@ module Prompt {
     responses := .<pvr[is VariantResponse];
   }
 
-  type VariantResponse extending Mixin::UserStamped, Mixin::Timestamped {
+  type VariantResponse extending Mixin::Audited {
     annotation description := "A response (for a variant) to an instance of a prompt.";
 
     required pvr: PromptVariantResponse;

dbschema/resource.esdl

@@ -1,3 +1,3 @@
 module default {
-  abstract type Resource extending Mixin::UserStamped, Mixin::Timestamped;
+  abstract type Resource extending Mixin::Audited;
 }

dbschema/z.pinnable.esdl

@@ -1,5 +1,8 @@
 module Mixin {
   abstract type Pinnable {
-    property pinned := __source__ in (<default::User>global default::currentUserId).pins;
+    property pinned := (
+      with user := (select default::User filter .id = global default::currentActorId) 
+      select __source__ in user.pins
+    );
   };
 };

dbschema/z.stamped.esdl

@@ -1,15 +1,15 @@
 module Mixin {
-  abstract type UserStamped {
-    required createdBy: default::User {
+  abstract type Audited extending Timestamped {
+    required createdBy: default::Actor {
       readonly := true;
-      default := default::currentUser;
+      default := global default::currentActor;
     };
-    required modifiedBy: default::User {
-      default := default::currentUser;
-      rewrite update using (default::currentUser);
+    required modifiedBy: default::Actor {
+      default := global default::currentActor;
+      rewrite update using (global default::currentActor);
     };
 
-    required isCreator := .createdBy ?= <default::User>(global default::currentUserId) 
+    required isCreator := .createdBy ?= global default::currentActor;
   }
 
   abstract type Timestamped {

src/components/authentication/current-user.provider.ts

@@ -72,10 +72,10 @@ export class EdgeDBCurrentUserProvider
   ) {
     // TODO temporarily check if UUID before applying global.
     // Once migration is complete this can be removed.
-    const currentUserId =
+    const currentActorId =
       session?.userId && isUUID(session.userId) ? session.userId : undefined;
     optionsHolder.next((options) =>
-      currentUserId ? options.withGlobals({ currentUserId }) : options,
+      currentActorId ? options.withGlobals({ currentActorId }) : options,
     );
   }
 }

src/components/authorization/policies/conditions/self.condition.ts

@@ -3,7 +3,9 @@ import { inspect, InspectOptionsStylized } from 'util';
 import { User } from '../../../user/dto';
 import {
   AsCypherParams,
+  AsEdgeQLParams,
   Condition,
+  fqnRelativeTo,
   IsAllowedParams,
 } from '../../policy/conditions';
 
@@ -40,8 +42,9 @@ class SelfCondition<TResourceStatic extends typeof User>
     return `node:User AND node.id = ${requester}`;
   }
 
-  asEdgeQLCondition() {
-    return '.id ?= global default::currentUserId';
+  asEdgeQLCondition({ namespace }: AsEdgeQLParams<any>) {
+    const currentId = fqnRelativeTo('default::currentActorId', namespace);
+    return `.id ?= global ${currentId}`;
   }
 
   union(this: void, conditions: this[]) {