summaryrefslogtreecommitdiffstats
path: root/api/oauth.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-09-06 20:43:18 -0700
committerChristopher Speller <crspeller@gmail.com>2017-09-06 20:43:18 -0700
commit77709ccdda86408d5135b8bc71462e2111992358 (patch)
tree5efc1631eb6cb31f8768fafeb58612557d98cb59 /api/oauth.go
parentfd86a2490ea81eba8e12dcce76455710f182f81c (diff)
parente589accdaf38bb82cb5d3b5dd84eadf9bfb58b5c (diff)
downloadchat-77709ccdda86408d5135b8bc71462e2111992358.tar.gz
chat-77709ccdda86408d5135b8bc71462e2111992358.tar.bz2
chat-77709ccdda86408d5135b8bc71462e2111992358.zip
Merge release-4.2
Diffstat (limited to 'api/oauth.go')
-rw-r--r--api/oauth.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/oauth.go b/api/oauth.go
index 9d6c9bf52..007ec09d9 100644
--- a/api/oauth.go
+++ b/api/oauth.go
@@ -41,6 +41,10 @@ func registerOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
+ if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
+ oauthApp.IsTrusted = false
+ }
+
oauthApp.CreatorId = c.Session.UserId
rapp, err := c.App.CreateOAuthApp(oauthApp)