diff options
author | enahum <nahumhbl@gmail.com> | 2016-09-20 13:02:08 -0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-09-20 12:02:08 -0400 |
commit | 33e20b874e9709fc8d9e45ffb8d0c2357bc79e8d (patch) | |
tree | e4a39214e462ca76a8a3a10a69feb99c29a1b010 /api | |
parent | 4e3d46521096a8f9a0b8b3461e0b1b44768c9e84 (diff) | |
download | chat-33e20b874e9709fc8d9e45ffb8d0c2357bc79e8d.tar.gz chat-33e20b874e9709fc8d9e45ffb8d0c2357bc79e8d.tar.bz2 chat-33e20b874e9709fc8d9e45ffb8d0c2357bc79e8d.zip |
PLT-4202 fix javascript error manage OAuth2 apps (#4039)
* PLT-4202 fix javascript error manage OAuth2 apps
* Fix unit tests
Diffstat (limited to 'api')
-rw-r--r-- | api/oauth.go | 1 | ||||
-rw-r--r-- | api/oauth_test.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/oauth.go b/api/oauth.go index 18a9979f6..233ae0879 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -102,6 +102,7 @@ func getOAuthApps(c *Context, w http.ResponseWriter, r *http.Request) { if HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH) { ochan = Srv.Store.OAuth().GetApps() } else { + c.Err = nil ochan = Srv.Store.OAuth().GetAppByUser(c.Session.UserId) } diff --git a/api/oauth_test.go b/api/oauth_test.go index da069aefe..1dcdd55e3 100644 --- a/api/oauth_test.go +++ b/api/oauth_test.go @@ -156,8 +156,8 @@ func TestGetOAuthAppsByUser(t *testing.T) { utils.Cfg.ServiceSettings.EnableOAuthServiceProvider = true - if _, err := Client.GetOAuthAppsByUser(); err == nil { - t.Fatal("Should have failed. only admin is permitted") + if _, err := Client.GetOAuthAppsByUser(); err != nil { + t.Fatal("Should have passed.") } *utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false |