hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix checkstyle errors

Browse Source
This commit is contained in:
Hardy Pottinger
2022-01-24 12:35:44 -06:00
parent 7c944d5eb5
commit e504597ee2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
View File

@@ -20,7 +20,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -138,7 +137,8 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
return ePerson.canLogIn() ? logInEPerson(context, ePerson) : BAD_ARGS; return ePerson.canLogIn() ? logInEPerson(context, ePerson) : BAD_ARGS;
} }
LOGGER.warn("Self registration is currently disabled for OIDC, and no ePerson could be found for email: {}", email); LOGGER.warn("Self registration is currently disabled for OIDC, and no ePerson could be found for email: {}",
email);
return canSelfRegister() ? registerNewEPerson(context, userInfo, email) : NO_SUCH_USER; return canSelfRegister() ? registerNewEPerson(context, userInfo, email) : NO_SUCH_USER;
} }
@@ -155,13 +155,15 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
new String[] { new String[] {
"openid", "email", "profile" "openid", "email", "profile"
}; };
String scopes = String.join(" ", configurationService.getArrayProperty("authentication-oidc.scopes", defaultScopes)); String scopes = String.join(" ", configurationService.getArrayProperty("authentication-oidc.scopes",
defaultScopes));
if (isAnyBlank(authorizeUrl, clientId, redirectUri, clientSecret, tokenUrl, userInfoUrl)) { if (isAnyBlank(authorizeUrl, clientId, redirectUri, clientSecret, tokenUrl, userInfoUrl)) {
LOGGER.error("Missing mandatory configuration properties for OidcAuthenticationBean"); LOGGER.error("Missing mandatory configuration properties for OidcAuthenticationBean");
// prepare a Map of the properties which can not have sane defaults, but are still required // prepare a Map of the properties which can not have sane defaults, but are still required
final Map<String, String> map = Map.of("authorizeUrl", authorizeUrl, "clientId", clientId, "redirectUri", redirectUri, "clientSecret", clientSecret, "tokenUrl", tokenUrl, "userInfoUrl", userInfoUrl); final Map<String, String> map = Map.of("authorizeUrl", authorizeUrl, "clientId", clientId, "redirectUri",
redirectUri, "clientSecret", clientSecret, "tokenUrl", tokenUrl, "userInfoUrl", userInfoUrl);
final Iterator<Entry<String, String>> iterator = map.entrySet().iterator(); final Iterator<Entry<String, String>> iterator = map.entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {