colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into yuxiang-gao-gitee-oauth

This commit is contained in:
Gani Georgiev 2022-12-31 15:00:19 +02:00
parent 6f3241399c 0439af458f
commit a7aa3da67e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/auth/github.go
View File

@ -64,8 +64,8 @@ func (p *Github) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
AccessToken: token.AccessToken, AccessToken: token.AccessToken,
} }
// in case user set "Keep my email address private", // in case user has set "Keep my email address private", send an
// email should be retrieved via extra API request // **optional** API request to retrieve the verified primary email
if user.Email == "" { if user.Email == "" {
client := p.Client(token) client := p.Client(token)
@ -75,6 +75,12 @@ func (p *Github) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
} }
defer response.Body.Close() defer response.Body.Close()
// ignore not found errors caused by unsufficient scope permissions
// (the email field is optional, return the auth user without it)
if response.StatusCode == 404 {
return user, nil
}
content, err := io.ReadAll(response.Body) content, err := io.ReadAll(response.Body)
if err != nil { if err != nil {
return user, err return user, err