+2 -8

atproto/auth/oauth/oauth.go

reviewed

··· 427 427 // Lower-level helper. This is usually invoked as part of [ProcessCallback]. 428 428 func (app *ClientApp) SendInitialTokenRequest(ctx context.Context, authCode string, info AuthRequestData) (*TokenResponse, error) { 429 429 430 430 - // TODO: don't re-fetch? caching? 431 431 - authServerMeta, err := app.Resolver.ResolveAuthServerMetadata(ctx, info.AuthServerURL) 432 432 - if err != nil { 433 433 - return nil, err 434 434 - } 435 435 - 436 430 body := InitialTokenRequest{ 437 431 ClientID: app.Config.ClientID, 438 432 RedirectURI: app.Config.CallbackURL, ··· 465 459 466 460 var resp *http.Response 467 461 for range 2 { 468 468 - dpopJWT, err := NewAuthDPoP("POST", authServerMeta.TokenEndpoint, dpopServerNonce, dpopPrivKey) 462 462 + dpopJWT, err := NewAuthDPoP("POST", info.AuthServerTokenEndpoint, dpopServerNonce, dpopPrivKey) 469 463 if err != nil { 470 464 return nil, err 471 465 } 472 466 473 473 - req, err := http.NewRequestWithContext(ctx, "POST", authServerMeta.TokenEndpoint, bytes.NewBuffer(bodyBytes)) 467 467 + req, err := http.NewRequestWithContext(ctx, "POST", info.AuthServerTokenEndpoint, bytes.NewBuffer(bodyBytes)) 474 468 if err != nil { 475 469 return nil, err 476 470 }

+3

atproto/auth/oauth/types.go

reviewed

··· 336 336 // unique token in URI format, which will be used by the client in the auth flow redirect 337 337 RequestURI string `json:"request_uri"` 338 338 339 339 + // Full token endpoint URL 340 340 + AuthServerTokenEndpoint string `json:"authserver_token_endpoint"` 341 341 + 339 342 // The secret token/nonce which a code challenge was generated from 340 343 PKCEVerifier string `json:"pkce_verifier"` 341 344