@@ -20,30 +20,30 @@ func updateURL(url *url.URL, hostname string) {
2020 url.Host = hostname
2121}
2222
23−type ValidateSessionStateTestProvider struct {
23+type ValidateSessionTestProvider struct {
2424 *ProviderData
2525}
2626
27−var _ Provider = (*ValidateSessionStateTestProvider)(nil)
27+var _ Provider = (*ValidateSessionTestProvider)(nil)
2828
29−func (tp *ValidateSessionStateTestProvider) GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error) {
29+func (tp *ValidateSessionTestProvider) GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error) {
3030 return "", errors.New("not implemented")
3131}
3232
3333// Note that we're testing the internal validateToken() used to implement
34−// several Provider's ValidateSessionState() implementations
35−func (tp *ValidateSessionStateTestProvider) ValidateSession(ctx context.Context, s *sessions.SessionState) bool {
34+// several Provider's ValidateSession() implementations
35+func (tp *ValidateSessionTestProvider) ValidateSession(ctx context.Context, s *sessions.SessionState) bool {
3636 return false
3737}
3838
3939type ValidateSessionStateTest struct {
4040 backend *httptest.Server
4141 responseCode int
42− provider *ValidateSessionStateTestProvider
42+ provider *ValidateSessionTestProvider
4343 header http.Header
4444}
4545
46−func NewValidateSessionStateTest() *ValidateSessionStateTest {
46+func NewValidateSessionTest() *ValidateSessionStateTest {
4747 var vtTest ValidateSessionStateTest
4848
4949 vtTest.backend = httptest.NewServer(
@@ -73,7 +73,7 @@ func NewValidateSessionStateTest() *ValidateSessionStateTest {
7373
7474 }))
7575 backendURL, _ := url.Parse(vtTest.backend.URL)
76− vtTest.provider = &ValidateSessionStateTestProvider{
76+ vtTest.provider = &ValidateSessionTestProvider{
7777 ProviderData: &ProviderData{
7878 ValidateURL: &url.URL{
7979 Scheme: "http",
@@ -90,14 +90,14 @@ func (vtTest *ValidateSessionStateTest) Close() {
9090 vtTest.backend.Close()
9191}
9292
93−func TestValidateSessionStateValidToken(t *testing.T) {
94− vtTest := NewValidateSessionStateTest()
93+func TestValidateSessionValidToken(t *testing.T) {
94+ vtTest := NewValidateSessionTest()
9595 defer vtTest.Close()
9696 assert.Equal(t, true, validateToken(context.Background(), vtTest.provider, "foobar", nil))
9797}
9898
99−func TestValidateSessionStateValidTokenWithHeaders(t *testing.T) {
100− vtTest := NewValidateSessionStateTest()
99+func TestValidateSessionValidTokenWithHeaders(t *testing.T) {
100+ vtTest := NewValidateSessionTest()
101101 defer vtTest.Close()
102102 vtTest.header = make(http.Header)
103103 vtTest.header.Set("Authorization", "Bearer foobar")
@@ -105,28 +105,28 @@ func TestValidateSessionStateValidTokenWithHeaders(t *testing.T) {
105105 validateToken(context.Background(), vtTest.provider, "foobar", vtTest.header))
106106}
107107
108−func TestValidateSessionStateEmptyToken(t *testing.T) {
109− vtTest := NewValidateSessionStateTest()
108+func TestValidateSessionEmptyToken(t *testing.T) {
109+ vtTest := NewValidateSessionTest()
110110 defer vtTest.Close()
111111 assert.Equal(t, false, validateToken(context.Background(), vtTest.provider, "", nil))
112112}
113113
114−func TestValidateSessionStateEmptyValidateURL(t *testing.T) {
115− vtTest := NewValidateSessionStateTest()
114+func TestValidateSessionEmptyValidateURL(t *testing.T) {
115+ vtTest := NewValidateSessionTest()
116116 defer vtTest.Close()
117117 vtTest.provider.Data().ValidateURL = nil
118118 assert.Equal(t, false, validateToken(context.Background(), vtTest.provider, "foobar", nil))
119119}
120120
121−func TestValidateSessionStateRequestNetworkFailure(t *testing.T) {
122− vtTest := NewValidateSessionStateTest()
121+func TestValidateSessionRequestNetworkFailure(t *testing.T) {
122+ vtTest := NewValidateSessionTest()
123123 // Close immediately to simulate a network failure
124124 vtTest.Close()
125125 assert.Equal(t, false, validateToken(context.Background(), vtTest.provider, "foobar", nil))
126126}
127127
128−func TestValidateSessionStateExpiredToken(t *testing.T) {
129− vtTest := NewValidateSessionStateTest()
128+func TestValidateSessionExpiredToken(t *testing.T) {
129+ vtTest := NewValidateSessionTest()
130130 defer vtTest.Close()
131131 vtTest.responseCode = 401
132132 assert.Equal(t, false, validateToken(context.Background(), vtTest.provider, "foobar", nil))