Skip to content

The Unified and Autonomous Development Platform

Fix issue #970 - OIDC : Can't configure with LemonLDAP::NG

Robin Shen8674172da95e
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index c60100b3a5..a309682806 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.apache.shiro.authc.AuthenticationException;
@@ -204,15 +205,18 @@ public class OpenIdConnector extends SsoConnector {
}
}
+ @Nullable
private String getStringValue(Object jsonValue) {
if (jsonValue instanceof String) {
return (String) jsonValue;
- } else {
- JSONArray emailArray = (JSONArray) jsonValue;
- if (!emailArray.isEmpty())
- return (String) emailArray.iterator().next();
+ } else if (jsonValue instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) jsonValue;
+ if (!jsonArray.isEmpty())
+ return (String) jsonArray.iterator().next();
else
return null;
+ } else {
+ return null;
}
}