From bfea2ec2965f8f4e8e846883ef22e5ca90a0b992 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@databricks.com>
Date: Fri, 28 Jul 2023 12:05:17 +0200
Subject: [PATCH] Handle az CLI token refresh (#820)

## Changes
Handle az CLI token refresh
---
 .../src/configuration/auth/AzureCliCheck.ts   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/databricks-vscode/src/configuration/auth/AzureCliCheck.ts b/packages/databricks-vscode/src/configuration/auth/AzureCliCheck.ts
index fe00ed65e..7298931ae 100644
--- a/packages/databricks-vscode/src/configuration/auth/AzureCliCheck.ts
+++ b/packages/databricks-vscode/src/configuration/auth/AzureCliCheck.ts
@@ -58,6 +58,11 @@ export class AzureCliCheck implements Disposable {
                         type: "next",
                         next: "loginAzureCli",
                     };
+                } else if (result.expired) {
+                    return {
+                        type: "next",
+                        next: "loginAzureCli",
+                    };
                 } else if (result.aud) {
                     this.azureLoginAppId = result.aud;
                     return {
@@ -164,6 +169,7 @@ export class AzureCliCheck implements Disposable {
         iss?: string;
         aud?: string;
         canLogin: boolean;
+        expired: boolean;
         error?: Error;
     }> {
         const workspaceClient = new WorkspaceClient(
@@ -188,6 +194,18 @@ export class AzureCliCheck implements Disposable {
                 return {
                     iss: m[1],
                     canLogin: false,
+                    expired: false,
+                };
+            }
+
+            m = e.message.match(
+                /(Interactive authentication is needed). Please run:\naz login( --scope ([a-z0-9-]+?)\/\.default)?\n/s
+            );
+            if (m) {
+                return {
+                    canLogin: false,
+                    error: new Error(m[1]),
+                    expired: true,
                 };
             }
 
@@ -198,12 +216,13 @@ export class AzureCliCheck implements Disposable {
                 return {
                     aud: m[1],
                     canLogin: false,
+                    expired: false,
                 };
             }
 
-            return {canLogin: false, error: e};
+            return {canLogin: false, error: e, expired: false};
         }
-        return {canLogin: true};
+        return {canLogin: true, expired: false};
     }
 
     // check if Azure CLI is installed