commit 43716d6b45e3732ac3cb6679a1b1f7e78d76e799 · hailey.at/atproto-oauth-golang

+1 -1

cmd/client_test/main.go

···

       133
        
       	db.AutoMigrate(&OauthRequest{}, &OauthSession{})

     

       134
        
       

     

       135
        
       	xrpcCli := &oauth.XrpcClient{

     

       136
       -
       		OnDPoPNonceChanged: func(did, newNonce string) {

     

       137
        
       			if err := db.Exec("UPDATE oauth_sessions SET dpop_pds_nonce = ? WHERE did = ?", newNonce, did).Error; err != nil {

     

       138
        
       				slog.Default().Error("error updating pds nonce", "err", err)

     

       139
        
       			}

···

       133
        
       	db.AutoMigrate(&OauthRequest{}, &OauthSession{})

     

       134
        
       

     

       135
        
       	xrpcCli := &oauth.XrpcClient{

     

       136
       +
       		OnDpopPdsNonceChanged: func(did, newNonce string) {

     

       137
        
       			if err := db.Exec("UPDATE oauth_sessions SET dpop_pds_nonce = ? WHERE did = ?", newNonce, did).Error; err != nil {

     

       138
        
       				slog.Default().Error("error updating pds nonce", "err", err)

     

       139
        
       			}

+12 -5

xrpc.go

···

       19
        
       	"github.com/lestrrat-go/jwx/v2/jwk"

     

       20
        
       )

     

       21
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
       type XrpcClient struct {

     

       23
        
       	// Client is an HTTP client to use. If not set, defaults to http.RobustHTTPClient().

     

       24
       -
       	Client             *http.Client

     

       25
       -
       	UserAgent          *string

     

       26
       -
       	Headers            map[string]string

     

       27
       -
       	OnDPoPNonceChanged func(did, newNonce string)

     

       28
        
       }

     

       29
        
       

     

       30
        
       type XrpcAuthedRequestArgs struct {

     
···

       212
        
       			// if we get a new nonce, update the nonce and make the request again

     

       213
        
       			if (resp.StatusCode == 400 || resp.StatusCode == 401) && xe.ErrStr == "use_dpop_nonce" {

     

       214
        
       				authedArgs.DpopPdsNonce = resp.Header.Get("DPoP-Nonce")

     

       215
       -
       				c.OnDPoPNonceChanged(authedArgs.Did, authedArgs.DpopPdsNonce)

     

       216
        
       				continue

     

       217
        
       			}

     

       218

···

       19
        
       	"github.com/lestrrat-go/jwx/v2/jwk"

     

       20
        
       )

     

       21
        
       

     

       22
       +
       // This xrpc client is copied from the indigo xrpc client, with some tweaks:

     

       23
       +
       // - There is no `AuthInfo` on the client. Instead, you pass auth _with the request_ in the `Do()` function

     

       24
       +
       // - There is an `XrpcAuthedRequestArgs` struct that contains all the info you need to complete an authed request

     

       25
       +
       // - There is a `OnDpopPdsNonceChanged` callback that will run when the dpop nonce receives an update. You can

     

       26
       +
       //   use this to update a database, for example.

     

       27
       +
       // - Requests are retried whenever the dpop nonce changes

     

       28
       +
       

     

       29
        
       type XrpcClient struct {

     

       30
        
       	// Client is an HTTP client to use. If not set, defaults to http.RobustHTTPClient().

     

       31
       +
       	Client                *http.Client

     

       32
       +
       	UserAgent             *string

     

       33
       +
       	Headers               map[string]string

     

       34
       +
       	OnDpopPdsNonceChanged func(did, newNonce string)

     

       35
        
       }

     

       36
        
       

     

       37
        
       type XrpcAuthedRequestArgs struct {

     
···

       219
        
       			// if we get a new nonce, update the nonce and make the request again

     

       220
        
       			if (resp.StatusCode == 400 || resp.StatusCode == 401) && xe.ErrStr == "use_dpop_nonce" {

     

       221
        
       				authedArgs.DpopPdsNonce = resp.Header.Get("DPoP-Nonce")

     

       222
       +
       				c.OnDpopPdsNonceChanged(authedArgs.Did, authedArgs.DpopPdsNonce)

     

       223
        
       				continue

     

       224
        
       			}

     

       225