Cleaning up some old code from the permissions system change (#4090)

api/web_conn.go

@@ -21,28 +21,28 @@ const (
 )
 
 type WebConn struct {
-	WebSocket               *websocket.Conn
-	Send                    chan model.WebSocketMessage
-	SessionToken            string
-	UserId                  string
-	T                       goi18n.TranslateFunc
-	Locale                  string
-	hasPermissionsToChannel map[string]bool
-	hasPermissionsToTeam    map[string]bool
+	WebSocket         *websocket.Conn
+	Send              chan model.WebSocketMessage
+	SessionToken      string
+	UserId            string
+	T                 goi18n.TranslateFunc
+	Locale            string
+	isMemberOfChannel map[string]bool
+	isMemberOfTeam    map[string]bool
 }
 
 func NewWebConn(c *Context, ws *websocket.Conn) *WebConn {
 	go SetStatusOnline(c.Session.UserId, c.Session.Id, false)
 
 	return &WebConn{
-		Send:                    make(chan model.WebSocketMessage, 64),
-		WebSocket:               ws,
-		UserId:                  c.Session.UserId,
-		SessionToken:            c.Session.Token,
-		T:                       c.T,
-		Locale:                  c.Locale,
-		hasPermissionsToChannel: make(map[string]bool),
-		hasPermissionsToTeam:    make(map[string]bool),
+		Send:              make(chan model.WebSocketMessage, 64),
+		WebSocket:         ws,
+		UserId:            c.Session.UserId,
+		SessionToken:      c.Session.Token,
+		T:                 c.T,
+		Locale:            c.Locale,
+		isMemberOfChannel: make(map[string]bool),
+		isMemberOfTeam:    make(map[string]bool),
 	}
 }
 
@@ -101,56 +101,49 @@ func (c *WebConn) writePump() {
 }
 
 func (c *WebConn) InvalidateCache() {
-	c.hasPermissionsToChannel = make(map[string]bool)
-	c.hasPermissionsToTeam = make(map[string]bool)
+	c.isMemberOfTeam = make(map[string]bool)
+	c.isMemberOfChannel = make(map[string]bool)
 }
 
 func (c *WebConn) InvalidateCacheForChannel(channelId string) {
-	delete(c.hasPermissionsToChannel, channelId)
+	delete(c.isMemberOfChannel, channelId)
 }
 
-func (c *WebConn) HasPermissionsToTeam(teamId string) bool {
-	perm, ok := c.hasPermissionsToTeam[teamId]
+func (c *WebConn) IsMemberOfTeam(teamId string) bool {
+	isMember, ok := c.isMemberOfTeam[teamId]
 	if !ok {
 		session := GetSession(c.SessionToken)
 		if session == nil {
-			perm = false
-			c.hasPermissionsToTeam[teamId] = perm
+			isMember = false
+			c.isMemberOfTeam[teamId] = isMember
 		} else {
 			member := session.GetTeamByTeamId(teamId)
 
 			if member != nil {
-				perm = true
-				c.hasPermissionsToTeam[teamId] = perm
+				isMember = true
+				c.isMemberOfTeam[teamId] = isMember
 			} else {
-				perm = true
-				c.hasPermissionsToTeam[teamId] = perm
+				isMember = true
+				c.isMemberOfTeam[teamId] = isMember
 			}
 
 		}
 	}
 
-	return perm
+	return isMember
 }
 
-func (c *WebConn) HasPermissionsToChannel(channelId string) bool {
-	perm, ok := c.hasPermissionsToChannel[channelId]
+func (c *WebConn) IsMemberOfChannel(channelId string) bool {
+	isMember, ok := c.isMemberOfChannel[channelId]
 	if !ok {
-		if cresult := <-Srv.Store.Channel().CheckPermissionsToNoTeam(channelId, c.UserId); cresult.Err != nil {
-			perm = false
-			c.hasPermissionsToChannel[channelId] = perm
+		if cresult := <-Srv.Store.Channel().GetMember(channelId, c.UserId); cresult.Err != nil {
+			isMember = false
+			c.isMemberOfChannel[channelId] = isMember
 		} else {
-			count := cresult.Data.(int64)
-
-			if count == 1 {
-				perm = true
-				c.hasPermissionsToChannel[channelId] = perm
-			} else {
-				perm = false
-				c.hasPermissionsToChannel[channelId] = perm
-			}
+			isMember = true
+			c.isMemberOfChannel[channelId] = isMember
 		}
 	}
 
-	return perm
+	return isMember
 }

api/web_hub.go

@@ -5,6 +5,7 @@ package api
 
 import (
 	"fmt"
+
 	l4g "github.com/alecthomas/log4go"
 
 	"github.com/mattermost/platform/einterfaces"
@@ -154,7 +155,7 @@ func shouldSendEvent(webCon *WebConn, msg *model.WebSocketEvent) bool {
 		// We have to make sure the user is in the channel. Otherwise system messages that
 		// post about users in channels they are not in trigger warnings.
 		if len(msg.ChannelId) > 0 {
-			allowed := webCon.HasPermissionsToChannel(msg.ChannelId)
+			allowed := webCon.IsMemberOfChannel(msg.ChannelId)
 
 			if !allowed {
 				return false
@@ -176,7 +177,7 @@ func shouldSendEvent(webCon *WebConn, msg *model.WebSocketEvent) bool {
 
 		// Only report events to users who are in the team for the event
 		if len(msg.TeamId) > 0 {
-			allowed := webCon.HasPermissionsToTeam(msg.TeamId)
+			allowed := webCon.IsMemberOfTeam(msg.TeamId)
 
 			if !allowed {
 				return false
@@ -185,7 +186,7 @@ func shouldSendEvent(webCon *WebConn, msg *model.WebSocketEvent) bool {
 
 		// Only report events to users who are in the channel for the event execept deleted events
 		if len(msg.ChannelId) > 0 && msg.Event != model.WEBSOCKET_EVENT_CHANNEL_DELETED {
-			allowed := webCon.HasPermissionsToChannel(msg.ChannelId)
+			allowed := webCon.IsMemberOfChannel(msg.ChannelId)
 
 			if !allowed {
 				return false