Skip to content

fix(bqjdbc): add default OAuth client id/secret #12946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logachev merged 5 commits into from
May 5, 2026
+24 −2
Merged

fix(bqjdbc): add default OAuth client id/secret #12946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c1245b
fix(bqjdbc): add default OAuth client id/secret
logachev Apr 28, 2026
43cde56
Update java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/goo…
logachev May 2, 2026
e337f55
Update java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/goo…
logachev May 2, 2026
fd9c000
Merge branch 'main' into kirl/user_auth_default_client
logachev May 2, 2026
117f582
Merge branch 'main' into kirl/user_auth_default_client
logachev May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
static final String OAUTH_REFRESH_TOKEN_PROPERTY_NAME = "OAuthRefreshToken";
static final String OAUTH_CLIENT_ID_PROPERTY_NAME = "OAuthClientId";
static final String OAUTH_CLIENT_SECRET_PROPERTY_NAME = "OAuthClientSecret";
static final String DEFAULT_OAUTH_CLIENT_ID = "977385342095.apps.googleusercontent.com";
static final String DEFAULT_OAUTH_CLIENT_SECRET = "wbER7576mc_1YOII0dGk7jEE";
Comment thread
logachev marked this conversation as resolved.
static final String ENABLE_HTAPI_PROPERTY_NAME = "EnableHighThroughputAPI";
static final String PROXY_HOST_PROPERTY_NAME = "ProxyHost";
static final String PROXY_PORT_PROPERTY_NAME = "ProxyPort";
Expand Down
8 changes: 6 additions & 2 deletions ...y/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/DataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,15 +960,19 @@ public void setDestinationDatasetExpirationTime(long destinationDatasetExpiratio
}

public String getOAuthClientId() {
return oAuthClientId;
return oAuthClientId != null && !oAuthClientId.trim().isEmpty()
? oAuthClientId
: BigQueryJdbcUrlUtility.DEFAULT_OAUTH_CLIENT_ID;
}

public void setOAuthClientId(String oAuthClientId) {
this.oAuthClientId = oAuthClientId;
}

public String getOAuthClientSecret() {
return oAuthClientSecret;
return oAuthClientSecret != null && !oAuthClientSecret.trim().isEmpty()
? oAuthClientSecret
: BigQueryJdbcUrlUtility.DEFAULT_OAUTH_CLIENT_SECRET;
}

public void setOAuthClientSecret(String oAuthClientSecret) {
Expand Down
16 changes: 16 additions & 0 deletions ...query-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,22 @@ public void testParseOAuthPropsForUserAuth() {
assertThat(authProperties.get("OAuthClientSecret")).isEqualTo("secret");
}

@Test
public void testParseOAuthPropsForUserAuthDefault() {
Map<String, String> authProperties =
BigQueryJdbcOAuthUtility.parseOAuthProperties(
DataSource.fromUrl(
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+ "OAuthType=1;ProjectId=MyBigQueryProject;"),
null);

assertThat(authProperties.get("OAuthType")).isEqualTo("GOOGLE_USER_ACCOUNT");
assertThat(authProperties.get("OAuthClientId"))
.isEqualTo(BigQueryJdbcUrlUtility.DEFAULT_OAUTH_CLIENT_ID);
assertThat(authProperties.get("OAuthClientSecret"))
.isEqualTo(BigQueryJdbcUrlUtility.DEFAULT_OAUTH_CLIENT_SECRET);
}

@Test
public void testGenerateUserAuthURL() {
try {
Expand Down
Loading