IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

AccessControl: Use RBACBuiltInRoleAssignmentEnabled in the frontend instead of FeatureToggle (#49261)

Browse Source 
* AccessControl: Frontend changes to basic role enablement
This commit is contained in:
Gabriel MABILLE 2022-05-20 08:53:28 +02:00 committed by GitHub
parent 59c8c0d56b
commit 689f51599a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-data/src/types/config.ts
View File

@ -163,6 +163,7 @@ export interface GrafanaConfig {
verifyEmailEnabled: boolean;
oauth: OAuthSettings;
rbacEnabled: boolean;
rbacBuiltInRoleAssignmentEnabled: boolean;
disableUserSignUp: boolean;
loginHint: string;
passwordHint: string;

1
packages/grafana-runtime/src/config.ts
View File

@ -58,6 +58,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
verifyEmailEnabled = false;
oauth: OAuthSettings = {};
rbacEnabled = true;
rbacBuiltInRoleAssignmentEnabled = false;
disableUserSignUp = false;
loginHint = '';
passwordHint = '';

1
pkg/api/frontendsettings.go
View File

@ -106,6 +106,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
"verifyEmailEnabled": setting.VerifyEmailEnabled,
"sigV4AuthEnabled": setting.SigV4AuthEnabled,
"rbacEnabled": hs.Cfg.RBACEnabled,
"rbacBuiltInRoleAssignmentEnabled": hs.Cfg.RBACBuiltInRoleAssignmentEnabled,
"exploreEnabled": setting.ExploreEnabled,
"helpEnabled": setting.HelpEnabled,
"profileEnabled": setting.ProfileEnabled,

4
public/app/core/services/context_srv.ts
View File

@ -112,8 +112,8 @@ export class ContextSrv {
return config.rbacEnabled;
}
accessControlBuiltinRefactorEnabled(): boolean {
return Boolean(config.featureToggles['accesscontrol-builtins']);
accessControlBuiltInRoleAssignmentEnabled(): boolean {
return config.rbacBuiltInRoleAssignmentEnabled;
}
licensedAccessControlEnabled(): boolean {

2
public/app/features/serviceaccounts/state/actions.ts
View File

@ -32,7 +32,7 @@ export function fetchACOptions(): ThunkResult<void> {
dispatch(acOptionsLoaded(options));
}
if (
!contextSrv.accessControlBuiltinRefactorEnabled() &&
contextSrv.accessControlBuiltInRoleAssignmentEnabled() &&
contextSrv.licensedAccessControlEnabled() &&
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
) {

2
public/app/features/users/UsersTable.tsx
View File

@ -31,7 +31,7 @@ const UsersTable: FC<Props> = (props) => {
}
if (
!contextSrv.accessControlBuiltinRefactorEnabled() &&
contextSrv.accessControlBuiltInRoleAssignmentEnabled() &&
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
) {
const builtInRoles = await fetchBuiltinRoles(orgId);