diff --git a/account.go b/account.go index 81365a3..274e71a 100644 --- a/account.go +++ b/account.go @@ -66,7 +66,7 @@ func NewUserPage(app *App, r *http.Request, u *User, title string, flashes []str } func canUserInvite(cfg *config.Config, isAdmin bool) bool { - return cfg.App.UserInvites != "" && + return cfg.App.UserInvites != "" && (isAdmin || cfg.App.UserInvites != "admin") } @@ -306,8 +306,8 @@ func viewLogin(app *App, w http.ResponseWriter, r *http.Request) error { OauthSlack bool OauthWriteAs bool OauthGitlab bool - OauthGeneric bool - OauthGenericDisplayName string + OauthGeneric bool + OauthGenericDisplayName string GitlabDisplayName string }{ pageForReq(app, r), @@ -318,8 +318,8 @@ func viewLogin(app *App, w http.ResponseWriter, r *http.Request) error { app.Config().SlackOauth.ClientID != "", app.Config().WriteAsOauth.ClientID != "", app.Config().GitlabOauth.ClientID != "", - app.Config().GenericOauth.ClientID != "", - config.OrDefaultString(app.Config().GenericOauth.DisplayName, genericOauthDisplayName), + app.Config().GenericOauth.ClientID != "", + config.OrDefaultString(app.Config().GenericOauth.DisplayName, genericOauthDisplayName), config.OrDefaultString(app.Config().GitlabOauth.DisplayName, gitlabDisplayName), } diff --git a/oauth.go b/oauth.go index fd3ccb2..4c1cb86 100644 --- a/oauth.go +++ b/oauth.go @@ -236,31 +236,31 @@ func configureGitlabOauth(parentHandler *Handler, r *mux.Router, app *App) { } func configureGenericOauth(parentHandler *Handler, r *mux.Router, app *App) { - if app.Config().GenericOauth.ClientID != "" { - callbackLocation := app.Config().App.Host + "/oauth/callback/generic" + if app.Config().GenericOauth.ClientID != "" { + callbackLocation := app.Config().App.Host + "/oauth/callback/generic" - var callbackProxy *callbackProxyClient = nil - if app.Config().GenericOauth.CallbackProxy != "" { - callbackProxy = &callbackProxyClient { - server: app.Config().GenericOauth.CallbackProxyAPI, - callbackLocation: app.Config().App.Host + "/oauth/callback/generic", - httpClient: config.DefaultHTTPClient(), - } - callbackLocation = app.Config().GenericOauth.CallbackProxy - } + var callbackProxy *callbackProxyClient = nil + if app.Config().GenericOauth.CallbackProxy != "" { + callbackProxy = &callbackProxyClient{ + server: app.Config().GenericOauth.CallbackProxyAPI, + callbackLocation: app.Config().App.Host + "/oauth/callback/generic", + httpClient: config.DefaultHTTPClient(), + } + callbackLocation = app.Config().GenericOauth.CallbackProxy + } - address := app.Config().GenericOauth.Host - oauthClient := genericOauthClient{ - ClientID: app.Config().GenericOauth.ClientID, - ClientSecret: app.Config().GenericOauth.ClientSecret, - ExchangeLocation: app.Config().GenericOauth.TokenEndpoint, - InspectLocation: app.Config().GenericOauth.InspectEndpoint, - AuthLocation: app.Config().GenericOauth.AuthEndpoint, - HttpClient: config.DefaultHTTPClient(), - CallbackLocation: callbackLocation, - } - configureOauthRoutes(parentHandler, r, app, oauthClient, callbackProxy) - } + address := app.Config().GenericOauth.Host + oauthClient := genericOauthClient{ + ClientID: app.Config().GenericOauth.ClientID, + ClientSecret: app.Config().GenericOauth.ClientSecret, + ExchangeLocation: app.Config().GenericOauth.TokenEndpoint, + InspectLocation: app.Config().GenericOauth.InspectEndpoint, + AuthLocation: app.Config().GenericOauth.AuthEndpoint, + HttpClient: config.DefaultHTTPClient(), + CallbackLocation: callbackLocation, + } + configureOauthRoutes(parentHandler, r, app, oauthClient, callbackProxy) + } } func configureOauthRoutes(parentHandler *Handler, r *mux.Router, app *App, oauthClient oauthClient, callbackProxy *callbackProxyClient) { diff --git a/oauth_generic.go b/oauth_generic.go index 6c8c15d..4a706a4 100644 --- a/oauth_generic.go +++ b/oauth_generic.go @@ -21,7 +21,7 @@ type genericOauthClient struct { var _ oauthClient = genericOauthClient{} const ( - genericOauthDisplayName = "oAuth" + genericOauthDisplayName = "oAuth" ) func (c genericOauthClient) GetProvider() string { diff --git a/routes.go b/routes.go index e246184..43f511b 100644 --- a/routes.go +++ b/routes.go @@ -76,7 +76,7 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router { configureSlackOauth(handler, write, apper.App()) configureWriteAsOauth(handler, write, apper.App()) configureGitlabOauth(handler, write, apper.App()) - configureGenericOauth(handler, write, apper.App()) + configureGenericOauth(handler, write, apper.App()) // Set up dyamic page handlers // Handle auth