mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-24 08:20:31 +08:00
Add properties to UserWithoutThirdIdp
This commit is contained in:
Gucheng Wang
parent
087405dad2
commit
75b8357de8
@ -37,56 +37,57 @@ type UserShort struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UserWithoutThirdIdp struct {
|
type UserWithoutThirdIdp struct {
|
||||||
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
||||||
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"`
|
UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"`
|
||||||
Id string `xorm:"varchar(100) index" json:"id"`
|
Id string `xorm:"varchar(100) index" json:"id"`
|
||||||
Type string `xorm:"varchar(100)" json:"type"`
|
Type string `xorm:"varchar(100)" json:"type"`
|
||||||
Password string `xorm:"varchar(100)" json:"password"`
|
Password string `xorm:"varchar(100)" json:"password"`
|
||||||
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
||||||
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
DisplayName string `xorm:"varchar(100)" json:"displayName"`
|
||||||
FirstName string `xorm:"varchar(100)" json:"firstName"`
|
FirstName string `xorm:"varchar(100)" json:"firstName"`
|
||||||
LastName string `xorm:"varchar(100)" json:"lastName"`
|
LastName string `xorm:"varchar(100)" json:"lastName"`
|
||||||
Avatar string `xorm:"varchar(500)" json:"avatar"`
|
Avatar string `xorm:"varchar(500)" json:"avatar"`
|
||||||
PermanentAvatar string `xorm:"varchar(500)" json:"permanentAvatar"`
|
PermanentAvatar string `xorm:"varchar(500)" json:"permanentAvatar"`
|
||||||
Email string `xorm:"varchar(100) index" json:"email"`
|
Email string `xorm:"varchar(100) index" json:"email"`
|
||||||
EmailVerified bool `json:"emailVerified"`
|
EmailVerified bool `json:"emailVerified"`
|
||||||
Phone string `xorm:"varchar(100) index" json:"phone"`
|
Phone string `xorm:"varchar(100) index" json:"phone"`
|
||||||
Location string `xorm:"varchar(100)" json:"location"`
|
Location string `xorm:"varchar(100)" json:"location"`
|
||||||
Address []string `json:"address"`
|
Address []string `json:"address"`
|
||||||
Affiliation string `xorm:"varchar(100)" json:"affiliation"`
|
Affiliation string `xorm:"varchar(100)" json:"affiliation"`
|
||||||
Title string `xorm:"varchar(100)" json:"title"`
|
Title string `xorm:"varchar(100)" json:"title"`
|
||||||
IdCardType string `xorm:"varchar(100)" json:"idCardType"`
|
IdCardType string `xorm:"varchar(100)" json:"idCardType"`
|
||||||
IdCard string `xorm:"varchar(100) index" json:"idCard"`
|
IdCard string `xorm:"varchar(100) index" json:"idCard"`
|
||||||
Homepage string `xorm:"varchar(100)" json:"homepage"`
|
Homepage string `xorm:"varchar(100)" json:"homepage"`
|
||||||
Bio string `xorm:"varchar(100)" json:"bio"`
|
Bio string `xorm:"varchar(100)" json:"bio"`
|
||||||
Tag string `xorm:"varchar(100)" json:"tag"`
|
Tag string `xorm:"varchar(100)" json:"tag"`
|
||||||
Region string `xorm:"varchar(100)" json:"region"`
|
Region string `xorm:"varchar(100)" json:"region"`
|
||||||
Language string `xorm:"varchar(100)" json:"language"`
|
Language string `xorm:"varchar(100)" json:"language"`
|
||||||
Gender string `xorm:"varchar(100)" json:"gender"`
|
Gender string `xorm:"varchar(100)" json:"gender"`
|
||||||
Birthday string `xorm:"varchar(100)" json:"birthday"`
|
Birthday string `xorm:"varchar(100)" json:"birthday"`
|
||||||
Education string `xorm:"varchar(100)" json:"education"`
|
Education string `xorm:"varchar(100)" json:"education"`
|
||||||
Score int `json:"score"`
|
Score int `json:"score"`
|
||||||
Karma int `json:"karma"`
|
Karma int `json:"karma"`
|
||||||
Ranking int `json:"ranking"`
|
Ranking int `json:"ranking"`
|
||||||
IsDefaultAvatar bool `json:"isDefaultAvatar"`
|
IsDefaultAvatar bool `json:"isDefaultAvatar"`
|
||||||
IsOnline bool `json:"isOnline"`
|
IsOnline bool `json:"isOnline"`
|
||||||
IsAdmin bool `json:"isAdmin"`
|
IsAdmin bool `json:"isAdmin"`
|
||||||
IsGlobalAdmin bool `json:"isGlobalAdmin"`
|
IsGlobalAdmin bool `json:"isGlobalAdmin"`
|
||||||
IsForbidden bool `json:"isForbidden"`
|
IsForbidden bool `json:"isForbidden"`
|
||||||
IsDeleted bool `json:"isDeleted"`
|
IsDeleted bool `json:"isDeleted"`
|
||||||
SignupApplication string `xorm:"varchar(100)" json:"signupApplication"`
|
SignupApplication string `xorm:"varchar(100)" json:"signupApplication"`
|
||||||
Hash string `xorm:"varchar(100)" json:"hash"`
|
Hash string `xorm:"varchar(100)" json:"hash"`
|
||||||
PreHash string `xorm:"varchar(100)" json:"preHash"`
|
PreHash string `xorm:"varchar(100)" json:"preHash"`
|
||||||
CreatedIp string `xorm:"varchar(100)" json:"createdIp"`
|
CreatedIp string `xorm:"varchar(100)" json:"createdIp"`
|
||||||
LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"`
|
LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"`
|
||||||
LastSigninIp string `xorm:"varchar(100)" json:"lastSigninIp"`
|
LastSigninIp string `xorm:"varchar(100)" json:"lastSigninIp"`
|
||||||
Ldap string `xorm:"ldap varchar(100)" json:"ldap"`
|
Ldap string `xorm:"ldap varchar(100)" json:"ldap"`
|
||||||
Roles []*Role `xorm:"-" json:"roles"`
|
Properties map[string]string `json:"properties"`
|
||||||
Permissions []*Permission `xorm:"-" json:"permissions"`
|
Roles []*Role `xorm:"-" json:"roles"`
|
||||||
LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"`
|
Permissions []*Permission `xorm:"-" json:"permissions"`
|
||||||
SigninWrongTimes int `json:"signinWrongTimes"`
|
LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"`
|
||||||
|
SigninWrongTimes int `json:"signinWrongTimes"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ClaimsShort struct {
|
type ClaimsShort struct {
|
||||||
@ -116,54 +117,60 @@ func getShortUser(user *User) *UserShort {
|
|||||||
|
|
||||||
func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp {
|
func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp {
|
||||||
res := &UserWithoutThirdIdp{
|
res := &UserWithoutThirdIdp{
|
||||||
Owner: user.Owner,
|
Owner: user.Owner,
|
||||||
Name: user.Name,
|
Name: user.Name,
|
||||||
CreatedTime: user.CreatedTime,
|
CreatedTime: user.CreatedTime,
|
||||||
UpdatedTime: user.UpdatedTime,
|
UpdatedTime: user.UpdatedTime,
|
||||||
Id: user.Id,
|
|
||||||
Type: user.Type,
|
Id: user.Id,
|
||||||
Password: user.Password,
|
Type: user.Type,
|
||||||
PasswordSalt: user.PasswordSalt,
|
Password: user.Password,
|
||||||
DisplayName: user.DisplayName,
|
PasswordSalt: user.PasswordSalt,
|
||||||
FirstName: user.FirstName,
|
DisplayName: user.DisplayName,
|
||||||
LastName: user.LastName,
|
FirstName: user.FirstName,
|
||||||
Avatar: user.Avatar,
|
LastName: user.LastName,
|
||||||
PermanentAvatar: user.PermanentAvatar,
|
Avatar: user.Avatar,
|
||||||
Email: user.Email,
|
PermanentAvatar: user.PermanentAvatar,
|
||||||
EmailVerified: user.EmailVerified,
|
Email: user.Email,
|
||||||
Phone: user.Phone,
|
EmailVerified: user.EmailVerified,
|
||||||
Location: user.Location,
|
Phone: user.Phone,
|
||||||
Address: user.Address,
|
Location: user.Location,
|
||||||
Affiliation: user.Affiliation,
|
Address: user.Address,
|
||||||
Title: user.Title,
|
Affiliation: user.Affiliation,
|
||||||
IdCardType: user.IdCardType,
|
Title: user.Title,
|
||||||
IdCard: user.IdCard,
|
IdCardType: user.IdCardType,
|
||||||
Homepage: user.Homepage,
|
IdCard: user.IdCard,
|
||||||
Bio: user.Bio,
|
Homepage: user.Homepage,
|
||||||
Tag: user.Tag,
|
Bio: user.Bio,
|
||||||
Region: user.Region,
|
Tag: user.Tag,
|
||||||
Language: user.Language,
|
Region: user.Region,
|
||||||
Gender: user.Gender,
|
Language: user.Language,
|
||||||
Birthday: user.Birthday,
|
Gender: user.Gender,
|
||||||
Education: user.Education,
|
Birthday: user.Birthday,
|
||||||
Score: user.Score,
|
Education: user.Education,
|
||||||
Karma: user.Karma,
|
Score: user.Score,
|
||||||
Ranking: user.Ranking,
|
Karma: user.Karma,
|
||||||
IsDefaultAvatar: user.IsDefaultAvatar,
|
Ranking: user.Ranking,
|
||||||
IsOnline: user.IsOnline,
|
IsDefaultAvatar: user.IsDefaultAvatar,
|
||||||
IsAdmin: user.IsAdmin,
|
IsOnline: user.IsOnline,
|
||||||
IsGlobalAdmin: user.IsGlobalAdmin,
|
IsAdmin: user.IsAdmin,
|
||||||
IsForbidden: user.IsForbidden,
|
IsGlobalAdmin: user.IsGlobalAdmin,
|
||||||
IsDeleted: user.IsDeleted,
|
IsForbidden: user.IsForbidden,
|
||||||
SignupApplication: user.SignupApplication,
|
IsDeleted: user.IsDeleted,
|
||||||
Hash: user.Hash,
|
SignupApplication: user.SignupApplication,
|
||||||
PreHash: user.PreHash,
|
Hash: user.Hash,
|
||||||
CreatedIp: user.CreatedIp,
|
PreHash: user.PreHash,
|
||||||
LastSigninTime: user.LastSigninTime,
|
|
||||||
LastSigninIp: user.LastSigninIp,
|
CreatedIp: user.CreatedIp,
|
||||||
Ldap: user.Ldap,
|
LastSigninTime: user.LastSigninTime,
|
||||||
Roles: user.Roles,
|
LastSigninIp: user.LastSigninIp,
|
||||||
Permissions: user.Permissions,
|
|
||||||
|
Ldap: user.Ldap,
|
||||||
|
Properties: user.Properties,
|
||||||
|
|
||||||
|
Roles: user.Roles,
|
||||||
|
Permissions: user.Permissions,
|
||||||
|
|
||||||
LastSigninWrongTime: user.LastSigninWrongTime,
|
LastSigninWrongTime: user.LastSigninWrongTime,
|
||||||
SigninWrongTimes: user.SigninWrongTimes,
|
SigninWrongTimes: user.SigninWrongTimes,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user