DT-915, DT-3005: Use OIDC client id instead of Google client id#2872
Open
DT-915, DT-3005: Use OIDC client id instead of Google client id#2872
Conversation
rushtong
commented
Apr 22, 2026
Comment on lines
+640
to
+643
| @Provides | ||
| OidcConfiguration providesOidcConfiguration() { | ||
| return config.getOidcConfiguration(); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Necessary to support @Inject in SwaggerResource.
rushtong
requested review from
Copilot,
eweitz and
fboulnois
and removed request for
a team
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aligns the Swagger UI/OpenAPI authentication configuration with the service’s OIDC setup by removing the legacy Google OAuth scheme and switching Swagger to use the OIDC client ID instead.
Changes:
- Remove the
googleoauthsecurity scheme from the OpenAPI spec and Swagger UI auth UX. - Replace
GoogleOAuth2Configusage withOidcConfigurationfor Swagger UI OAuth initialization. - Update test configuration and Swagger resource tests accordingly; remove the unused
GoogleOAuth2Configconfiguration class.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/test/resources/consent-config.yml | Moves test client id under oidcConfiguration and removes googleAuthentication. |
| src/test/java/org/broadinstitute/consent/http/resources/SwaggerResourceTest.java | Updates SwaggerResource test setup to use OidcConfiguration. |
| src/main/resources/assets/api-docs.yaml | Removes googleoauth security scheme and leaves only oidc. |
| src/main/java/org/broadinstitute/consent/http/resources/SwaggerResource.java | Switches injected config type to OidcConfiguration for Swagger OAuth client ID. |
| src/main/java/org/broadinstitute/consent/http/configurations/GoogleOAuth2Config.java | Deletes now-unused Google OAuth config class. |
| src/main/java/org/broadinstitute/consent/http/configurations/ConsentConfiguration.java | Removes googleAuthentication config property and accessors. |
| src/main/java/org/broadinstitute/consent/http/ConsentModule.java | Removes Google OAuth config provider; adds OIDC config provider for DI. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
kevinmarete
approved these changes
Apr 22, 2026
eweitz
approved these changes
Apr 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses
Summary
This PR updates the swagger auth configuration to use the existing OIDC client id and removes the newly unnecessary Google OAuth configuration information. The original code used the same Google client id in both oauth schemes which was incorrect.
Secondly, we're removing the Google OAuth panel because our UI uses OIDC, not Google, so keeping them consistent will remove confusion between different OIDC/Google token formats.
Depends on https://github.com/broadinstitute/terraform-ap-deployments/pull/2038 which will add the local development url to the list of approved redirect uris.
Follow-on PR to remove the unused configs: https://github.com/broadinstitute/terra-helmfile/pull/6421
New
Old
Top part of the scrollable window:
Bottom part of the scrollable window:
Have you read CONTRIBUTING.md lately? If not, do that first.