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

fix: always include from head branch

Browse source
This commit is contained in:
Methapon Metanipat 2024-09-10 16:18:07 +07:00
parent c38a1ce0c0
commit 977cb5c6a4
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/01-branch-controller.ts
View file

@ -118,7 +118,7 @@ export class BranchController extends Controller {
async getStats(@Request() req: RequestWithUser, @Query() headOfficeId?: string) { async getStats(@Request() req: RequestWithUser, @Query() headOfficeId?: string) {
const where = { const where = {
AND: { AND: {
OR: permissionCond(req.user), OR: permissionCond(req.user, true),
}, },
}; };
@ -217,7 +217,7 @@ export class BranchController extends Controller {
zipCode, zipCode,
headOfficeId: headOfficeId ?? (filter === "head" || tree ? null : undefined), headOfficeId: headOfficeId ?? (filter === "head" || tree ? null : undefined),
NOT: { headOfficeId: filter === "sub" && !headOfficeId ? null : undefined }, NOT: { headOfficeId: filter === "sub" && !headOfficeId ? null : undefined },
OR: permissionCond(req.user), OR: permissionCond(req.user, true),
}, },
OR: [ OR: [
{ nameEN: { contains: query } }, { nameEN: { contains: query } },

7
src/services/permission.ts
View file

@ -17,7 +17,7 @@ export function branchRelationPermInclude(user: RequestWithUser["user"]) {
} }
export function createPermCondition(globalAllow: (user: RequestWithUser["user"]) => boolean) { export function createPermCondition(globalAllow: (user: RequestWithUser["user"]) => boolean) {
return (user: RequestWithUser["user"]) => return (user: RequestWithUser["user"], alwaysIncludeHead?: boolean) =>
isSystem(user) isSystem(user)
? undefined ? undefined
: [ : [
@ -25,7 +25,10 @@ export function createPermCondition(globalAllow: (user: RequestWithUser["user"])
user: { some: { userId: user.sub } }, user: { some: { userId: user.sub } },
}, },
{ {
branch: { some: { user: { some: { userId: user.sub } } } }, branch:
alwaysIncludeHead || globalAllow(user)
? { some: { user: { some: { userId: user.sub } } } }
: undefined,
}, },
{ {
headOffice: globalAllow(user) headOffice: globalAllow(user)