From f39c5bb45c0f7bdf144dcdf8a5280d2105e80979 Mon Sep 17 00:00:00 2001
From: Andreas Christou <andreas.christou@grafana.com>
Date: Fri, 17 Jan 2025 18:13:15 +0000
Subject: [PATCH] Azure: Correctly set instance settings based on new
 credentials (#99112)

Correctly set value based on new credentials
---
 public/app/plugins/datasource/azuremonitor/datasource.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/azuremonitor/datasource.ts b/public/app/plugins/datasource/azuremonitor/datasource.ts
index 6b710baefd5..5100635efd4 100644
--- a/public/app/plugins/datasource/azuremonitor/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/datasource.ts
@@ -60,15 +60,17 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
 
     this.variables = new VariableSupport(this);
 
-    this.currentUserAuth = instanceSettings.jsonData.azureAuthType === 'currentuser';
     const credentials = instanceSettings.jsonData.azureCredentials;
     if (credentials && instanceOfAzureCredential<AadCurrentUserCredentials>('currentuser', credentials)) {
+      this.currentUserAuth = true;
       if (!credentials.serviceCredentials) {
         this.currentUserAuthFallbackAvailable = false;
       } else {
         this.currentUserAuthFallbackAvailable = isCredentialsComplete(credentials.serviceCredentials, true);
       }
     } else {
+      // Handle legacy credentials case
+      this.currentUserAuth = instanceSettings.jsonData.azureAuthType === 'currentuser';
       this.currentUserAuthFallbackAvailable = false;
     }
   }