Fix issues in the AAD login flow (#316)

Author: fjakobs

packages/databricks-vscode/src/configuration/AuthProvider.ts

@@ -38,20 +38,13 @@ export abstract class AuthProvider {
     abstract toJSON(): Record<string, unknown>;
     abstract getEnvVars(): {[key: string]: string};
 
-    getCredentialProvider(): CredentialProvider {
-        if (!this._credentialProvider) {
-            this._credentialProvider = this.createCredentialProvider();
-        }
-        return this._credentialProvider;
-    }
+    public abstract getCredentialProvider(): CredentialProvider;
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async check(silent: boolean): Promise<boolean> {
         return true;
     }
 
-    protected abstract createCredentialProvider(): CredentialProvider;
-
     static fromJSON(json: Record<string, any>): AuthProvider {
         const url = json.url instanceof URL ? json.url : new URL(json.host);
         if (!url) {
@@ -109,7 +102,7 @@ export class TokenAuthProvider extends AuthProvider {
         };
     }
 
-    createCredentialProvider(): CredentialProvider {
+    getCredentialProvider(): CredentialProvider {
         return fromToken(this.host, this.token);
     }
 }
@@ -138,7 +131,7 @@ export class ProfileAuthProvider extends AuthProvider {
         };
     }
 
-    createCredentialProvider(): CredentialProvider {
+    getCredentialProvider(): CredentialProvider {
         return fromConfigFile(this.profile);
     }
 }
@@ -166,7 +159,7 @@ export class AzureCliAuthProvider extends AuthProvider {
         };
     }
 
-    createCredentialProvider(): CredentialProvider {
+    getCredentialProvider(): CredentialProvider {
         return fromAzureCli(this.host);
     }
 

packages/databricks-vscode/src/configuration/AzureCliCheck.ts

@@ -168,7 +168,7 @@ export class AzureCliCheck implements Disposable {
         } catch (e: any) {
             // parse error message
             const m = e.message.match(
-                /Expected iss claim to be: https:\/\/sts\.windows\.net\/(.+), but was: https:\/\/sts\.windows\.net\/(.+)/
+                /Expected iss claim to be: https:\/\/sts\.windows\.net\/([a-z0-9-]+?)\/?, but was: https:\/\/sts\.windows\.net\/([a-z0-9-]+)\/?/
             );
             if (m) {
                 return m[1];

packages/databricks-vscode/src/configuration/configureWorkspaceWizard.ts

@@ -107,9 +107,9 @@ export async function configureWorkspaceWizard(
                             )
                             .filter(
                                 (label) =>
-                                    (
-                                        profiles[label] as Profile
-                                    ).host.toString() === state.host!.toString()
+                                    (profiles[label] as Profile).host
+                                        .hostname ===
+                                    new URL(state.host!).hostname
                             )
                             .map((label) => ({
                                 label,
@@ -206,6 +206,11 @@ async function validateDatabricksHost(
     host: string
 ): Promise<string | undefined> {
     let url;
+
+    if (!host.startsWith("https://")) {
+        host = `https://${host}`;
+    }
+
     try {
         url = new URL(host);
     } catch (e) {