-
Type:
Improvement
-
Status: Closed (View Workflow)
-
Priority:
Minor
-
Resolution: Fixed
-
Affects Version/s: None
-
Fix Version/s: 10.1
-
Component/s: REST, LDAP, oAuth2, OpenID, Shibboleth Adapter
-
Labels:None
-
Funded by:
The deprecated method UserManager.getInstance().findUserByEmail(email) is used in ShibbolethRegistrationController. This patch fixes that:
diff -r ef5c3a6b58e6 src/main/java/org/olat/shibboleth/ShibbolethRegistrationController.java --- a/src/main/java/org/olat/shibboleth/ShibbolethRegistrationController.java Tue Dec 16 12:49:53 2014 +0100 +++ b/src/main/java/org/olat/shibboleth/ShibbolethRegistrationController.java Wed Dec 17 09:53:44 2014 +0100 @@ -331,7 +337,11 @@ email = ShibbolethHelper.getFirstValueOf(ShibbolethModule.getEMail(), shibbolethAttributesMap); } - User user = UserManager.getInstance().findUserByEmail(email); + User user = null; + Identity id = UserManager.getInstance().findIdentityByEmail(email); + if (id != null) { + user = id.getUser(); + } if (user != null) { // error, email already exists. should actually not happen if OLAT Authenticator has
