MaDgIK
/
dnet-openaire-users
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove comment from email in JWT generator

This commit is contained in:
Sofia Baltzi 2018-05-22 09:44:41 +00:00
parent a0c1c2cee1
commit e18e1fa680
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/dnetlib/openaire/usermanagement/security/JWTGenerator.java
View File

@ -50,20 +50,16 @@ public class JWTGenerator {
if (authOIDC.getUserInfo().getGivenName() == null){
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have first name");
claims.put("firstname", URLEncoder.encode(" ", "UTF-8") + "");
// claims.put("firstname", "");
} else {
claims.put("firstname", URLEncoder.encode(authOIDC.getUserInfo().getGivenName(), "UTF-8") + "");
}
if (authOIDC.getUserInfo().getFamilyName() == null){
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have first name");
claims.put("lastname", URLEncoder.encode(" ", "UTF-8") + "");
// claims.put("lastname", "");
} else {
claims.put("lastname", URLEncoder.encode(authOIDC.getUserInfo().getFamilyName(), "UTF-8") + "");
}
// claims.put("email", authOIDC.getUserInfo().getEmail() + "");
claims.put("role", URLEncoder.encode(userInfo.getAsJsonArray("edu_person_entitlements").toString(), "UTF-8") + "");
//
claims.put("email", authOIDC.getUserInfo().getEmail() + "");
// if (userInfo.getAsJsonArray("eduPersonScopedAffiliation").toString() != null) {
// claims.put("role", URLEncoder.encode(userInfo.getAsJsonArray("edu_person_scoped_affiliations").toString(), "UTF-8") + "");
@ -72,7 +68,6 @@ public class JWTGenerator {
if (userInfo.getAsJsonArray("edu_person_entitlements") == null){
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have role");
claims.put("role", URLEncoder.encode(" ", "UTF-8") + "");
// claims.put("role", "");
} else {
claims.put("role", URLEncoder.encode(userInfo.getAsJsonArray("edu_person_entitlements").toString(), "UTF-8") + "");
}