llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Revert "feat: fix OIDC address field" (#3020)

Browse Source 
This reverts commit 2f48d457730ece630405b555ec9253333648df3a.
This commit is contained in:
Eric Luo 2024-06-25 16:14:26 +08:00 committed by GitHub
parent 2f48d45773
commit 4cb8e4a514
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 60 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
object/token_jwt.go
View File

@ -50,48 +50,48 @@ type UserWithoutThirdIdp struct {
UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"`
DeletedTime string `xorm:"varchar(100)" json:"deletedTime"` DeletedTime string `xorm:"varchar(100)" json:"deletedTime"`
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(150)" json:"password"` Password string `xorm:"varchar(150)" json:"password"`
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"` PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
PasswordType string `xorm:"varchar(100)" json:"passwordType"` PasswordType string `xorm:"varchar(100)" json:"passwordType"`
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"`
AvatarType string `xorm:"varchar(100)" json:"avatarType"` AvatarType string `xorm:"varchar(100)" json:"avatarType"`
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"`
CountryCode string `xorm:"varchar(6)" json:"countryCode"` CountryCode string `xorm:"varchar(6)" json:"countryCode"`
Region string `xorm:"varchar(100)" json:"region"` Region string `xorm:"varchar(100)" json:"region"`
Location string `xorm:"varchar(100)" json:"location"` Location string `xorm:"varchar(100)" json:"location"`
Address Address `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"`
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"`
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"`
AccessKey string `xorm:"varchar(100)" json:"accessKey"` AccessKey string `xorm:"varchar(100)" json:"accessKey"`
AccessSecret string `xorm:"varchar(100)" json:"accessSecret"` AccessSecret string `xorm:"varchar(100)" json:"accessSecret"`
GitHub string `xorm:"github varchar(100)" json:"github"` GitHub string `xorm:"github varchar(100)" json:"github"`
Google string `xorm:"varchar(100)" json:"google"` Google string `xorm:"varchar(100)" json:"google"`
@ -148,15 +148,6 @@ type ClaimsWithoutThirdIdp struct {
jwt.RegisteredClaims jwt.RegisteredClaims
} }
type Address struct {
Formatted string `json:"formatted"`
StreetAddress string `json:"street_address"`
Locality string `json:"locality"`
Region string `json:"region"`
PostalCode string `json:"postal_code"`
Country string `json:"country"`
}
func getShortUser(user *User) *UserShort { func getShortUser(user *User) *UserShort {
res := &UserShort{ res := &UserShort{
Owner: user.Owner, Owner: user.Owner,
@ -171,13 +162,6 @@ func getShortUser(user *User) *UserShort {
return res return res
} }
func getStreetAddress(user *User) string {
if len(user.Address) > 0 {
return user.Address[0]
}
return ""
}
func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp { func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp {
res := &UserWithoutThirdIdp{ res := &UserWithoutThirdIdp{
Owner: user.Owner, Owner: user.Owner,
@ -186,31 +170,24 @@ func getUserWithoutThirdIdp(user *User) *UserWithoutThirdIdp {
UpdatedTime: user.UpdatedTime, UpdatedTime: user.UpdatedTime,
DeletedTime: user.DeletedTime, DeletedTime: user.DeletedTime,
Id: user.Id, Id: user.Id,
Type: user.Type, Type: user.Type,
Password: user.Password, Password: user.Password,
PasswordSalt: user.PasswordSalt, PasswordSalt: user.PasswordSalt,
PasswordType: user.PasswordType, PasswordType: user.PasswordType,
DisplayName: user.DisplayName, DisplayName: user.DisplayName,
FirstName: user.FirstName, FirstName: user.FirstName,
LastName: user.LastName, LastName: user.LastName,
Avatar: user.Avatar, Avatar: user.Avatar,
AvatarType: user.AvatarType, AvatarType: user.AvatarType,
PermanentAvatar: user.PermanentAvatar, PermanentAvatar: user.PermanentAvatar,
Email: user.Email, Email: user.Email,
EmailVerified: user.EmailVerified, EmailVerified: user.EmailVerified,
Phone: user.Phone, Phone: user.Phone,
CountryCode: user.CountryCode, CountryCode: user.CountryCode,
Region: user.Region, Region: user.Region,
Location: user.Location, Location: user.Location,
Address: Address{ Address: user.Address,
Formatted: "",
StreetAddress: getStreetAddress(user),
Locality: "",
Region: "",
PostalCode: "",
Country: "",
},
Affiliation: user.Affiliation, Affiliation: user.Affiliation,
Title: user.Title, Title: user.Title,
IdCardType: user.IdCardType, IdCardType: user.IdCardType,