github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Addresses issue 910 by replacing update_time with update_at for JSON 

objects.
pull/908/merge
John Brooks 2015-09-22 21:27:19 -04:00 committed by Justin Richer
parent 31ea96ce27
commit 719a714735
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
View File

@ -417,7 +417,6 @@ public class DefaultUserInfo implements UserInfo {
@Override @Override
public JsonObject toJson() { public JsonObject toJson() {
if (src == null) { if (src == null) {
JsonObject obj = new JsonObject(); JsonObject obj = new JsonObject();
@ -436,7 +435,7 @@ public class DefaultUserInfo implements UserInfo {
obj.addProperty("gender", this.getGender()); obj.addProperty("gender", this.getGender());
obj.addProperty("zone_info", this.getZoneinfo()); obj.addProperty("zone_info", this.getZoneinfo());
obj.addProperty("locale", this.getLocale()); obj.addProperty("locale", this.getLocale());
obj.addProperty("updated_time", this.getUpdatedTime()); obj.addProperty("updated_at", this.getUpdatedTime());
obj.addProperty("birthdate", this.getBirthdate()); obj.addProperty("birthdate", this.getBirthdate());
obj.addProperty("email", this.getEmail()); obj.addProperty("email", this.getEmail());
@ -488,15 +487,12 @@ public class DefaultUserInfo implements UserInfo {
ui.setGender(nullSafeGetString(obj, "gender")); ui.setGender(nullSafeGetString(obj, "gender"));
ui.setZoneinfo(nullSafeGetString(obj, "zone_info")); ui.setZoneinfo(nullSafeGetString(obj, "zone_info"));
ui.setLocale(nullSafeGetString(obj, "locale")); ui.setLocale(nullSafeGetString(obj, "locale"));
ui.setUpdatedTime(nullSafeGetString(obj, "updated_time")); ui.setUpdatedTime(nullSafeGetString(obj, "updated_at"));
ui.setBirthdate(nullSafeGetString(obj, "birthdate")); ui.setBirthdate(nullSafeGetString(obj, "birthdate"));
ui.setEmail(nullSafeGetString(obj, "email")); ui.setEmail(nullSafeGetString(obj, "email"));
ui.setEmailVerified(obj.has("email_verified") && obj.get("email_verified").isJsonPrimitive() ? obj.get("email_verified").getAsBoolean() : null); ui.setEmailVerified(obj.has("email_verified") && obj.get("email_verified").isJsonPrimitive() ? obj.get("email_verified").getAsBoolean() : null);
ui.setPhoneNumber(nullSafeGetString(obj, "phone_number"));
ui.setPhoneNumberVerified(obj.has("phone_number_verified") && obj.get("phone_number_verified").isJsonPrimitive() ? obj.get("phone_number_verified").getAsBoolean() : null);
if (obj.has("address") && obj.get("address").isJsonObject()) { if (obj.has("address") && obj.get("address").isJsonObject()) {
JsonObject addr = obj.get("address").getAsJsonObject(); JsonObject addr = obj.get("address").getAsJsonObject();
ui.setAddress(new Address()); ui.setAddress(new Address());