Azure: Correctly set instance settings based on new credentials (#99112)
Correctly set value based on new credentials
This commit is contained in:
@@ -60,15 +60,17 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
|
|||||||
|
|
||||||
this.variables = new VariableSupport(this);
|
this.variables = new VariableSupport(this);
|
||||||
|
|
||||||
this.currentUserAuth = instanceSettings.jsonData.azureAuthType === 'currentuser';
|
|
||||||
const credentials = instanceSettings.jsonData.azureCredentials;
|
const credentials = instanceSettings.jsonData.azureCredentials;
|
||||||
if (credentials && instanceOfAzureCredential<AadCurrentUserCredentials>('currentuser', credentials)) {
|
if (credentials && instanceOfAzureCredential<AadCurrentUserCredentials>('currentuser', credentials)) {
|
||||||
|
this.currentUserAuth = true;
|
||||||
if (!credentials.serviceCredentials) {
|
if (!credentials.serviceCredentials) {
|
||||||
this.currentUserAuthFallbackAvailable = false;
|
this.currentUserAuthFallbackAvailable = false;
|
||||||
} else {
|
} else {
|
||||||
this.currentUserAuthFallbackAvailable = isCredentialsComplete(credentials.serviceCredentials, true);
|
this.currentUserAuthFallbackAvailable = isCredentialsComplete(credentials.serviceCredentials, true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// Handle legacy credentials case
|
||||||
|
this.currentUserAuth = instanceSettings.jsonData.azureAuthType === 'currentuser';
|
||||||
this.currentUserAuthFallbackAvailable = false;
|
this.currentUserAuthFallbackAvailable = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user