Auth: Allow admins to manually change oauth user role if oauth_skip_org_role_update_sync is enabled (#55182)
* Auth: Allow admins to change oauth user info it it's not synced. Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update public/app/features/admin/UserAdminPage.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Add missing import * Simplify init Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * SAML: Add option to skip org role sync (#55230) * SAML: Add option to skip org role sync * Modify frontend accordingly * Remove update from config option name Co-authored-by: Jguer <joao.guerreiro@grafana.com> * Remove update from config option name Co-authored-by: Jguer <joao.guerreiro@grafana.com> * Fix typo Co-authored-by: Jguer <joao.guerreiro@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
This commit is contained in:
co-authored by
Gabriel MABILLE
Alex Khomenko
Josh Hunt
gamab
parent
ebcbb66548
commit
3e2e9f93b9
@@ -153,6 +153,7 @@ export interface GrafanaConfig {
|
||||
isPublicDashboardView: boolean;
|
||||
datasources: { [str: string]: DataSourceInstanceSettings };
|
||||
panels: { [key: string]: PanelPluginMeta };
|
||||
auth: AuthSettings;
|
||||
minRefreshInterval: string;
|
||||
appSubUrl: string;
|
||||
windowTitlePrefix: string;
|
||||
@@ -214,3 +215,8 @@ export interface GrafanaConfig {
|
||||
rudderstackSdkUrl: string | undefined;
|
||||
rudderstackConfigUrl: string | undefined;
|
||||
}
|
||||
|
||||
export interface AuthSettings {
|
||||
OAuthSkipOrgRoleUpdateSync?: boolean;
|
||||
SAMLSkipOrgRoleSync?: boolean;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ export type {
|
||||
BootData,
|
||||
OAuth,
|
||||
OAuthSettings,
|
||||
AuthSettings,
|
||||
GrafanaConfig,
|
||||
BuildInfo,
|
||||
LicenseInfo,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { merge } from 'lodash';
|
||||
|
||||
import {
|
||||
AuthSettings,
|
||||
BootData,
|
||||
BuildInfo,
|
||||
createTheme,
|
||||
@@ -27,6 +28,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
|
||||
isPublicDashboardView: boolean;
|
||||
datasources: { [str: string]: DataSourceInstanceSettings } = {};
|
||||
panels: { [key: string]: PanelPluginMeta } = {};
|
||||
auth: AuthSettings = {};
|
||||
minRefreshInterval = '';
|
||||
appUrl = '';
|
||||
appSubUrl = '';
|
||||
@@ -107,7 +109,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
|
||||
pluginAdminExternalManageEnabled = false;
|
||||
pluginCatalogHiddenPlugins: string[] = [];
|
||||
expressionsEnabled = false;
|
||||
customTheme?: any;
|
||||
customTheme?: undefined;
|
||||
awsAllowedAuthProviders: string[] = [];
|
||||
awsAssumeRoleEnabled = false;
|
||||
azure: AzureSettings = {
|
||||
|
||||
Reference in New Issue
Block a user