From 36ee9382dd54615bc18fc6c3c08ebd266ff72f91 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 24 Jun 2025 09:32:00 -0400 Subject: [PATCH] simplify checks for token roles --- packages/backend/src/core/RoleService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index d16dbb57b0..1418999e9a 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -531,8 +531,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { if (user == null) return false; // Check for dropped token permissions - const callerId = getCallerId(user); - if (callerId?.accessToken?.rank != null && callerId.accessToken.rank !== 'admin' && callerId.accessToken.rank !== 'mod') return false; + const rank = getCallerId(user)?.accessToken?.rank; + if (rank != null && rank !== 'admin' && rank !== 'mod') return false; return (this.meta.rootUserId === user.id) || (await this.getUserRoles(user.id)).some(r => r.isModerator || r.isAdministrator); } @@ -542,8 +542,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { if (user == null) return false; // Check for dropped token permissions - const callerId = getCallerId(user); - if (callerId?.accessToken?.rank != null && callerId.accessToken.rank !== 'admin') return false; + const rank = getCallerId(user)?.accessToken?.rank; + if (rank != null && rank !== 'admin') return false; return (this.meta.rootUserId === user.id) || (await this.getUserRoles(user.id)).some(r => r.isAdministrator); }