diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java index 82f64b01b..1056d8e61 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java @@ -47,7 +47,7 @@ public class DefaultUserInfo implements UserInfo { private String picture; private String website; private String email; - private Boolean verified; + private Boolean emailVerified; private String gender; private String zoneinfo; private String locale; @@ -212,15 +212,15 @@ public class DefaultUserInfo implements UserInfo { */ @Override @Basic - public Boolean getVerified() { - return verified; + public Boolean getEmailVerified() { + return emailVerified; } /* (non-Javadoc) * @see org.mitre.openid.connect.model.UserInfo#setVerified(java.lang.Boolean) */ @Override - public void setVerified(Boolean verified) { - this.verified = verified; + public void setEmailVerified(Boolean emailVerified) { + this.emailVerified = emailVerified; } /* (non-Javadoc) * @see org.mitre.openid.connect.model.UserInfo#getGender() diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java index 559144148..af3f58999 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java @@ -126,12 +126,12 @@ public interface UserInfo { * @return the verified */ @Basic - public abstract Boolean getVerified(); + public abstract Boolean getEmailVerified(); /** * @param verified the verified to set */ - public abstract void setVerified(Boolean verified); + public abstract void setEmailVerified(Boolean emailVerified); /** * @return the gender diff --git a/openid-connect-server/db/tables/userinfo.sql b/openid-connect-server/db/tables/userinfo.sql index 20b372a86..373169080 100644 --- a/openid-connect-server/db/tables/userinfo.sql +++ b/openid-connect-server/db/tables/userinfo.sql @@ -10,7 +10,7 @@ CREATE TABLE userinfo ( picture VARCHAR(256), website VARCHAR(256), email VARCHAR(256), - verified BOOLEAN, + emailVerified BOOLEAN, gender VARCHAR(256), zoneinfo VARCHAR(256), locale VARCHAR(256), diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java index 9f69e3e12..a5c9df119 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java @@ -93,7 +93,7 @@ public class JSONUserInfoView extends AbstractView{ if (scope.contains("email")) { obj.addProperty("email", ui.getEmail()); - obj.addProperty("verified", ui.getVerified()); + obj.addProperty("email_verified", ui.getEmailVerified()); } if (scope.contains("phone")) {