1
0
Fork 0
forked from forgejo/forgejo

Vendor Update Go Libs (#13166)

* update github.com/alecthomas/chroma v0.8.0 -> v0.8.1

* github.com/blevesearch/bleve v1.0.10 -> v1.0.12

* editorconfig-core-go v2.1.1 -> v2.3.7

* github.com/gliderlabs/ssh v0.2.2 -> v0.3.1

* migrate editorconfig.ParseBytes to Parse

* github.com/shurcooL/vfsgen to 0d455de96546

* github.com/go-git/go-git/v5 v5.1.0 -> v5.2.0

* github.com/google/uuid v1.1.1 -> v1.1.2

* github.com/huandu/xstrings v1.3.0 -> v1.3.2

* github.com/klauspost/compress v1.10.11 -> v1.11.1

* github.com/markbates/goth v1.61.2 -> v1.65.0

* github.com/mattn/go-sqlite3 v1.14.0 -> v1.14.4

* github.com/mholt/archiver v3.3.0 -> v3.3.2

* github.com/microcosm-cc/bluemonday 4f7140c49acb -> v1.0.4

* github.com/minio/minio-go v7.0.4 -> v7.0.5

* github.com/olivere/elastic v7.0.9 -> v7.0.20

* github.com/urfave/cli v1.20.0 -> v1.22.4

* github.com/prometheus/client_golang v1.1.0 -> v1.8.0

* github.com/xanzy/go-gitlab v0.37.0 -> v0.38.1

* mvdan.cc/xurls v2.1.0 -> v2.2.0

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
6543 2020-10-16 07:06:27 +02:00 committed by GitHub
parent 91f2afdb54
commit 12a1f914f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
656 changed files with 52967 additions and 25229 deletions

View file

@ -4,12 +4,12 @@ package bitbucket
import (
"bytes"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"fmt"
"github.com/markbates/goth"
"golang.org/x/oauth2"
)
@ -107,6 +107,9 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
}
err = userFromReader(bytes.NewReader(bits), &user)
if err != nil {
return user, err
}
response, err = goth.HTTPClientWithFallBack(p.Client()).Get(endpointEmail + "?access_token=" + url.QueryEscape(sess.AccessToken))
if err != nil {

View file

@ -105,6 +105,10 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
}
req, err := http.NewRequest("GET", p.profileURL, nil)
if err != nil {
return user, err
}
req.Header.Add("Authorization", "Bearer "+sess.AccessToken)
response, err := p.Client().Do(req)
if err != nil {
@ -202,8 +206,7 @@ func getPrivateMail(p *Provider, sess *Session) (email string, err error) {
return v.Email, nil
}
}
// can't get primary email - shouldn't be possible
return
return email, fmt.Errorf("The user does not have a verified, primary email address on GitHub")
}
func newConfig(provider *Provider, authURL, tokenURL string, scopes []string) *oauth2.Config {

View file

@ -32,13 +32,13 @@ func New(clientKey, secret, callbackURL string, scopes ...string) *Provider {
// Provider is the implementation of `goth.Provider` for accessing Google.
type Provider struct {
ClientKey string
Secret string
CallbackURL string
HTTPClient *http.Client
config *oauth2.Config
prompt oauth2.AuthCodeOption
providerName string
ClientKey string
Secret string
CallbackURL string
HTTPClient *http.Client
config *oauth2.Config
authCodeOptions []oauth2.AuthCodeOption
providerName string
}
// Name is the name used to retrieve this provider later.
@ -61,11 +61,7 @@ func (p *Provider) Debug(debug bool) {}
// BeginAuth asks Google for an authentication endpoint.
func (p *Provider) BeginAuth(state string) (goth.Session, error) {
var opts []oauth2.AuthCodeOption
if p.prompt != nil {
opts = append(opts, p.prompt)
}
url := p.config.AuthCodeURL(state, opts...)
url := p.config.AuthCodeURL(state, p.authCodeOptions...)
session := &Session{
AuthURL: url,
}
@ -152,12 +148,12 @@ func newConfig(provider *Provider, scopes []string) *oauth2.Config {
return c
}
//RefreshTokenAvailable refresh token is provided by auth provider or not
// RefreshTokenAvailable refresh token is provided by auth provider or not
func (p *Provider) RefreshTokenAvailable() bool {
return true
}
//RefreshToken get new access token based on the refresh token
// RefreshToken get new access token based on the refresh token
func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
token := &oauth2.Token{RefreshToken: refreshToken}
ts := p.config.TokenSource(goth.ContextForClient(p.Client()), token)
@ -176,5 +172,15 @@ func (p *Provider) SetPrompt(prompt ...string) {
if len(prompt) == 0 {
return
}
p.prompt = oauth2.SetAuthURLParam("prompt", strings.Join(prompt, " "))
p.authCodeOptions = append(p.authCodeOptions, oauth2.SetAuthURLParam("prompt", strings.Join(prompt, " ")))
}
// SetHostedDomain sets the hd parameter for google OAuth call.
// Use this to force user to pick user from specific hosted domain.
// See https://developers.google.com/identity/protocols/oauth2/openid-connect#hd-param
func (p *Provider) SetHostedDomain(hd string) {
if hd == "" {
return
}
p.authCodeOptions = append(p.authCodeOptions, oauth2.SetAuthURLParam("hd", hd))
}

View file

@ -120,6 +120,10 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
}
bits, err := ioutil.ReadAll(response.Body)
if err != nil {
return user, err
}
err = json.NewDecoder(bytes.NewReader(bits)).Decode(&user.RawData)
if err != nil {
return user, err

View file

@ -15,11 +15,11 @@ import (
)
const (
authEndpoint string = "https://oauth.yandex.ru/authorize"
tokenEndpoint string = "https://oauth.yandex.com/token"
profileEndpoint string = "https://login.yandex.ru/info"
avatarURL string = "https://avatars.yandex.net/get-yapic"
avatarSize string = "islands-200"
authEndpoint string = "https://oauth.yandex.ru/authorize"
tokenEndpoint string = "https://oauth.yandex.com/token"
profileEndpoint string = "https://login.yandex.ru/info"
avatarURL string = "https://avatars.yandex.net/get-yapic"
avatarSize string = "islands-200"
)
// Provider is the implementation of `goth.Provider` for accessing Yandex.
@ -89,7 +89,7 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
if err != nil {
return user, err
}
req.Header.Set("Authorization", "OAuth " + sess.AccessToken)
req.Header.Set("Authorization", "OAuth "+sess.AccessToken)
resp, err := p.Client().Do(req)
if err != nil {
if resp != nil {
@ -140,14 +140,14 @@ func newConfig(provider *Provider, scopes []string) *oauth2.Config {
func userFromReader(r io.Reader, user *goth.User) error {
u := struct {
UserID string `json:"id"`
Email string `json:"default_email"`
Login string `json:"login"`
Name string `json:"real_name"`
FirstName string `json:"first_name"`
LastName string `json:"last_name"`
AvatarID string `json:"default_avatar_id"`
IsAvatarEmpty bool `json:"is_avatar_empty"`
UserID string `json:"id"`
Email string `json:"default_email"`
Login string `json:"login"`
Name string `json:"real_name"`
FirstName string `json:"first_name"`
LastName string `json:"last_name"`
AvatarID string `json:"default_avatar_id"`
IsAvatarEmpty bool `json:"is_avatar_empty"`
}{}
err := json.NewDecoder(r).Decode(&u)
@ -161,7 +161,7 @@ func userFromReader(r io.Reader, user *goth.User) error {
user.FirstName = u.FirstName
user.LastName = u.LastName
if u.AvatarID != `` {
user.AvatarURL = fmt.Sprintf("%s/%s/%s", avatarURL, u.AvatarID, avatarSize)
user.AvatarURL = fmt.Sprintf("%s/%s/%s", avatarURL, u.AvatarID, avatarSize)
}
return nil
}