chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

fix: regression perm not work as expected after activeOnly opts

Browse source
This commit is contained in:
Methapon2001 2024-12-12 10:15:22 +07:00
parent c4d2349114
commit eb8e311d3d
1 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/services/permission.ts
View file

@ -40,11 +40,12 @@ export function createPermCondition(
? undefined ? undefined
: [ : [
{ {
status: opts?.activeOnly ? { not: Status.INACTIVE } : undefined, AND: opts?.activeOnly ? { status: { not: Status.INACTIVE } } : undefined,
OR: [
{
user: { some: { userId: user.sub } }, user: { some: { userId: user.sub } },
}, },
{ {
status: opts?.activeOnly ? { not: Status.INACTIVE } : undefined,
branch: branch:
opts?.alwaysIncludeHead || globalAllow(user) opts?.alwaysIncludeHead || globalAllow(user)
? { ? {
@ -61,7 +62,6 @@ export function createPermCondition(
}, },
} }
: undefined, : undefined,
status: opts?.activeOnly ? { not: Status.INACTIVE } : undefined,
}, },
{ {
headOffice: globalAllow(user) headOffice: globalAllow(user)
@ -70,7 +70,8 @@ export function createPermCondition(
user: { some: { userId: user.sub } }, user: { some: { userId: user.sub } },
} }
: undefined, : undefined,
status: opts?.activeOnly ? { not: Status.INACTIVE } : undefined, },
],
}, },
]; ];
} }