Commit 0a6b1905 authored by Kevin Lyda's avatar Kevin Lyda 💬
Browse files

Fix linty goodness.

parent d7b6a359
Pipeline #1164 failed with stage
in 2 minutes and 46 seconds
......@@ -39,10 +39,10 @@ func New(c *config.Auth) (auth.Provider, error) {
if !allUsers && c.ProviderOpts["group"] == "" && len(uw) == 0 {
return nil, errors.New("gitlab_opts group and the users whitelist must not be both empty if allusers isn't true")
}
siteUrl := "https://gitlab.com/"
siteURL := "https://gitlab.com/"
if c.ProviderOpts["siteurl"] != "" {
siteUrl = c.ProviderOpts["siteurl"]
if siteUrl[len(siteUrl)-1] != '/' {
siteURL = c.ProviderOpts["siteurl"]
if siteURL[len(siteURL)-1] != '/' {
return nil, errors.New("gitlab_opts siteurl must end in /")
}
} else {
......@@ -57,8 +57,8 @@ func New(c *config.Auth) (auth.Provider, error) {
ClientSecret: c.OauthClientSecret,
RedirectURL: c.OauthCallbackURL,
Endpoint: oauth2.Endpoint{
AuthURL: siteUrl + "oauth/authorize",
TokenURL: siteUrl + "oauth/token",
AuthURL: siteURL + "oauth/authorize",
TokenURL: siteURL + "oauth/token",
},
Scopes: []string{
"api",
......@@ -67,7 +67,7 @@ func New(c *config.Auth) (auth.Provider, error) {
group: c.ProviderOpts["group"],
whitelist: uw,
allusers: allUsers,
baseurl: siteUrl + "api/v3/",
baseurl: siteURL + "api/v3/",
}, nil
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment