Skip to content

Commit a2b5fd0

Browse files
authored
[Bugfix] Fix backward incompatible change in SDK : browser auth flow (databricks#973)
## Description - This is a breaking change for browser based auth, this PR fixes it. ## Testing - E2E manual testing - Added a Unit test too ## Additional Notes to the Reviewer - I am only fixing the bleeding issue as part of this PR. And not the long term context flag addition in the driver. Added a TODO for the same. - Additional context : https://docs.google.com/document/d/17wkI_I16_k6Igl0QPDWZkgbg-7VApebyO4D1yVeXfpM/edit?tab=t.0#heading=h.ig8zh4bt1u8z NO_CHANGELOG=true
1 parent 9cecd23 commit a2b5fd0

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

src/main/java/com/databricks/jdbc/dbclient/impl/common/ClientConfigurator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.net.ServerSocket;
2727
import java.nio.file.Path;
2828
import java.nio.file.Paths;
29+
import java.time.Duration;
2930
import java.util.ArrayList;
3031
import java.util.Arrays;
3132
import java.util.List;
@@ -196,6 +197,8 @@ public void setupU2MConfig() throws DatabricksParsingException {
196197
.setAuthType(DatabricksJdbcConstants.U2M_AUTH_TYPE)
197198
.setHost(host)
198199
.setClientId(clientId)
200+
.setOAuthBrowserAuthTimeout(
201+
Duration.ofHours(1)) // TODO : add a browser timeout connection config
199202
.setClientSecret(connectionContext.getClientSecret())
200203
.setOAuthRedirectUrl(redirectUrl);
201204

src/test/java/com/databricks/jdbc/dbclient/impl/common/ClientConfiguratorTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.databricks.sdk.core.utils.Cloud;
2626
import java.io.IOException;
2727
import java.net.ServerSocket;
28+
import java.time.Duration;
2829
import java.util.List;
2930
import java.util.Properties;
3031
import org.junit.jupiter.api.Test;
@@ -453,6 +454,7 @@ void getWorkspaceClient_OAuthWithBrowserBasedAuthentication_SetsCustomRedirectUr
453454
assertEquals("browser-client-id", config.getClientId());
454455
assertEquals("browser-client-secret", config.getClientSecret());
455456
assertEquals(List.of("scope1", "scope2"), config.getScopes());
457+
assertEquals(Duration.ofHours(1), config.getOAuthBrowserAuthTimeout());
456458
assertEquals("http://localhost:" + testPort, config.getOAuthRedirectUrl());
457459
assertEquals(DatabricksJdbcConstants.U2M_AUTH_TYPE, config.getAuthType());
458460
}

0 commit comments

Comments
 (0)