fb8e22a767
getViewer was building a new HTTP client from scratch, losing AppVersion and InvokingAgent from the plain client already passed into AuthFlow. Reuse the existing client by shallow-copying it and wrapping its transport with AddAuthTokenHeader for the new token. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
package authflow
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_getViewer_preservesUserAgent(t *testing.T) {
|
|
var receivedUA string
|
|
var receivedAuth string
|
|
|
|
// Outer transport sets User-Agent, simulating the factory-built client's header middleware.
|
|
// Inner transport captures headers as-received to verify they survived the wrapping.
|
|
plainClient := &http.Client{
|
|
Transport: &roundTripper{roundTrip: func(req *http.Request) (*http.Response, error) {
|
|
req.Header.Set("User-Agent", "GitHub CLI 1.2.3 Agent/copilot-cli")
|
|
return (&http.Client{
|
|
Transport: &roundTripper{roundTrip: func(req *http.Request) (*http.Response, error) {
|
|
receivedUA = req.Header.Get("User-Agent")
|
|
receivedAuth = req.Header.Get("Authorization")
|
|
return &http.Response{
|
|
StatusCode: 200,
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
Body: io.NopCloser(bytes.NewBufferString(`{"data":{"viewer":{"login":"monalisa"}}}`)),
|
|
Request: req,
|
|
}, nil
|
|
}},
|
|
}).Transport.RoundTrip(req)
|
|
}},
|
|
}
|
|
|
|
login, err := getViewer(plainClient, "github.com", "test-token")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "monalisa", login)
|
|
assert.Equal(t, "GitHub CLI 1.2.3 Agent/copilot-cli", receivedUA)
|
|
assert.Equal(t, "token test-token", receivedAuth)
|
|
}
|
|
|
|
type roundTripper struct {
|
|
roundTrip func(*http.Request) (*http.Response, error)
|
|
}
|
|
|
|
func (t *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
return t.roundTrip(req)
|
|
}
|
|
|
|
func Test_getCallbackURI(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
oauthHost string
|
|
want string
|
|
}{
|
|
{
|
|
name: "dotcom",
|
|
oauthHost: "github.com",
|
|
want: "http://127.0.0.1/callback",
|
|
},
|
|
{
|
|
name: "ghes",
|
|
oauthHost: "my.server.com",
|
|
want: "http://localhost/",
|
|
},
|
|
{
|
|
name: "ghec data residency (ghe.com)",
|
|
oauthHost: "stampname.ghe.com",
|
|
want: "http://127.0.0.1/callback",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assert.Equal(t, tt.want, getCallbackURI(tt.oauthHost))
|
|
})
|
|
}
|
|
}
|