diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
| commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
| tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /api4/oauth.go | |
| parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
| download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip | |
Reduce utils.Cfg references (#7650)
* app.UpdateConfig method
* test fix
* another test fix
* the config override option as-was is just error prone, remove it for now
* derp
Diffstat (limited to 'api4/oauth.go')
| -rw-r--r-- | api4/oauth.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/oauth.go b/api4/oauth.go index c60f240f6..8933f0863 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -313,7 +313,7 @@ func deauthorizeOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) { } func authorizeOAuthPage(c *Context, w http.ResponseWriter, r *http.Request) { - if !utils.Cfg.ServiceSettings.EnableOAuthServiceProvider { + if !c.App.Config().ServiceSettings.EnableOAuthServiceProvider { err := model.NewAppError("authorizeOAuth", "api.oauth.authorize_oauth.disabled.app_error", nil, "", http.StatusNotImplemented) utils.RenderWebError(err, w, r) return @@ -560,7 +560,7 @@ func signupWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !utils.Cfg.TeamSettings.EnableUserCreation { + if !c.App.Config().TeamSettings.EnableUserCreation { c.Err = model.NewAppError("signupWithOAuth", "api.oauth.singup_with_oauth.disabled.app_error", nil, "", http.StatusNotImplemented) return } |