Skip to content

Commit 92e4ed3

Browse files
committed
Address review comments
1 parent c153509 commit 92e4ed3

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

‎.changeset/truefoundry-no-global-admin.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/trueforge/src/auth/identity.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,17 @@ export function resolveRequestContext(c: Context): RequestContext {
5454
* - OIDC: `roles` includes configured `OIDC_ADMIN_ROLE_VALUE`
5555
* - TrueFoundry: no tenant-wide TrueForge admin
5656
*/
57+
// TODO (chiragjn): hasAdminRole will be renamed to canAccessSettings once all authorizer changes are done
5758
export function hasAdminRole(requestContext: Pick<RequestContext, 'roles'>): boolean {
5859
switch (getTrueForgeMode()) {
5960
case TrueForgeMode.TrueFoundry:
6061
return false;
6162
case TrueForgeMode.Oidc: {
62-
const adminValue = isOidcConfigured(configuration)
63-
? configuration.OIDC.OIDC_ADMIN_ROLE_VALUE
64-
: STANDALONE_ADMIN_ROLE;
65-
return requestContext.roles.includes(adminValue);
63+
if (!isOidcConfigured(configuration)) {
64+
// this is technically unreachable since case TrueForgeMode.Oidc already ensures OIDC is configured
65+
return false;
66+
}
67+
return requestContext.roles.includes(configuration.OIDC.OIDC_ADMIN_ROLE_VALUE);
6668
}
6769
case TrueForgeMode.Standalone:
6870
return requestContext.roles.includes(STANDALONE_ADMIN_ROLE);

0 commit comments

Comments
 (0)