Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag '2023.10.0' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-10-10 21:22:31 +09:00
commit 5593eab248
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
226 changed files with 5462 additions and 2914 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/server/api/ApiCallService.ts
View file

@ -320,13 +320,7 @@ export class ApiCallService implements OnApplicationShutdown {
if (ep.meta.requireRolePolicy != null && !user!.isRoot) {
const policies = await this.roleService.getUserPolicies(user!.id);
let denied: boolean;
if (typeof ep.meta.requireRolePolicy === 'string') {
denied = !policies[ep.meta.requireRolePolicy];
} else {
denied = ep.meta.requireRolePolicy.some(policy => !policies[policy]);
}
if (denied) {
if (!policies[ep.meta.requireRolePolicy]) {
throw new ApiError({
message: 'You are not assigned to a required role.',
code: 'ROLE_PERMISSION_DENIED',