Revision 49896
Added by Sofia Baltzi over 6 years ago
| modules/uoa-user-management/trunk/src/main/java/eu/dnetlib/openaire/user/security/JWTGenerator.java | ||
|---|---|---|
| 49 | 49 |
|
| 50 | 50 |
if (authOIDC.getUserInfo().getGivenName() == null){
|
| 51 | 51 |
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have first name");
|
| 52 |
claims.put("firstname", URLEncoder.encode(" ", "UTF-8") + "");
|
|
| 52 |
claims.put("firstname", URLEncoder.encode("", "UTF-8") + "");
|
|
| 53 | 53 |
} else {
|
| 54 | 54 |
claims.put("firstname", URLEncoder.encode(authOIDC.getUserInfo().getGivenName(), "UTF-8") + "");
|
| 55 | 55 |
|
| 56 | 56 |
} |
| 57 | 57 |
if (authOIDC.getUserInfo().getFamilyName() == null){
|
| 58 | 58 |
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have first name");
|
| 59 |
claims.put("lastname", URLEncoder.encode(" ", "UTF-8") + "");
|
|
| 59 |
claims.put("lastname", URLEncoder.encode("", "UTF-8") + "");
|
|
| 60 | 60 |
} else {
|
| 61 | 61 |
claims.put("lastname", URLEncoder.encode(authOIDC.getUserInfo().getFamilyName(), "UTF-8") + "");
|
| 62 | 62 |
|
| ... | ... | |
| 71 | 71 |
|
| 72 | 72 |
if (userInfo.getAsJsonArray("edu_person_entitlements") == null){
|
| 73 | 73 |
logger.info("User: " + authOIDC.getUserInfo().getName() + "doesn't have role");
|
| 74 |
claims.put("role", URLEncoder.encode(" ", "UTF-8") + "");
|
|
| 74 |
claims.put("role", URLEncoder.encode("", "UTF-8") + "");
|
|
| 75 | 75 |
} else {
|
| 76 | 76 |
claims.put("role", URLEncoder.encode(userInfo.getAsJsonArray("edu_person_entitlements").toString(), "UTF-8") + "");
|
| 77 | 77 |
} |
Also available in: Unified diff
Update JWTGenerator.java with error checking about null fields