mod/modconfig: use oauth2.Token directly for the wire format

https://go.dev/issue/61417 added an ExpiresIn field next to Expiry
to support the wire format, using expires_in as a duraiton in seconds.

While here, apply a suggestion by gopls.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: Ic87201bbb6c50241af7f01c0dc4ae9dbea376d15
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201519
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>

Author: mvdan

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/yuin/goldmark v1.7.4
 	golang.org/x/mod v0.20.0
 	golang.org/x/net v0.28.0
-	golang.org/x/oauth2 v0.22.0
+	golang.org/x/oauth2 v0.23.0
 	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.23.0
 	golang.org/x/text v0.17.0

go.sum

@@ -65,8 +65,8 @@ golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
 golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=

mod/modconfig/modconfig_test.go

@@ -20,6 +20,7 @@ import (
 	"cuelabs.dev/go/oci/ociregistry/ocimem"
 	"cuelabs.dev/go/oci/ociregistry/ociserver"
 	"github.com/go-quicktest/qt"
+	"golang.org/x/oauth2"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/tools/txtar"
 
@@ -210,14 +211,14 @@ package bar
 			auth := r.Header.Get("Authorization")
 			if !strings.HasPrefix(auth, fmt.Sprintf("Bearer access_%d_", i)) {
 				w.WriteHeader(401)
-				w.Write([]byte(fmt.Sprintf("server %d: unexpected auth header: %s", i, auth)))
+				fmt.Fprintf(w, "server %d: unexpected auth header: %s", i, auth)
 				return
 			}
 			rh.ServeHTTP(w, r)
 		})
 		mux.HandleFunc("/login/oauth/token", func(w http.ResponseWriter, r *http.Request) {
 			ctr := atomic.AddInt32(&counter, 1)
-			writeJSON(w, 200, wireToken{
+			writeJSON(w, 200, oauth2.Token{
 				AccessToken:  fmt.Sprintf("access_%d_%d", i, ctr),
 				TokenType:    "Bearer",
 				RefreshToken: fmt.Sprintf("refresh_%d", ctr),
@@ -333,12 +334,3 @@ func writeJSON(w http.ResponseWriter, statusCode int, v any) {
 	w.WriteHeader(statusCode)
 	w.Write(b)
 }
-
-// wireToken describes the JSON encoding for an OAuth 2.0 token
-// as specified in the RFC 6749.
-type wireToken struct {
-	AccessToken  string `json:"access_token,omitempty"`
-	TokenType    string `json:"token_type,omitempty"`
-	RefreshToken string `json:"refresh_token,omitempty"`
-	ExpiresIn    int    `json:"expires_in,omitempty"`
-}