Drop session from matching helpers

CarsonF · CarsonF · commit 073baebafee2 · 2025-05-15T15:37:28.000-05:00
diff --git a/src/components/authorization/policies/conditions/member.condition.ts b/src/components/authorization/policies/conditions/member.condition.ts
@@ -2,7 +2,7 @@ import { type Query } from 'cypher-query-builder';
 import { intersection } from 'lodash';
 import { inspect, type InspectOptionsStylized } from 'util';
 import { type ResourceShape, type Role } from '~/common';
-import { matchProjectScopedRoles, variable } from '~/core/database/query';
+import { matchProjectScopedRoles } from '~/core/database/query';
 import { rolesForScope, type ScopedRole, splitScope } from '../../dto/role.dto';
 import {
   type AsCypherParams,
@@ -101,7 +101,6 @@ class MemberWithRolesCondition<TResourceStatic extends ResourceWithScope>
 
     return query.apply(
       matchProjectScopedRoles({
-        session: variable('requestingUser'),
         outputVar: CQL_VAR,
       }),
     );
diff --git a/src/components/budget/budget-record.repository.ts b/src/components/budget/budget-record.repository.ts
@@ -177,7 +177,7 @@ export class BudgetRecordRepository extends DtoRepository<
             node('organization', 'Organization'),
           ])
           .apply(matchChangesetAndChangedProps(view?.changeset))
