Skip to content

Commit

Permalink
OpenID Connect custom parameters (#2254)
Browse files Browse the repository at this point in the history
  • Loading branch information
RowanErasmus committed May 18, 2023
1 parent f50bffb commit 456c178
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -101,6 +101,7 @@
<security.oid.url></security.oid.url>
<security.oid.logoutUrl></security.oid.logoutUrl>
<security.oid.extraScopes></security.oid.extraScopes>
<security.oid.customParams>{:}</security.oid.customParams>
<security.oid.redirectUrl>http://localhost/index.html#/welcome/</security.oid.redirectUrl>
<security.kerberos.spn></security.kerberos.spn>
<security.kerberos.keytabPath></security.kerberos.keytabPath>
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/ohdsi/webapi/OidcConfCreator.java
Expand Up @@ -23,6 +23,9 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.Map;


@Component
public class OidcConfCreator {
Expand All @@ -41,6 +44,9 @@ public class OidcConfCreator {

@Value("${security.oid.extraScopes}")
private String extraScopes;

@Value("#{${security.oid.customParams:{T(java.util.Collections).emptyMap()}}}")
private Map<String, String> customParams = new HashMap<>();

@Value("${security.oauth.callback.api}")
private String oauthApiCallback;
Expand All @@ -53,6 +59,10 @@ public OidcConfiguration build() {
conf.setLogoutUrl(logoutUrl);
conf.setWithState(true);
conf.setUseNonce(true);

if (customParams != null) {
customParams.forEach(conf::addCustomParam);
}

String scopes = "openid";
if (extraScopes != null && !extraScopes.isEmpty()){
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.properties
Expand Up @@ -127,6 +127,7 @@ security.oid.url=${security.oid.url}
security.oid.redirectUrl=${security.oid.redirectUrl}
security.oid.logoutUrl=${security.oid.logoutUrl}
security.oid.extraScopes=${security.oid.extraScopes}
security.oid.customParams=${security.oid.customParams}
security.db.datasource.driverClassName=${security.db.datasource.driverClassName}
security.db.datasource.url=${security.db.datasource.url}
security.db.datasource.username=${security.db.datasource.username}
Expand Down

0 comments on commit 456c178

Please sign in to comment.