IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting oauthPassThru flag (#72472)

Browse Source 
* Fix setting oauthPassThru flag

* Call onChange only if azure auth is enabled

* Move changes in onSettingsChange
This commit is contained in:
ismail simsek 2023-08-03 12:15:42 +03:00 committed by GitHub
parent 2ef334def7
commit a44e0f2cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx
View File

@ -78,17 +78,36 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
} = props;
const [isAccessHelpVisible, setIsAccessHelpVisible] = useState(false);
const [azureAuthEnabled, setAzureAuthEnabled] = useState(false);
const theme = useTheme2();
let urlTooltip;
const onSettingsChange = useCallback(
(change: Partial<typeof dataSourceConfig>) => {
// Azure Authentication doesn't work correctly when Forward OAuth Identity is enabled.
// The Authorization header that has been set by the ApplyAzureAuth middleware gets overwritten
// with the Authorization header set by the OAuthTokenMiddleware.
const isAzureAuthEnabled =
(azureAuthSettings?.azureAuthSupported && azureAuthSettings.getAzureAuthEnabled(dataSourceConfig)) || false;
setAzureAuthEnabled(isAzureAuthEnabled);
if (isAzureAuthEnabled) {
const tmpOauthPassThru =
dataSourceConfig.jsonData.oauthPassThru !== undefined ? dataSourceConfig.jsonData.oauthPassThru : false;
change = {
...change,
jsonData: {
...dataSourceConfig.jsonData,
oauthPassThru: isAzureAuthEnabled ? false : tmpOauthPassThru,
},
};
}
onChange({
...dataSourceConfig,
...change,
});
},
[dataSourceConfig, onChange]
[azureAuthSettings, dataSourceConfig, onChange]
);
switch (dataSourceConfig.access) {
@ -145,15 +164,6 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
/>
);
const azureAuthEnabled: boolean =
(azureAuthSettings?.azureAuthSupported && azureAuthSettings.getAzureAuthEnabled(dataSourceConfig)) || false;
// Azure Authentication doesn't work correctly when Forward OAuth Identity is enabled.
// The Authorization header that has been set by the ApplyAzureAuth middleware gets overwritten
// with the Authorization header set by the OAuthTokenMiddleware.
dataSourceConfig.jsonData.oauthPassThru = azureAuthEnabled ? false : dataSourceConfig.jsonData.oauthPassThru;
const shouldShowForwardOAuthIdentityOption = azureAuthEnabled ? false : showForwardOAuthIdentityOption;
return (
<div className="gf-form-group">
<>
@ -301,7 +311,7 @@ export const DataSourceHttpSettings = (props: HttpSettingsProps) => {
<HttpProxySettings
dataSourceConfig={dataSourceConfig}
onChange={(jsonData) => onSettingsChange({ jsonData })}
showForwardOAuthIdentityOption={shouldShowForwardOAuthIdentityOption}
showForwardOAuthIdentityOption={azureAuthEnabled ? false : showForwardOAuthIdentityOption}
/>
)}
</div>