diff --git a/object/token_jwt.go b/object/token_jwt.go index a60fe826..18017a94 100644 --- a/object/token_jwt.go +++ b/object/token_jwt.go @@ -37,56 +37,57 @@ type UserShort struct { } type UserWithoutThirdIdp struct { - Owner string `xorm:"varchar(100) notnull pk" json:"owner"` - Name string `xorm:"varchar(100) notnull pk" json:"name"` - CreatedTime string `xorm:"varchar(100)" json:"createdTime"` - UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` - Id string `xorm:"varchar(100) index" json:"id"` - Type string `xorm:"varchar(100)" json:"type"` - Password string `xorm:"varchar(100)" json:"password"` - PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"` - DisplayName string `xorm:"varchar(100)" json:"displayName"` - FirstName string `xorm:"varchar(100)" json:"firstName"` - LastName string `xorm:"varchar(100)" json:"lastName"` - Avatar string `xorm:"varchar(500)" json:"avatar"` - PermanentAvatar string `xorm:"varchar(500)" json:"permanentAvatar"` - Email string `xorm:"varchar(100) index" json:"email"` - EmailVerified bool `json:"emailVerified"` - Phone string `xorm:"varchar(100) index" json:"phone"` - Location string `xorm:"varchar(100)" json:"location"` - Address []string `json:"address"` - Affiliation string `xorm:"varchar(100)" json:"affiliation"` - Title string `xorm:"varchar(100)" json:"title"` - IdCardType string `xorm:"varchar(100)" json:"idCardType"` - IdCard string `xorm:"varchar(100) index" json:"idCard"` - Homepage string `xorm:"varchar(100)" json:"homepage"` - Bio string `xorm:"varchar(100)" json:"bio"` - Tag string `xorm:"varchar(100)" json:"tag"` - Region string `xorm:"varchar(100)" json:"region"` - Language string `xorm:"varchar(100)" json:"language"` - Gender string `xorm:"varchar(100)" json:"gender"` - Birthday string `xorm:"varchar(100)" json:"birthday"` - Education string `xorm:"varchar(100)" json:"education"` - Score int `json:"score"` - Karma int `json:"karma"` - Ranking int `json:"ranking"` - IsDefaultAvatar bool `json:"isDefaultAvatar"` - IsOnline bool `json:"isOnline"` - IsAdmin bool `json:"isAdmin"` - IsGlobalAdmin bool `json:"isGlobalAdmin"` - IsForbidden bool `json:"isForbidden"` - IsDeleted bool `json:"isDeleted"` - SignupApplication string `xorm:"varchar(100)" json:"signupApplication"` - Hash string `xorm:"varchar(100)" json:"hash"` - PreHash string `xorm:"varchar(100)" json:"preHash"` - CreatedIp string `xorm:"varchar(100)" json:"createdIp"` - LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"` - LastSigninIp string `xorm:"varchar(100)" json:"lastSigninIp"` - Ldap string `xorm:"ldap varchar(100)" json:"ldap"` - Roles []*Role `xorm:"-" json:"roles"` - Permissions []*Permission `xorm:"-" json:"permissions"` - LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"` - SigninWrongTimes int `json:"signinWrongTimes"` + Owner string `xorm:"varchar(100) notnull pk" json:"owner"` + Name string `xorm:"varchar(100) notnull pk" json:"name"` + CreatedTime string `xorm:"varchar(100)" json:"createdTime"` + UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` + Id string `xorm:"varchar(100) index" json:"id"` + Type string `xorm:"varchar(100)" json:"type"` + Password string `xorm:"varchar(100)" json:"password"` + PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"` + DisplayName string `xorm:"varchar(100)" json:"displayName"` + FirstName string `xorm:"varchar(100)" json:"firstName"` + LastName string `xorm:"varchar(100)" json:"lastName"` + Avatar string `xorm:"varchar(500)" json:"avatar"` + PermanentAvatar string `xorm:"varchar(500)" json:"permanentAvatar"` + Email string `xorm:"varchar(100) index" json:"email"` + EmailVerified bool `json:"emailVerified"` + Phone string `xorm:"varchar(100) index" json:"phone"` + Location string `xorm:"varchar(100)" json:"location"` + Address []string `json:"address"` + Affiliation string `xorm:"varchar(100)" json:"affiliation"` + Title string `xorm:"varchar(100)" json:"title"` + IdCardType string `xorm:"varchar(100)" json:"idCardType"` + IdCard string `xorm:"varchar(100) index" json:"idCard"` + Homepage string `xorm:"varchar(100)" json:"homepage"` + Bio string `xorm:"varchar(100)" json:"bio"` + Tag string `xorm:"varchar(100)" json:"tag"` + Region string `xorm:"varchar(100)" json:"region"` + Language string `xorm:"varchar(100)" json:"language"` + Gender string `xorm:"varchar(100)" json:"gender"` + Birthday string `xorm:"varchar(100)" json:"birthday"` + Education string `xorm:"varchar(100)" json:"education"` + Score int `json:"score"` + Karma int `json:"karma"` + Ranking int `json:"ranking"` + IsDefaultAvatar bool `json:"isDefaultAvatar"` + IsOnline bool `json:"isOnline"` + IsAdmin bool `json:"isAdmin"` + IsGlobalAdmin bool `json:"isGlobalAdmin"` + IsForbidden bool `json:"isForbidden"` + IsDeleted bool `json:"isDeleted"` + SignupApplication string `xorm:"varchar(100)" json:"signupApplication"` + Hash string `xorm:"varchar(100)" json:"hash"` + PreHash string `xorm:"varchar(100)" json:"preHash"` + CreatedIp string `xorm:"varchar(100)" json:"createdIp"` + LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"` + LastSigninIp string `xorm:"varchar(100)" json:"lastSigninIp"` + Ldap string `xorm:"ldap varchar(100)" json:"ldap"` + Properties map[string]string `json:"properties"` + Roles []*Role `xorm:"-" json:"roles"` + Permissions []*Permission `xorm:"-" json:"permissions"` + LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"` + SigninWrongTimes int `json:"signinWrongTimes"` } type ClaimsShort struct { @@ -116,54 +117,60 @@ func getShortUser(user *User) *UserShort { func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp { res := &UserWithoutThirdIdp{ - Owner: user.Owner, - Name: user.Name, - CreatedTime: user.CreatedTime, - UpdatedTime: user.UpdatedTime, - Id: user.Id, - Type: user.Type, - Password: user.Password, - PasswordSalt: user.PasswordSalt, - DisplayName: user.DisplayName, - FirstName: user.FirstName, - LastName: user.LastName, - Avatar: user.Avatar, - PermanentAvatar: user.PermanentAvatar, - Email: user.Email, - EmailVerified: user.EmailVerified, - Phone: user.Phone, - Location: user.Location, - Address: user.Address, - Affiliation: user.Affiliation, - Title: user.Title, - IdCardType: user.IdCardType, - IdCard: user.IdCard, - Homepage: user.Homepage, - Bio: user.Bio, - Tag: user.Tag, - Region: user.Region, - Language: user.Language, - Gender: user.Gender, - Birthday: user.Birthday, - Education: user.Education, - Score: user.Score, - Karma: user.Karma, - Ranking: user.Ranking, - IsDefaultAvatar: user.IsDefaultAvatar, - IsOnline: user.IsOnline, - IsAdmin: user.IsAdmin, - IsGlobalAdmin: user.IsGlobalAdmin, - IsForbidden: user.IsForbidden, - IsDeleted: user.IsDeleted, - SignupApplication: user.SignupApplication, - Hash: user.Hash, - PreHash: user.PreHash, - CreatedIp: user.CreatedIp, - LastSigninTime: user.LastSigninTime, - LastSigninIp: user.LastSigninIp, - Ldap: user.Ldap, - Roles: user.Roles, - Permissions: user.Permissions, + Owner: user.Owner, + Name: user.Name, + CreatedTime: user.CreatedTime, + UpdatedTime: user.UpdatedTime, + + Id: user.Id, + Type: user.Type, + Password: user.Password, + PasswordSalt: user.PasswordSalt, + DisplayName: user.DisplayName, + FirstName: user.FirstName, + LastName: user.LastName, + Avatar: user.Avatar, + PermanentAvatar: user.PermanentAvatar, + Email: user.Email, + EmailVerified: user.EmailVerified, + Phone: user.Phone, + Location: user.Location, + Address: user.Address, + Affiliation: user.Affiliation, + Title: user.Title, + IdCardType: user.IdCardType, + IdCard: user.IdCard, + Homepage: user.Homepage, + Bio: user.Bio, + Tag: user.Tag, + Region: user.Region, + Language: user.Language, + Gender: user.Gender, + Birthday: user.Birthday, + Education: user.Education, + Score: user.Score, + Karma: user.Karma, + Ranking: user.Ranking, + IsDefaultAvatar: user.IsDefaultAvatar, + IsOnline: user.IsOnline, + IsAdmin: user.IsAdmin, + IsGlobalAdmin: user.IsGlobalAdmin, + IsForbidden: user.IsForbidden, + IsDeleted: user.IsDeleted, + SignupApplication: user.SignupApplication, + Hash: user.Hash, + PreHash: user.PreHash, + + CreatedIp: user.CreatedIp, + LastSigninTime: user.LastSigninTime, + LastSigninIp: user.LastSigninIp, + + Ldap: user.Ldap, + Properties: user.Properties, + + Roles: user.Roles, + Permissions: user.Permissions, + LastSigninWrongTime: user.LastSigninWrongTime, SigninWrongTimes: user.SigninWrongTimes, }