-          .apply(matchPropsAndProjectSensAndScopedRoles(session, { view }))
+          .apply(matchPropsAndProjectSensAndScopedRoles({ view }))
           .return<{ dto: UnsecuredDto<BudgetRecord> }>(
             merge('props', 'changedProps', {
               parent: 'budget',
diff --git a/src/components/budget/budget.repository.ts b/src/components/budget/budget.repository.ts
@@ -90,7 +90,7 @@ export class BudgetRepository extends DtoRepository<
         node('node', label),
       ])
       .where({ 'node.id': inArray(ids) })
-      .apply(matchPropsAndProjectSensAndScopedRoles(session, { view }))
+      .apply(matchPropsAndProjectSensAndScopedRoles({ view }))
       .apply(matchChangesetAndChangedProps(view?.changeset))
       .return<{ dto: UnsecuredDto<Budget> }>(
         merge('props', 'changedProps', {
diff --git a/src/components/ceremony/ceremony.repository.ts b/src/components/ceremony/ceremony.repository.ts
@@ -64,7 +64,7 @@ export class CeremonyRepository extends DtoRepository<
           relation('out', '', ACTIVE),
           node('node'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .return<{ dto: UnsecuredDto<Ceremony> }>('props as dto');
   }
 
diff --git a/src/components/engagement/engagement.repository.ts b/src/components/engagement/engagement.repository.ts
@@ -132,7 +132,7 @@ export class EngagementRepository extends CommonRepository {
           relation('out', '', 'engagement'),
           node('node'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session, { view }))
+        .apply(matchPropsAndProjectSensAndScopedRoles({ view }))
         .apply(matchChangesetAndChangedProps(view?.changeset))
         .optionalMatch([
           node('node'),
diff --git a/src/components/language/language.repository.ts b/src/components/language/language.repository.ts
@@ -184,7 +184,7 @@ export class LanguageRepository extends DtoRepository<
           relation('out', '', 'engagement'),
           node('node'),
         ])
-        .apply(matchProjectScopedRoles({ session }))
+        .apply(matchProjectScopedRoles())
         .with([
           'node',
           'collect(project) as projList',
diff --git a/src/components/organization/organization.repository.ts b/src/components/organization/organization.repository.ts
@@ -91,7 +91,7 @@ export class OrganizationRepository extends DtoRepository<
           relation('out', 'organization'),
           node('node'),
         ])
-        .apply(matchProjectScopedRoles({ session }))
+        .apply(matchProjectScopedRoles())
         .with([
           'node',
           'collect(project) as projList',
diff --git a/src/components/partner/partner.repository.ts b/src/components/partner/partner.repository.ts
@@ -210,7 +210,7 @@ export class PartnerRepository extends DtoRepository<
           relation('out', '', 'partner'),
           node('node'),
         ])
-        .apply(matchProjectScopedRoles({ session }))
+        .apply(matchProjectScopedRoles())
         .with([
           'node',
           'collect(project) as projList',
diff --git a/src/components/partnership/partnership.repository.ts b/src/components/partnership/partnership.repository.ts
@@ -208,7 +208,7 @@ export class PartnershipRepository extends DtoRepository<
           relation('out', '', 'organization', ACTIVE),
           node('org', 'Organization'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session, { view }))
+        .apply(matchPropsAndProjectSensAndScopedRoles({ view }))
         .apply(matchChangesetAndChangedProps(view?.changeset))
         .apply(matchProps({ nodeName: 'project', outputVar: 'projectProps' }))
         .apply(
diff --git a/src/components/periodic-report/periodic-report.repository.ts b/src/components/periodic-report/periodic-report.repository.ts
@@ -416,7 +416,7 @@ export class PeriodicReportRepository extends DtoRepository<
           relation('out', '', 'report', ACTIVE),
           node('node'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .return<{ dto: UnsecuredDto<PeriodicReport> }>(
           merge('props', { parent: 'parent' }, 'extra').as('dto'),
         );
diff --git a/src/components/product-progress/product-progress.repository.ts b/src/components/product-progress/product-progress.repository.ts
@@ -351,7 +351,7 @@ export class ProductProgressRepository {
         relation('in', '', 'engagement'),
         node('project', 'Project'),
       ])
-      .apply(matchProjectScopedRoles({ session, outputVar: 'scope' }))
+      .apply(matchProjectScopedRoles({ outputVar: 'scope' }))
       .apply(matchProjectSens())
       .subQuery('product', (sub) =>
         sub
diff --git a/src/components/product/product.repository.ts b/src/components/product/product.repository.ts
@@ -193,7 +193,7 @@ export class ProductRepository extends CommonRepository {
           relation('out', '', 'product', ACTIVE),
           node('node'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .optionalMatch([
           node('node'),
           relation('out', '', 'unspecifiedScripture', ACTIVE),
diff --git a/src/components/progress-report/media/progress-report-media.repository.ts b/src/components/progress-report/media/progress-report-media.repository.ts
@@ -240,7 +240,7 @@ export class ProgressReportMediaRepository extends DtoRepository<
       query
         .apply(projectFromProgressReportChild)
         .apply(matchProjectSens())
-        .apply(matchProjectScopedRoles({ session, outputVar: 'scope' }))
+        .apply(matchProjectScopedRoles({ outputVar: 'scope' }))
         .match([
           [
             node('node'),
diff --git a/src/components/progress-report/progress-report.repository.ts b/src/components/progress-report/progress-report.repository.ts
@@ -69,7 +69,7 @@ export class ProgressReportRepository extends DtoRepository<
           relation('in', '', 'engagement', ACTIVE),
           node('project', 'Project'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .subQuery('node', this.extraRepo.extraHydrate())
         .return<{ dto: UnsecuredDto<ProgressReport> }>(
           merge('props', { parent: 'parent' }, 'extra').as('dto'),
diff --git a/src/components/project-change-request/project-change-request.repository.ts b/src/components/project-change-request/project-change-request.repository.ts
@@ -63,7 +63,7 @@ export class ProjectChangeRequestRepository extends DtoRepository<
           relation('in', '', 'changeset', ACTIVE),
           node('project', 'Project'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .return<{ dto: UnsecuredDto<ProjectChangeRequest> }>(
           merge('props', {
             canEdit: `props.status = "${Status.Pending}"`,
diff --git a/src/components/project/project-member/project-member.repository.ts b/src/components/project/project-member/project-member.repository.ts
@@ -125,7 +125,7 @@ export class ProjectMemberRepository extends DtoRepository<
           relation('out', '', 'member', ACTIVE),
           node('node'),
         ])
-        .apply(matchPropsAndProjectSensAndScopedRoles(session))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .match([
           node('node'),
           relation('out', '', 'user'),
diff --git a/src/components/project/project.repository.ts b/src/components/project/project.repository.ts
@@ -83,7 +83,7 @@ export class ProjectRepository extends CommonRepository {
     return (query: Query) =>
       query
         .with(['node', 'node as project'])
-        .apply(matchPropsAndProjectSensAndScopedRoles(userId))
+        .apply(matchPropsAndProjectSensAndScopedRoles())
         .apply(matchChangesetAndChangedProps(changeset))
         // optional because not defined until right after creation
         .optionalMatch([
diff --git a/src/core/database/query/match-project-based-props.ts b/src/core/database/query/match-project-based-props.ts
@@ -1,11 +1,7 @@
 import { oneLine } from 'common-tags';
 import { node, type Query, relation } from 'cypher-query-builder';
-import { type ID, type Sensitivity, type Session } from '~/common';
-import {
-  type QueryFragment,
-  requestingUser,
-  Variable,
-} from '~/core/database/query';
+import { type Sensitivity } from '~/common';
+import { type QueryFragment } from '~/core/database/query';
 import {
   type GlobalScopedRole,
   type ScopedRole,
@@ -19,20 +15,21 @@ import {
   merge,
   reduce,
 } from './cypher-functions';
-import { ACTIVE, matchProps, type MatchPropsOptions } from './matching';
+import {
+  ACTIVE,
+  currentUser,
+  matchProps,
+  type MatchPropsOptions,
+} from './matching';
 
 export const matchPropsAndProjectSensAndScopedRoles =
-  (session?: Session | ID | Variable, propsOptions?: MatchPropsOptions) =>
+  (propsOptions?: MatchPropsOptions) =>
   <R>(query: Query<R>) =>
     query.comment`
       matchPropsAndProjectSensAndScopedRoles()
     `.subQuery((sub) =>
       sub
-        .with([
-          'node',
-          'project',
-          ...(session instanceof Variable ? [session.name] : []),
-        ])
+        .with(['node', 'project'])
         .apply(matchProjectSens('project'))
         .apply(
           matchProps(
@@ -41,66 +38,58 @@ export const matchPropsAndProjectSensAndScopedRoles =
               : { ...propsOptions, view: { active: true } },
           ),
         )
-        .apply((q) =>
-          !session ? q : q.apply(matchProjectScopedRoles({ session })),
-        )
+        .apply(matchProjectScopedRoles())
         .return([
           merge(propsOptions?.outputVar ?? 'props', {
             sensitivity: 'sensitivity',
-            scope: session ? `scopedRoles` : null,
+            scope: 'scopedRoles',
           }).as(propsOptions?.outputVar ?? 'props'),
         ]),
     );
 
 export const matchProjectScopedRoles =
   <Output extends string = 'scopedRoles'>({
-    session,
     projectVar = 'project',
     outputVar = 'scopedRoles' as Output,
   }: {
-    session: Session | ID | Variable;
     projectVar?: string;
     outputVar?: Output;
-  }) =>
+  } = {}) =>
   <R>(query: Query<R>) =>
-    query.comment`matchProjectScopedRoles()`.subQuery(
-      [projectVar, session instanceof Variable ? session : null],
-      (sub) =>
-        sub
-          .match([
-            [
-              node(projectVar),
-              relation('out', '', 'member'),
-              node('projectMember'),
-              relation('out', '', 'user'),
-              session instanceof Variable
-                ? node(session.name)
-                : requestingUser(session),
-            ],
-            [
-              node('projectMember'),
-              relation('out', '', 'roles', ACTIVE),
-              node('rolesProp', 'Property'),
-            ],
-          ])
-          .with(collect('rolesProp.value').as('memberRoleProps'))
-          .return<{ [K in Output]: ScopedRole[] }>(
-            listConcat(
-              'case size(memberRoleProps) > 0 when true then ["member:true"] else [] end',
-              reduce(
-                'scopedRoles',
-                [],
-                apoc.coll.flatten('memberRoleProps'),
-                'role',
-                listConcat('scopedRoles', [`"project:" + role`]),
-              ),
-            ).as(outputVar),
-          )
-          .union()
-          .with('project')
-          .with('project')
-          .raw('WHERE project IS NULL')
-          .return(`[] as ${outputVar}`),
+    query.comment`matchProjectScopedRoles()`.subQuery([projectVar], (sub) =>
+      sub
+        .match([
+          [
+            node(projectVar),
+            relation('out', '', 'member'),
+            node('projectMember'),
+            relation('out', '', 'user'),
+            currentUser,
+          ],
+          [
+            node('projectMember'),
+            relation('out', '', 'roles', ACTIVE),
+            node('rolesProp', 'Property'),
+          ],
+        ])
+        .with(collect('rolesProp.value').as('memberRoleProps'))
+        .return<{ [K in Output]: ScopedRole[] }>(
+          listConcat(
+            'case size(memberRoleProps) > 0 when true then ["member:true"] else [] end',
+            reduce(
+              'scopedRoles',
+              [],
+              apoc.coll.flatten('memberRoleProps'),
+              'role',
+              listConcat('scopedRoles', [`"project:" + role`]),
+            ),
+          ).as(outputVar),
+        )
+        .union()
+        .with('project')
+        .with('project')
+        .raw('WHERE project IS NULL')
+        .return(`[] as ${outputVar}`),
     );
 
 export const matchProjectSens =
@@ -155,7 +144,7 @@ export const matchProjectSens =
 
 export const matchUserGloballyScopedRoles =
   <Output extends string = 'scopedRoles'>(
-    userVar = 'requestingUser',
+    userVar: string,
     outputVar = 'globalRoles' as Output,
   ) =>
   <R>(query: Query<R>) =>

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class CeremonyRepository extends DtoRepository<`
`64`	`64`	`relation('out', '', ACTIVE),`
`65`	`65`	`node('node'),`
`66`	`66`	`])`
`67`		`- .apply(matchPropsAndProjectSensAndScopedRoles(session))`
	`67`	`+ .apply(matchPropsAndProjectSensAndScopedRoles())`
`68`	`68`	`.return<{ dto: UnsecuredDto<Ceremony> }>('props as dto');`
`69`	`69`	`}`
`70`	`70`