mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 08:42:27 -05:00 
			
		
		
		
	[chore]: Bump golang.org/x/oauth2 from 0.4.0 to 0.5.0 (#1564)
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/golang/oauth2/releases) - [Commits](https://github.com/golang/oauth2/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								752c38b0d5
							
						
					
				
			
			
				commit
				
					
						5a45b6ec6a
					
				
			
		
					 5 changed files with 5 additions and 79 deletions
				
			
		
							
								
								
									
										2
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
										
									
									
									
								
							|  | @ -56,7 +56,7 @@ require ( | ||||||
| 	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d | 	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d | ||||||
| 	golang.org/x/image v0.5.0 | 	golang.org/x/image v0.5.0 | ||||||
| 	golang.org/x/net v0.7.0 | 	golang.org/x/net v0.7.0 | ||||||
| 	golang.org/x/oauth2 v0.4.0 | 	golang.org/x/oauth2 v0.5.0 | ||||||
| 	golang.org/x/text v0.7.0 | 	golang.org/x/text v0.7.0 | ||||||
| 	gopkg.in/mcuadros/go-syslog.v2 v2.3.0 | 	gopkg.in/mcuadros/go-syslog.v2 v2.3.0 | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 | 	gopkg.in/yaml.v3 v3.0.1 | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								go.sum
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
										
									
									
									
								
							|  | @ -762,8 +762,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ | ||||||
| golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= | golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= | ||||||
| golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= | golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= | ||||||
| golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= | golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= | ||||||
| golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M= | golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= | ||||||
| golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= | golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= | ||||||
| golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
|  |  | ||||||
							
								
								
									
										71
									
								
								vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										71
									
								
								vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -1,71 +0,0 @@ | ||||||
| // Copyright 2016 The Go Authors. All rights reserved. |  | ||||||
| // Use of this source code is governed by a BSD-style |  | ||||||
| // license that can be found in the LICENSE file. |  | ||||||
| 
 |  | ||||||
| // Package ctxhttp provides helper functions for performing context-aware HTTP requests. |  | ||||||
| package ctxhttp // import "golang.org/x/net/context/ctxhttp" |  | ||||||
| 
 |  | ||||||
| import ( |  | ||||||
| 	"context" |  | ||||||
| 	"io" |  | ||||||
| 	"net/http" |  | ||||||
| 	"net/url" |  | ||||||
| 	"strings" |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| // Do sends an HTTP request with the provided http.Client and returns |  | ||||||
| // an HTTP response. |  | ||||||
| // |  | ||||||
| // If the client is nil, http.DefaultClient is used. |  | ||||||
| // |  | ||||||
| // The provided ctx must be non-nil. If it is canceled or times out, |  | ||||||
| // ctx.Err() will be returned. |  | ||||||
| func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) { |  | ||||||
| 	if client == nil { |  | ||||||
| 		client = http.DefaultClient |  | ||||||
| 	} |  | ||||||
| 	resp, err := client.Do(req.WithContext(ctx)) |  | ||||||
| 	// If we got an error, and the context has been canceled, |  | ||||||
| 	// the context's error is probably more useful. |  | ||||||
| 	if err != nil { |  | ||||||
| 		select { |  | ||||||
| 		case <-ctx.Done(): |  | ||||||
| 			err = ctx.Err() |  | ||||||
| 		default: |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| 	return resp, err |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // Get issues a GET request via the Do function. |  | ||||||
| func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) { |  | ||||||
| 	req, err := http.NewRequest("GET", url, nil) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
| 	return Do(ctx, client, req) |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // Head issues a HEAD request via the Do function. |  | ||||||
| func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) { |  | ||||||
| 	req, err := http.NewRequest("HEAD", url, nil) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
| 	return Do(ctx, client, req) |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // Post issues a POST request via the Do function. |  | ||||||
| func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) { |  | ||||||
| 	req, err := http.NewRequest("POST", url, body) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
| 	req.Header.Set("Content-Type", bodyType) |  | ||||||
| 	return Do(ctx, client, req) |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // PostForm issues a POST request via the Do function. |  | ||||||
| func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) { |  | ||||||
| 	return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode())) |  | ||||||
| } |  | ||||||
							
								
								
									
										4
									
								
								vendor/golang.org/x/oauth2/internal/token.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/golang.org/x/oauth2/internal/token.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -19,8 +19,6 @@ import ( | ||||||
| 	"strings" | 	"strings" | ||||||
| 	"sync" | 	"sync" | ||||||
| 	"time" | 	"time" | ||||||
| 
 |  | ||||||
| 	"golang.org/x/net/context/ctxhttp" |  | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Token represents the credentials used to authorize | // Token represents the credentials used to authorize | ||||||
|  | @ -229,7 +227,7 @@ func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string, | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) { | func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) { | ||||||
| 	r, err := ctxhttp.Do(ctx, ContextClient(ctx), req) | 	r, err := ContextClient(ctx).Do(req.WithContext(ctx)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -776,7 +776,6 @@ golang.org/x/mod/semver | ||||||
| ## explicit; go 1.17 | ## explicit; go 1.17 | ||||||
| golang.org/x/net/bpf | golang.org/x/net/bpf | ||||||
| golang.org/x/net/context | golang.org/x/net/context | ||||||
| golang.org/x/net/context/ctxhttp |  | ||||||
| golang.org/x/net/html | golang.org/x/net/html | ||||||
| golang.org/x/net/html/atom | golang.org/x/net/html/atom | ||||||
| golang.org/x/net/http/httpguts | golang.org/x/net/http/httpguts | ||||||
|  | @ -789,7 +788,7 @@ golang.org/x/net/internal/socket | ||||||
| golang.org/x/net/ipv4 | golang.org/x/net/ipv4 | ||||||
| golang.org/x/net/ipv6 | golang.org/x/net/ipv6 | ||||||
| golang.org/x/net/publicsuffix | golang.org/x/net/publicsuffix | ||||||
| # golang.org/x/oauth2 v0.4.0 | # golang.org/x/oauth2 v0.5.0 | ||||||
| ## explicit; go 1.17 | ## explicit; go 1.17 | ||||||
| golang.org/x/oauth2 | golang.org/x/oauth2 | ||||||
| golang.org/x/oauth2/internal | golang.org/x/oauth2/internal | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue