Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add missing fields to User #99

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 79 additions & 9 deletions src/main/java/org/casbin/casdoor/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,23 @@ public class User implements Serializable {
public String updatedTime;

public String id;
public String externalId = "";
public String type;
public String password = "";
public String passwordSalt = "";
public String passwordType = "";
public String displayName = "";
public String firstName = "";
public String lastName = "";
public String avatar = "";
public String avatarType = "";
public String permanentAvatar = "";
public String email;
@JsonProperty("emailVerified")
public boolean emailVerified = false;
public String phone = "";
public String countryCode = "";
public String region = "";
public String location = "";
public String[] address;
public String affiliation = "";
Expand All @@ -56,7 +61,6 @@ public class User implements Serializable {
public String homepage = "";
public String bio = "";
public String tag = "";
public String region = "";
public String language;
public String gender = "";
public String birthday = "";
Expand All @@ -79,10 +83,12 @@ public class User implements Serializable {
public String signupApplication;
public String hash = "";
public String preHash = "";
public String accessKey = "";
public String accessSecret = "";

public String createdIp = "";
public String lastSigninTime = "";
public String lastSigninIp = "";
public String lastSigninTime = "";
public String lastSigninIp = "";

public String github = "";
public String google = "";
Expand All @@ -108,11 +114,75 @@ public class User implements Serializable {
public String bilibili = "";
public String okta = "";
public String douyin = "";
public String line = "";
public String amazon = "";
public String auth0 = "";
public String battleNet = "";
public String bitbucket = "";
public String box = "";
public String cloudFoundry = "";
public String dailymotion = "";
public String deezer = "";
public String digitalOcean = "";
public String discord = "";
public String dropbox = "";
public String eveOnline = "";
public String fitbit = "";
public String gitea = "";
public String heroku = "";
public String influxCloud = "";
public String instagram = "";
public String intercom = "";
public String kakao = "";
public String lastfm = "";
public String mailru = "";
public String meetup = "";
public String microsoftOnline = "";
public String naver = "";
public String nextcloud = "";
public String oneDrive = "";
public String oura = "";
public String patreon = "";
public String paypal = "";
public String salesForce = "";
public String shopify = "";
public String soundcloud = "";
public String spotify = "";
public String strava = "";
public String stripe = "";
public String tikTok = "";
public String tumblr = "";
public String twitch = "";
public String twitter = "";
public String typetalk = "";
public String uber = "";
public String vK = "";
public String wepay = "";
public String xero = "";
public String yahoo = "";
public String yammer = "";
public String yandex = "";
public String zoom = "";
public String metaMask = "";
public String web3Onboard = "";
public String custom = "";

public String preferredMfaType = "";
public List<String> recoveryCodes;
public String totpSecret = "";
public boolean mfaPhoneEnabled;
public boolean mfaEmailEnabled;

public String ldap = "";
public Map<String, String> properties;

public List<Role> roles;
public List<Permission> permissions;
public List<String> groups;

public String lastSigninWrongTime = "";
public int signinWrongTimes;


@JsonGetter("isOnline")
public boolean isOnline() {
Expand Down Expand Up @@ -156,32 +226,32 @@ public void setForbidden(boolean forbidden) {

@JsonGetter("isEmailVerified")
public boolean isEmailVerified() {
return emailVerified;
return emailVerified;
}

@JsonSetter("setEmailVerified")
public void setEmailVerified(boolean emailVerified) {
this.emailVerified = emailVerified;
this.emailVerified = emailVerified;
}

@JsonGetter("isDefaultAvatar")
public boolean isDefaultAvatar() {
return isDefaultAvatar;
return isDefaultAvatar;
}

@JsonSetter("setDefaultAvatar")
public void setDefaultAvatar(boolean isDefaultAvatar) {
this.isDefaultAvatar = isDefaultAvatar;
this.isDefaultAvatar = isDefaultAvatar;
}

@JsonGetter("isDeleted")
public boolean isDeleted() {
return isDeleted;
return isDeleted;
}

@JsonSetter("setDeleted")
public void setDeleted(boolean isDeleted) {
this.isDeleted = isDeleted;
this.isDeleted = isDeleted;
}

public User() {
Expand Down
Loading