From 799215ee2278b162d4e113c498424fdda817e83b Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 17 Jun 2015 12:07:35 -0400
Subject: move valet feature switch to DB from config

---
 api/post.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'api/post.go')

diff --git a/api/post.go b/api/post.go
index 36607c231..6f500286f 100644
--- a/api/post.go
+++ b/api/post.go
@@ -58,11 +58,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func createValetPost(c *Context, w http.ResponseWriter, r *http.Request) {
-	if !utils.Cfg.TeamSettings.AllowValet {
-		c.Err = model.NewAppError("createValetPost", "The valet feature is currently turned off. Please contact your system administrator for details.", "")
-		c.Err.StatusCode = http.StatusNotImplemented
-		return
-	}
+	tchan := Srv.Store.Team().Get(c.Session.TeamId)
 
 	post := model.PostFromJson(r.Body)
 	if post == nil {
@@ -70,13 +66,25 @@ func createValetPost(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Any one with access to the team can post as valet to any open channel
 	cchan := Srv.Store.Channel().CheckOpenChannelPermissions(c.Session.TeamId, post.ChannelId)
 
+	// Any one with access to the team can post as valet to any open channel
 	if !c.HasPermissionsToChannel(cchan, "createValetPost") {
 		return
 	}
 
+	// Make sure this team has the valet feature enabled
+	if tResult := <-tchan; tResult.Err != nil {
+		c.Err = model.NewAppError("createValetPost", "Could not find the team for this session, team_id="+c.Session.TeamId, "")
+		return
+	} else {
+		if !tResult.Data.(*model.Team).AllowValet {
+			c.Err = model.NewAppError("createValetPost", "The valet feature is currently turned off. Please contact your team administrator for details.", "")
+			c.Err.StatusCode = http.StatusNotImplemented
+			return
+		}
+	}
+
 	if rp, err := CreateValetPost(c, post); err != nil {
 		c.Err = err
 
-- 
cgit v1.2.3-1-g7c22