diff --git a/src/main/java/org/casbin/casdoor/entity/User.java b/src/main/java/org/casbin/casdoor/entity/User.java index dd76af5..7aa9464 100644 --- a/src/main/java/org/casbin/casdoor/entity/User.java +++ b/src/main/java/org/casbin/casdoor/entity/User.java @@ -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 = ""; @@ -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 = ""; @@ -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 = ""; @@ -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 recoveryCodes; + public String totpSecret = ""; + public boolean mfaPhoneEnabled; + public boolean mfaEmailEnabled; + public String ldap = ""; public Map properties; + public List roles; public List permissions; + public List groups; + + public String lastSigninWrongTime = ""; + public int signinWrongTimes; + @JsonGetter("isOnline") public boolean isOnline() { @@ -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() {