Add WorkspaceAuthContextMiddleware (#17487)
## Context
Introduces a middleware that automatically sets the workspace auth
context in AsyncLocalStorage for HTTP requests, making it available
throughout the request lifecycle without explicit parameter passing.
The motivation behind this change is to reduce boilerplate and simplify
the developer experience when working with workspace data in HTTP
request handlers.
The Problem (Before)
Every HTTP request handler that needed to access workspace data had to:
- Extract auth-related info from decorators (@AuthWorkspace(),
@AuthUserWorkspaceId(), etc.) in controller/resolver and pass down to
services
- Build or pass the authContext explicitly (sometimes with type
assertion which was flaky)
Then call executeInWorkspaceContext(authContext, async () => { ... })
## Changes
- Add WorkspaceAuthContextMiddleware that extracts auth context from the
request and stores it in AsyncLocalStorage
- Register middleware for GraphQL, metadata, and REST routes (runs after
hydration middlewares)
- Simplify executeInWorkspaceContext signature: fn is now the first
parameter, authContext is optional second
- If authContext is not provided, it's automatically retrieved from the
storage (set by middleware)
- Update all callers (~120 files) to use the new parameter order
- Fixes a bug in search where system auth context was used, bypassing
RLS feature.
This commit is contained in:
+9
-15
@@ -35,21 +35,15 @@ export class UpdateWorkspaceMemberEmailJob {
|
||||
|
||||
const authContext = buildSystemAuthContext(workspace.id);
|
||||
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
workspace.id,
|
||||
'workspaceMember',
|
||||
{ shouldBypassPermissionChecks: true },
|
||||
);
|
||||
|
||||
await workspaceMemberRepository.update(
|
||||
{ userId },
|
||||
{ userEmail: email },
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
workspace.id,
|
||||
'workspaceMember',
|
||||
{ shouldBypassPermissionChecks: true },
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
await workspaceMemberRepository.update({ userId }, { userEmail: email });
|
||||
}, authContext);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ describe('UserService', () => {
|
||||
executeInWorkspaceContext: jest
|
||||
.fn()
|
||||
|
||||
.mockImplementation((_authContext: any, fn: () => any) => fn()),
|
||||
.mockImplementation((fn: () => any, _authContext?: any) => fn()),
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
@@ -66,7 +66,6 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
const authContext = buildSystemAuthContext(workspace.id);
|
||||
|
||||
return this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -81,6 +80,7 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
},
|
||||
});
|
||||
},
|
||||
authContext,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -92,7 +92,6 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
const authContext = buildSystemAuthContext(workspace.id);
|
||||
|
||||
return this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -105,6 +104,7 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
withDeleted: withDeleted,
|
||||
});
|
||||
},
|
||||
authContext,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
const authContext = buildSystemAuthContext(workspace.id);
|
||||
|
||||
return this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -130,6 +129,7 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
withDeleted: true,
|
||||
});
|
||||
},
|
||||
authContext,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -202,7 +202,6 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
|
||||
const workspaceMembers =
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -213,6 +212,7 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
|
||||
return workspaceMemberRepository.find();
|
||||
},
|
||||
authContext,
|
||||
);
|
||||
|
||||
const userWorkspaceId = userWorkspace.id;
|
||||
@@ -255,21 +255,18 @@ export class UserService extends TypeOrmQueryService<UserEntity> {
|
||||
|
||||
assert(workspaceMember, 'WorkspaceMember not found');
|
||||
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
workspaceId,
|
||||
'workspaceMember',
|
||||
{ shouldBypassPermissionChecks: true },
|
||||
);
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
workspaceId,
|
||||
'workspaceMember',
|
||||
{ shouldBypassPermissionChecks: true },
|
||||
);
|
||||
|
||||
await workspaceMemberRepository.delete({
|
||||
userId: userWorkspace.userId,
|
||||
});
|
||||
},
|
||||
);
|
||||
await workspaceMemberRepository.delete({
|
||||
userId: userWorkspace.userId,
|
||||
});
|
||||
}, authContext);
|
||||
|
||||
await this.userWorkspaceService.deleteUserWorkspace({
|
||||
userWorkspaceId,
|
||||
|
||||
+1
-1
@@ -20,7 +20,6 @@ export class WorkspaceFlatWorkspaceMemberMapCacheService extends WorkspaceCacheP
|
||||
async computeForCache(workspaceId: string): Promise<FlatWorkspaceMemberMaps> {
|
||||
const flatWorkspaceMemberMaps =
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
buildSystemAuthContext(workspaceId),
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -45,6 +44,7 @@ export class WorkspaceFlatWorkspaceMemberMapCacheService extends WorkspaceCacheP
|
||||
|
||||
return flatWorkspaceMemberMaps;
|
||||
},
|
||||
buildSystemAuthContext(workspaceId),
|
||||
);
|
||||
|
||||
return flatWorkspaceMemberMaps;
|
||||
|
||||
@@ -391,7 +391,6 @@ export class UserResolver {
|
||||
|
||||
const workspaceMemberToDelete =
|
||||
await this.globalWorkspaceOrmManager.executeInWorkspaceContext(
|
||||
authContext,
|
||||
async () => {
|
||||
const workspaceMemberRepository =
|
||||
await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
|
||||
@@ -406,6 +405,7 @@ export class UserResolver {
|
||||
},
|
||||
});
|
||||
},
|
||||
authContext,
|
||||
);
|
||||
|
||||
if (!isDefined(workspaceMemberToDelete)) {
|
||||
|
||||
Reference in New Issue
Block a user