diff options
Diffstat (limited to 'server/auth/gitlab')
| -rw-r--r-- | server/auth/gitlab/gitlab.go | 7 | ||||
| -rw-r--r-- | server/auth/gitlab/gitlab_test.go | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/server/auth/gitlab/gitlab.go b/server/auth/gitlab/gitlab.go index 2cf2a5c..5e1f95f 100644 --- a/server/auth/gitlab/gitlab.go +++ b/server/auth/gitlab/gitlab.go @@ -4,7 +4,6 @@ import ( "errors" "strconv" - "github.com/nsheridan/cashier/server/auth" "github.com/nsheridan/cashier/server/config" "github.com/nsheridan/cashier/server/metrics" @@ -114,10 +113,8 @@ func (c *Config) Revoke(token *oauth2.Token) error { } // StartSession retrieves an authentication endpoint from Gitlab. -func (c *Config) StartSession(state string) *auth.Session { - return &auth.Session{ - AuthURL: c.config.AuthCodeURL(state), - } +func (c *Config) StartSession(state string) string { + return c.config.AuthCodeURL(state) } // Exchange authorizes the session and returns an access token. diff --git a/server/auth/gitlab/gitlab_test.go b/server/auth/gitlab/gitlab_test.go index 39c2701..93b348b 100644 --- a/server/auth/gitlab/gitlab_test.go +++ b/server/auth/gitlab/gitlab_test.go @@ -56,9 +56,9 @@ func TestGoodAllUsers(t *testing.T) { p, _ := newGitlab() s := p.StartSession("test_state") - a.Contains(s.AuthURL, "exampleorg/oauth/authorize") - a.Contains(s.AuthURL, "state=test_state") - a.Contains(s.AuthURL, fmt.Sprintf("client_id=%s", oauthClientID)) + a.Contains(s, "exampleorg/oauth/authorize") + a.Contains(s, "state=test_state") + a.Contains(s, fmt.Sprintf("client_id=%s", oauthClientID)) allusers = "" } @@ -78,9 +78,9 @@ func TestStartSession(t *testing.T) { p, _ := newGitlab() s := p.StartSession("test_state") - a.Contains(s.AuthURL, "exampleorg/oauth/authorize") - a.Contains(s.AuthURL, "state=test_state") - a.Contains(s.AuthURL, fmt.Sprintf("client_id=%s", oauthClientID)) + a.Contains(s, "exampleorg/oauth/authorize") + a.Contains(s, "state=test_state") + a.Contains(s, fmt.Sprintf("client_id=%s", oauthClientID)) } func newGitlab() (auth.Provider, error) { |