oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge tag '2023.9.2' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-09-29 22:16:04 +09:00
commit e2c9ed355b
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
144 changed files with 2519 additions and 1660 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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