From 9c344a0a95c44ef9cebade7b8a65ac160d9eb900 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 11 Feb 2017 20:20:35 +0000 Subject: Revert "Remove the oauth_callback_url config option" --- server/auth/gitlab/gitlab.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'server/auth/gitlab/gitlab.go') diff --git a/server/auth/gitlab/gitlab.go b/server/auth/gitlab/gitlab.go index 27edafa..f76b2e8 100644 --- a/server/auth/gitlab/gitlab.go +++ b/server/auth/gitlab/gitlab.go @@ -2,7 +2,6 @@ package gitlab import ( "errors" - "net/http" "strconv" "github.com/nsheridan/cashier/server/auth" @@ -52,6 +51,7 @@ func New(c *config.Auth) (*Config, error) { config: &oauth2.Config{ ClientID: c.OauthClientID, ClientSecret: c.OauthClientSecret, + RedirectURL: c.OauthCallbackURL, Endpoint: oauth2.Endpoint{ AuthURL: siteURL + "oauth/authorize", TokenURL: siteURL + "oauth/token", @@ -110,8 +110,7 @@ func (c *Config) Revoke(token *oauth2.Token) error { } // StartSession retrieves an authentication endpoint from Gitlab. -func (c *Config) StartSession(state string, r *http.Request) *auth.Session { - c.config.RedirectURL = auth.Oauth2RedirectURL(r) +func (c *Config) StartSession(state string) *auth.Session { return &auth.Session{ AuthURL: c.config.AuthCodeURL(state), } -- cgit v1.2.3