summaryrefslogtreecommitdiffstats
path: root/api4/ldap.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-10-25 11:48:15 -0700
committerGitHub <noreply@github.com>2017-10-25 11:48:15 -0700
commit4491b5ecdfad96959f9a9ab32a5f127bbfa7eac5 (patch)
treec2fb61b469f5ba6f4bce2ef5aa5c2646dd6a8cf2 /api4/ldap.go
parentc16f417f49303ef3a0319ba769eb3698e735b73c (diff)
downloadchat-4491b5ecdfad96959f9a9ab32a5f127bbfa7eac5.tar.gz
chat-4491b5ecdfad96959f9a9ab32a5f127bbfa7eac5.tar.bz2
chat-4491b5ecdfad96959f9a9ab32a5f127bbfa7eac5.zip
Performance improvements for 40M posts (#7708)
* Optimizing get root posts SQL query * Setting session invalidation to be reliable * Adding app reciever to SessionHasPermissionToUser * Adding app reciever to SessionHasPermissionToTeam * Adding app reciever to SessionHasPermissionTo * Clear session cache if permission was denied * Fixing rebase issues * Revert "Optimizing get root posts SQL query" This reverts commit f364757e7015cfb4ec673d0a4fc3d57cd25d8dd7. * Fixing build
Diffstat (limited to 'api4/ldap.go')
-rw-r--r--api4/ldap.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/api4/ldap.go b/api4/ldap.go
index 3c5eb5ede..66735c526 100644
--- a/api4/ldap.go
+++ b/api4/ldap.go
@@ -7,7 +7,6 @@ import (
"net/http"
l4g "github.com/alecthomas/log4go"
- "github.com/mattermost/mattermost-server/app"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
)
@@ -20,7 +19,7 @@ func (api *API) InitLdap() {
}
func syncLdap(c *Context, w http.ResponseWriter, r *http.Request) {
- if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
+ if !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM)
return
}
@@ -31,7 +30,7 @@ func syncLdap(c *Context, w http.ResponseWriter, r *http.Request) {
}
func testLdap(c *Context, w http.ResponseWriter, r *http.Request) {
- if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
+ if !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM)
return
}