Skip to content

Commit 2899c03

Browse files
committed
Drop Privileges.forUser calls
1 parent 90d7f19 commit 2899c03

24 files changed

+30
-46
lines changed

src/components/authentication/login.resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class LoginResolver {
6161
}
6262

6363
@ResolveField(() => [Power])
64-
async powers(@AnonSession() session: Session): Promise<Power[]> {
65-
return [...this.privileges.forUser(session).powers];
64+
async powers(): Promise<Power[]> {
65+
return [...this.privileges.powers];
6666
}
6767
}

src/components/authentication/register.resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class RegisterResolver {
5151
}
5252

5353
@ResolveField(() => [Power])
54-
async powers(@AnonSession() session: Session): Promise<Power[]> {
55-
return [...this.privileges.forUser(session).powers];
54+
async powers(): Promise<Power[]> {
55+
return [...this.privileges.powers];
5656
}
5757
}

src/components/authentication/session.resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class SessionResolver {
129129
}
130130

131131
@ResolveField(() => [Power], { nullable: true })
132-
async powers(@Parent() output: SessionOutput): Promise<Power[]> {
133-
return [...this.privileges.forUser(output.session).powers];
132+
async powers(): Promise<Power[]> {
133+
return [...this.privileges.powers];
134134
}
135135
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Query, Resolver } from '@nestjs/graphql';
2-
import { AnonSession, type Session } from '~/common';
32
import { Power } from './dto';
43
import { Privileges } from './policy';
54

@@ -8,7 +7,7 @@ export class AuthorizationResolver {
87
constructor(private readonly privileges: Privileges) {}
98

109
@Query(() => [Power])
11-
async powers(@AnonSession() session: Session): Promise<Power[]> {
12-
return [...this.privileges.forUser(session).powers];
10+
async powers(): Promise<Power[]> {
11+
return [...this.privileges.powers];
1312
}
1413
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ export class EdgePrivileges<
3535
return this.policyExecutor.sessionHost.current;
3636
}
3737

38-
/** @deprecated Use {@link forContext} instead */
39-
forUser(_session: unknown, object?: ResourceObjectContext<TResourceStatic>) {
40-
return object ? this.forContext(object) : this;
41-
}
42-
4338
get context() {
4439
return this.object;
4540
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ export class Privileges {
2727
private readonly sessionHost: SessionHost,
2828
) {}
2929

30-
/** @deprecated */
31-
forUser(_session: unknown) {
32-
return this;
33-
}
34-
3530
forResource<TResourceStatic extends ResourceShape<any>>(
3631
resource: TResourceStatic | EnhancedResource<TResourceStatic>,
3732
) {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ export class ResourcePrivileges<TResourceStatic extends ResourceShape<any>> {
4242
this.resource = EnhancedResource.of(resource);
4343
}
4444

45-
/** @deprecated Use {@link forContext} instead */
46-
forUser(_session: unknown, object?: ResourceObjectContext<TResourceStatic>) {
47-
return object ? this.forContext(object) : this;
48-
}
49-
5045
get context() {
5146
return this.object;
5247
}

src/components/budget/budget.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export class BudgetRepository extends DtoRepository<
110110
node('project', 'Project', pickBy({ id: filter?.projectId })),
111111
])
112112
.apply(
113-
this.privileges.forUser(session).filterToReadable({
113+
this.privileges.filterToReadable({
114114
wrapContext: oncePerProject,
115115
}),
116116
)

src/components/ceremony/ceremony.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class CeremonyRepository extends DtoRepository<
8484
: []),
8585
])
8686
.apply(
87-
this.privileges.forUser(session).filterToReadable({
87+
this.privileges.filterToReadable({
8888
wrapContext: oncePerProject,
8989
}),
9090
)

src/components/field-region/field-region.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
105105
}
106106

107107
async list({ filter, ...input }: FieldRegionListInput, session: Session) {
108-
if (!this.privileges.forUser(session).can('read')) {
108+
if (!this.privileges.can('read')) {
109109
return SecuredList.Redacted;
110110
}
111111
const result = await this.db

0 commit comments

Comments
 (0)