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

fix: use iAmAdmin, iAmModerator instead of $i.isAdmin value

Browse source
This commit is contained in:
무라쿠모 2024-08-13 16:54:28 +09:00
parent ab68d1f75e
commit 8f66932737
No known key found for this signature in database
GPG key ID: 139D6573F92DA9F7
20 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ export class ApiCallService implements OnApplicationShutdown {
}
}
if (ep.meta.requireModerator || ep.meta.requireAdmin) {
if ((ep.meta.requireModerator || ep.meta.requireAdmin) && !user!.isRoot) {
const myRoles = await this.roleService.getUserRoles(user!.id);
const isModerator = myRoles.some(r => r.isModerator || r.isAdministrator);
const isAdmin = myRoles.some(r => r.isAdministrator);
@ -324,14 +324,6 @@ export class ApiCallService implements OnApplicationShutdown {
id: 'abce13fe-1d9f-4e85-8f00-4a5251155470',
});
}
if (!user!.isRoot) {
throw new ApiError({
message: 'You are not assigned to a proper role.',
code: 'ROLE_PERMISSION_DENIED',
kind: 'permission',
id: 'd33d5333-db36-423d-a8f9-1a2b9549da41',
});
}
if (ep.meta.requireModerator && !isModerator) {
throw new ApiError({
message: 'You are not assigned to a proper role.',