llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve UserInfo.

Browse Source
This commit is contained in:
Yang Luo
2021-05-31 00:55:29 +08:00
parent 0960578c35
commit 95cda41732
5 changed files with 143 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
idp/github.go
View File

@ -19,7 +19,7 @@ import (
"encoding/json"
"io/ioutil"
"net/http"
"sync"
"strconv"
"time"
"golang.org/x/oauth2"
@ -65,42 +65,6 @@ func (idp *GithubIdProvider) GetToken(code string) (*oauth2.Token, error) {
return idp.Config.Exchange(ctx, code)
}
func (idp *GithubIdProvider) getEmail(token *oauth2.Token) string {
res := ""
type GithubEmail struct {
Email string `json:"email"`
Primary bool `json:"primary"`
Verified bool `json:"verified"`
Visibility string `json:"visibility"`
}
var githubEmails []GithubEmail
req, err := http.NewRequest("GET", "https://api.github.com/user/emails", nil)
if err != nil {
panic(err)
}
req.Header.Add("Authorization", "token "+token.AccessToken)
response, err := idp.Client.Do(req)
if err != nil {
panic(err)
}
defer response.Body.Close()
contents, err := ioutil.ReadAll(response.Body)
err = json.Unmarshal(contents, &githubEmails)
if err != nil {
panic(err)
}
for _, v := range githubEmails {
if v.Primary == true {
res = v.Email
break
}
}
return res
}
//{
// "login": "jimgreen",
// "id": 3781234,
@ -195,9 +159,7 @@ type GitHubUserInfo struct {
} `json:"plan"`
}
func (idp *GithubIdProvider) getLoginAndAvatar(token *oauth2.Token) (string, string) {
var githubUserInfo GitHubUserInfo
func (idp *GithubIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
req, err := http.NewRequest("GET", "https://api.github.com/user", nil)
if err != nil {
panic(err)
@ -205,38 +167,28 @@ func (idp *GithubIdProvider) getLoginAndAvatar(token *oauth2.Token) (string, str
req.Header.Add("Authorization", "token "+token.AccessToken)
resp, err := idp.Client.Do(req)
if err != nil {
panic(err)
return nil, err
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
panic(err)
return nil, err
}
var githubUserInfo GitHubUserInfo
err = json.Unmarshal(body, &githubUserInfo)
if err != nil {
panic(err)
return nil, err
}
return githubUserInfo.Login, githubUserInfo.AvatarUrl
}
func (idp *GithubIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
userInfo := &UserInfo{}
var wg sync.WaitGroup
wg.Add(2)
go func() {
userInfo.Email = idp.getEmail(token)
wg.Done()
}()
go func() {
userInfo.Username, userInfo.AvatarUrl = idp.getLoginAndAvatar(token)
wg.Done()
}()
wg.Wait()
return userInfo, nil
userInfo := UserInfo{
Id: strconv.Itoa(githubUserInfo.Id),
Username: githubUserInfo.Login,
DisplayName: githubUserInfo.Name,
Email: githubUserInfo.Email,
AvatarUrl: githubUserInfo.AvatarUrl,
}
return &userInfo, nil
}