Skip to content

Commit 6806312

Browse files
committed
Change Policies to use Session ALS
The param passed will be ignored now
1 parent a90a6b7 commit 6806312

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/components/authorization/policy/executor/policy-executor.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { CachedByArg } from '@seedcompany/common';
33
import { identity, intersection } from 'lodash';
44
import { type EnhancedResource, type Session } from '~/common';
55
import { type QueryFragment } from '~/core/database/query';
6+
import { SessionHost } from '../../../authentication/session.host';
67
import { withoutScope } from '../../dto';
78
import { RoleCondition } from '../../policies/conditions/role.condition';
89
import { type Permission } from '../builder/perm-granter';
@@ -21,7 +22,7 @@ import { ConditionOptimizer } from './condition-optimizer';
2122

2223
export interface ResolveParams {
2324
action: string;
24-
session: Session;
25+
session?: Session;
2526
resource: EnhancedResource<any>;
2627
prop?: string;
2728
calculatedAsCondition?: boolean;
@@ -39,14 +40,14 @@ export interface FilterOptions {
3940
@Injectable()
4041
export class PolicyExecutor {
4142
constructor(
43+
private readonly sessionHost: SessionHost,
4244
private readonly policyFactory: PolicyFactory,
4345
@Inject(forwardRef(() => ConditionOptimizer))
4446
private readonly conditionOptimizer: ConditionOptimizer & {},
4547
) {}
4648

4749
resolve({
4850
action,
49-
session,
5051
resource,
5152
prop,
5253
calculatedAsCondition,
@@ -63,6 +64,7 @@ export class PolicyExecutor {
6364
}
6465
}
6566

67+
const session = this.sessionHost.current;
6668
const policies = this.getPolicies(session);
6769
const isChildRelation = prop && resource.childKeys.has(prop);
6870

@@ -185,7 +187,7 @@ export class PolicyExecutor {
185187

186188
const other = {
187189
resource: params.resource,
188-
session: params.session,
190+
session: this.sessionHost.current,
189191
};
190192
return query
191193
.comment("Loading policy condition's context")

0 commit comments

Comments
 (0)