Skip to content

Commit 93add9a

Browse files
committed
Fix #34167: add option to not use default openid scopes
1 parent c0d0a19 commit 93add9a

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/auth/impl/oidc/OpenIDConfiguration.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class OpenIDConfiguration {
5454
public static final String REG_ID = "shinyproxy";
5555
public static final String PROP_OPENID_JWKS_SIGNATURE_ALGORITHM = "proxy.openid.jwks-signature-algorithm";
5656
public static final String PROP_DEFAULT_ALGORITHM = "RS256";
57+
public static final String PROP_INCLUDE_DEFAULT_SCOPES = "proxy.openid.include-default-scopes";
5758

5859
@Inject
5960
private Environment environment;
@@ -69,8 +70,10 @@ public OAuth2AuthorizedClientService oAuth2AuthorizedClientService() {
6970
@Bean
7071
public ClientRegistrationRepository clientRegistrationRepository() {
7172
Set<String> scopes = new HashSet<>();
72-
scopes.add("openid");
73-
scopes.add("email");
73+
if (environment.getProperty(PROP_INCLUDE_DEFAULT_SCOPES, Boolean.class, true)) {
74+
scopes.add("openid");
75+
scopes.add("email");
76+
}
7477

7578
Optional.ofNullable(EnvironmentUtils.readList(environment, "proxy.openid.scopes"))
7679
.ifPresent(scopes::addAll);

0 commit comments

Comments
 (0)