back round 0 view raw

bump to latest indigo, fix XrpcClient.Do signature #1

merged
opened by oppi.li targeting main from oppi.li/atproto-oauth: main
options
unified split
Changed files
+8 -8
go.mod
go.sum
xrpc.go
+2 -2
go.mod 
···

       
3

       
 

       
go 1.24.0


     

       
4

       
 

       



     

       
5

       
 

       
require (


     

       
6

       
-

       
	github.com/bluesky-social/indigo v0.0.0-20250301025210-a4e0cc37e188


     

       
7

       
 

       
	github.com/carlmjohnson/versioninfo v0.22.5


     

       
8

       
-

       
	github.com/golang-jwt/jwt/v5 v5.2.1


     

       
9

       
 

       
	github.com/google/uuid v1.6.0


     

       
10

       
 

       
	github.com/gorilla/sessions v1.4.0


     

       
11

       
 

       
	github.com/joho/godotenv v1.5.1


     
···

       
3

       
 

       
go 1.24.0


     

       
4

       
 

       



     

       
5

       
 

       
require (


     

       
6

       
+

       
	github.com/bluesky-social/indigo v0.0.0-20250721113617-2b6646226706


     

       
7

       
 

       
	github.com/carlmjohnson/versioninfo v0.22.5


     

       
8

       
+

       
	github.com/golang-jwt/jwt/v5 v5.2.2


     

       
9

       
 

       
	github.com/google/uuid v1.6.0


     

       
10

       
 

       
	github.com/gorilla/sessions v1.4.0


     

       
11

       
 

       
	github.com/joho/godotenv v1.5.1
+4 -4
go.sum 
···

       
1

       
 

       
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=


     

       
2

       
 

       
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=


     

       
3

       
-

       
github.com/bluesky-social/indigo v0.0.0-20250301025210-a4e0cc37e188 h1:1sQaG37xk08/rpmdhrmMkfQWF9kZbnfHm9Zav3bbSMk=


     

       
4

       
-

       
github.com/bluesky-social/indigo v0.0.0-20250301025210-a4e0cc37e188/go.mod h1:NVBwZvbBSa93kfyweAmKwOLYawdVHdwZ9s+GZtBBVLA=


     

       
5

       
 

       
github.com/carlmjohnson/versioninfo v0.22.5 h1:O00sjOLUAFxYQjlN/bzYTuZiS0y6fWDQjMRvwtKgwwc=


     

       
6

       
 

       
github.com/carlmjohnson/versioninfo v0.22.5/go.mod h1:QT9mph3wcVfISUKd0i9sZfVrPviHuSF+cUtLjm2WSf8=


     

       
7

       
 

       
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=


     
···

       
26

       
 

       
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=


     

       
27

       
 

       
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=


     

       
28

       
 

       
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=


     

       
29

       
-

       
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=


     

       
30

       
-

       
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=


     

       
31

       
 

       
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=


     

       
32

       
 

       
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=


     

       
33

       
 

       
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=


     
···

       
1

       
 

       
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=


     

       
2

       
 

       
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=


     

       
3

       
+

       
github.com/bluesky-social/indigo v0.0.0-20250721113617-2b6646226706 h1:ANOvunbumhvduKlp1mU2Jt20+PQR0x2irFGiYAJerQs=


     

       
4

       
+

       
github.com/bluesky-social/indigo v0.0.0-20250721113617-2b6646226706/go.mod h1:0XUyOCRtL4/OiyeqMTmr6RlVHQMDgw3LS7CfibuZR5Q=


     

       
5

       
 

       
github.com/carlmjohnson/versioninfo v0.22.5 h1:O00sjOLUAFxYQjlN/bzYTuZiS0y6fWDQjMRvwtKgwwc=


     

       
6

       
 

       
github.com/carlmjohnson/versioninfo v0.22.5/go.mod h1:QT9mph3wcVfISUKd0i9sZfVrPviHuSF+cUtLjm2WSf8=


     

       
7

       
 

       
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=


     
···

       
26

       
 

       
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=


     

       
27

       
 

       
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=


     

       
28

       
 

       
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=


     

       
29

       
+

       
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=


     

       
30

       
+

       
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=


     

       
31

       
 

       
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=


     

       
32

       
 

       
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=


     

       
33

       
 

       
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+2 -2
xrpc.go 
···

       
141

       
 

       
	return tokenString, nil


     

       
142

       
 

       
}


     

       
143

       
 

       



     

       
144

       
-

       
func (c *XrpcClient) Do(ctx context.Context, authedArgs *XrpcAuthedRequestArgs, kind xrpc.XRPCRequestType, inpenc, method string, params map[string]any, bodyobj any, out any) error {


     

       
145

       
 

       
	// we might have to retry the request if we get a new nonce from the server


     

       
146

       
 

       
	for range 2 {


     

       
147

       
 

       
		var body io.Reader


     
···

       
165

       
 

       
		case xrpc.Procedure:


     

       
166

       
 

       
			m = "POST"


     

       
167

       
 

       
		default:


     

       
168

       
-

       
			return fmt.Errorf("unsupported request kind: %d", kind)


     

       
169

       
 

       
		}


     

       
170

       
 

       



     

       
171

       
 

       
		var paramStr string


     
···

       
141

       
 

       
	return tokenString, nil


     

       
142

       
 

       
}


     

       
143

       
 

       



     

       
144

       
+

       
func (c *XrpcClient) Do(ctx context.Context, authedArgs *XrpcAuthedRequestArgs, kind string, inpenc, method string, params map[string]any, bodyobj any, out any) error {


     

       
145

       
 

       
	// we might have to retry the request if we get a new nonce from the server


     

       
146

       
 

       
	for range 2 {


     

       
147

       
 

       
		var body io.Reader


     
···

       
165

       
 

       
		case xrpc.Procedure:


     

       
166

       
 

       
			m = "POST"


     

       
167

       
 

       
		default:


     

       
168

       
+

       
			return fmt.Errorf("unsupported request kind: %s", kind)


     

       
169

       
 

       
		}


     

       
170

       
 

       



     

       
171

       
 

       
		var paramStr string