patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to use simpler avatar url property.

Browse source
This commit is contained in:
flash 2024-11-22 21:43:16 +00:00
parent 1e8940c65d
commit 82b6bc8cfd
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/auth/source/oauth2/flashii/flashii.go
View file

@ -125,17 +125,12 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
} }
func userFromReader(reader io.Reader, user *goth.User) error { func userFromReader(reader io.Reader, user *goth.User) error {
type FlashiiUserAvatarRes struct {
Resolution int32 `json:"res"`
URL string `json:"url"`
}
u := struct { u := struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Email string `json:"email"` Email string `json:"email"`
Title string `json:"title"` Title string `json:"title"`
AvatarURLs []FlashiiUserAvatarRes `json:"avatar_urls"` AvatarURL string `json:"avatar_url"`
}{} }{}
err := json.NewDecoder(reader).Decode(&u) err := json.NewDecoder(reader).Decode(&u)
@ -147,7 +142,7 @@ func userFromReader(reader io.Reader, user *goth.User) error {
user.NickName = u.Name user.NickName = u.Name
user.Email = u.Email user.Email = u.Email
user.Description = u.Title user.Description = u.Title
user.AvatarURL = u.AvatarURLs[0].URL user.AvatarURL = u.AvatarURL
return err return err
} }