From 7e6443eef21d66e961bad80a2a75a87a63094fec Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 13 Jun 2025 16:22:59 +0000 Subject: [PATCH 1/3] test --- .../databricks/sdk/core/DatabricksConfig.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java index fcb79c87b..a52609a8f 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java @@ -581,22 +581,6 @@ private OpenIDConnectEndpoints fetchDefaultOidcEndpoints() throws IOException { if (getHost() == null) { return null; } - if (isAzure() && getAzureClientId() != null) { - Request request = new Request("GET", getHost() + "/oidc/oauth2/v2.0/authorize"); - request.setRedirectionBehavior(false); - Response resp = getHttpClient().execute(request); - String realAuthUrl = resp.getFirstHeader("location"); - if (realAuthUrl == null) { - return null; - } - return new OpenIDConnectEndpoints( - realAuthUrl.replaceAll("/authorize", "/token"), realAuthUrl); - } - if (isAccountClient() && getAccountId() != null) { - String prefix = getHost() + "/oidc/accounts/" + getAccountId(); - return new OpenIDConnectEndpoints(prefix + "/v1/token", prefix + "/v1/authorize"); - } - ApiClient apiClient = new ApiClient.Builder() .withHttpClient(getHttpClient()) From ffa862149f16c107c6eafc593cd75f0bb3bde5b7 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 13 Jun 2025 16:36:09 +0000 Subject: [PATCH 2/3] add back account endpoint --- .../main/java/com/databricks/sdk/core/DatabricksConfig.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java index a52609a8f..dd31ea063 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/DatabricksConfig.java @@ -581,6 +581,12 @@ private OpenIDConnectEndpoints fetchDefaultOidcEndpoints() throws IOException { if (getHost() == null) { return null; } + + if (isAccountClient() && getAccountId() != null) { + String prefix = getHost() + "/oidc/accounts/" + getAccountId(); + return new OpenIDConnectEndpoints(prefix + "/v1/token", prefix + "/v1/authorize"); + } + ApiClient apiClient = new ApiClient.Builder() .withHttpClient(getHttpClient()) From 4feb1a13786fa30e3b398a9f34a4ea744764c99d Mon Sep 17 00:00:00 2001 From: Renaud Hartert Date: Fri, 13 Jun 2025 19:46:04 +0200 Subject: [PATCH 3/3] Update NEXT_CHANGELOG.md --- NEXT_CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index 34a0d9f1c..7f0808191 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -10,4 +10,6 @@ ### Internal Changes +* Use Databricks OIDC endpoints for Azure authentication flows ([463](https://github.com/databricks/databricks-sdk-java/pull/463)). + ### API Changes