Skip to content
Snippets Groups Projects
Commit 9f7d0d64 authored by Mike McKay's avatar Mike McKay
Browse files

Added support for a bunch of new user REST calls to support the UI Will designed.

parent 85195603
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,8 @@ public class User { ...@@ -33,6 +33,8 @@ public class User {
_salt = ""; _salt = "";
_lastModified = null; _lastModified = null;
_authorization = null; _authorization = null;
_isEnabled = user.isEnabled();
_isVerified = user.isVerified();
} }
public User(final XdatUser user) { public User(final XdatUser user) {
...@@ -119,6 +121,32 @@ public class User { ...@@ -119,6 +121,32 @@ public class User {
_isAdmin = isAdmin; _isAdmin = isAdmin;
} }
/**
* Whether the user is enabled.
**/
@ApiModelProperty(value = "Whether the user is enabled.")
@JsonProperty("enabled")
public boolean isEnabled() {
return _isEnabled;
}
public void setEnabled(final boolean isEnabled) {
_isEnabled = isEnabled;
}
/**
* Whether the user is verified.
**/
@ApiModelProperty(value = "Whether the user is verified.")
@JsonProperty("verified")
public boolean isVerified() {
return _isVerified;
}
public void setVerified(final boolean isVerified) {
_isVerified = isVerified;
}
/** /**
* The user's primary database (deprecated). * The user's primary database (deprecated).
**/ **/
...@@ -243,4 +271,6 @@ public class User { ...@@ -243,4 +271,6 @@ public class User {
private String _salt = null; private String _salt = null;
private Date _lastModified = null; private Date _lastModified = null;
private UserAuth _authorization = null; private UserAuth _authorization = null;
private boolean _isEnabled;
private boolean _isVerified;
} }
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment