From 2e5617c29be69637acd384e85f795a0b343bec8d Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 21 Apr 2016 22:37:01 -0700 Subject: PLT-2057 User as a first class object (#2648) * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding client side unit test * Cleaning up the clint side tests * Fixing msg * Adding more client side unit tests * Adding more using tests * Adding last bit of client side unit tests and adding make cmd * Fixing bad merge * Fixing libraries * Updating to new client side API * Fixing borken unit test * Fixing unit tests * ugg...trying to beat gofmt * ugg...trying to beat gofmt * Cleaning up remainder of the server side routes * Adding inital load api * Increased coverage of webhook unit tests (#2660) * Adding loading ... to root html * Fixing bad merge * Removing explicit content type so superagent will guess corectly (#2685) * Fixing merge and unit tests * Adding create team UI * Fixing signup flows * Adding LDAP unit tests and enterprise unit test helper (#2702) * Add the ability to reset MFA from the commandline (#2706) * Fixing compliance unit tests * Fixing client side tests * Adding open server to system console * Moving websocket connection * Fixing unit test * Fixing unit tests * Fixing unit tests * Adding nickname and more LDAP unit tests (#2717) * Adding join open teams * Cleaning up all TODOs in the code * Fixing web sockets * Removing unused webockets file * PLT-2533 Add the ability to reset a user's MFA from the system console (#2715) * Add the ability to reset a user's MFA from the system console * Add client side unit test for adminResetMfa * Reorganizing authentication to fix LDAP error message (#2723) * Fixing failing unit test * Initial upgrade db code * Adding upgrade script * Fixing upgrade script after running on core * Update OAuth and Claim routes to work with user model changes (#2739) * Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740) * Fixing team invite ldap login call (#2741) * Fixing bluebar and some img stuff * Fix all the different file upload web utils (#2743) * Fixing invalid session redirect (#2744) * Redirect on bad channel name (#2746) * Fixing a bunch of issue and removing dead code * Patch to fix error message on leave channel (#2747) * Setting EnableOpenServer to false by default * Fixing config * Fixing upgrade * Fixing reported bugs * Bug fixes for PLT-2057 * PLT-2563 Redo password recovery to use a database table (#2745) * Redo password recovery to use a database table * Update reset password audits * Split out admin and user reset password APIs to be separate * Delete password recovery when user is permanently deleted * Consolidate password resetting into a single function * Removed private channels as an option for outgoing webhooks (#2752) * PLT-2577/PLT-2552 Fixes for backstage (#2753) * Added URL to incoming webhook list * Fixed client functions for adding/removing integrations * Disallowed slash commands without trigger words * Fixed clientside handling of errors on AddCommand page * Minor auth cleanup (#2758) * Changed EditPostModal to just close if you save without making any changes (#2759) * Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756) * Fixed url in channel info modal (#2755) * Fixing reported issues * Moving to version 3 of the apis * Fixing command unit tests (#2760) * Adding team admins * Fixing DM issue * Fixing eslint error * Properly set EditPostModal's originalText state in all cases (#2762) * Update client config check to assume features is defined if server is licensed (#2772) * Fixing url link * Fixing issue with websocket crashing when sending messages to different teams --- api/web_team_hub.go | 123 ---------------------------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 api/web_team_hub.go (limited to 'api/web_team_hub.go') diff --git a/api/web_team_hub.go b/api/web_team_hub.go deleted file mode 100644 index 9d1c56f15..000000000 --- a/api/web_team_hub.go +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package api - -import ( - l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" -) - -type TeamHub struct { - connections map[*WebConn]bool - broadcast chan *model.Message - register chan *WebConn - unregister chan *WebConn - stop chan bool - teamId string -} - -func NewTeamHub(teamId string) *TeamHub { - return &TeamHub{ - broadcast: make(chan *model.Message), - register: make(chan *WebConn), - unregister: make(chan *WebConn), - connections: make(map[*WebConn]bool), - stop: make(chan bool), - teamId: teamId, - } -} - -func (h *TeamHub) Register(webConn *WebConn) { - h.register <- webConn -} - -func (h *TeamHub) Unregister(webConn *WebConn) { - h.unregister <- webConn -} - -func (h *TeamHub) Stop() { - h.stop <- true -} - -func (h *TeamHub) Start() { - go func() { - for { - select { - case webCon := <-h.register: - h.connections[webCon] = true - case webCon := <-h.unregister: - if _, ok := h.connections[webCon]; ok { - delete(h.connections, webCon) - close(webCon.Send) - } - case msg := <-h.broadcast: - for webCon := range h.connections { - if ShouldSendEvent(webCon, msg) { - select { - case webCon.Send <- msg: - default: - close(webCon.Send) - delete(h.connections, webCon) - } - } - } - case s := <-h.stop: - if s { - - l4g.Debug(utils.T("api.web_team_hun.start.debug"), h.teamId) - - for webCon := range h.connections { - webCon.WebSocket.Close() - } - - return - } - } - } - }() -} - -func (h *TeamHub) UpdateChannelAccessCache(userId string, channelId string) { - for webCon := range h.connections { - if webCon.UserId == userId { - webCon.updateChannelAccessCache(channelId) - break - } - } -} - -func ShouldSendEvent(webCon *WebConn, msg *model.Message) bool { - - if webCon.UserId == msg.UserId { - // Don't need to tell the user they are typing - if msg.Action == model.ACTION_TYPING { - return false - } - } else { - // Don't share a user's view or preference events with other users - if msg.Action == model.ACTION_CHANNEL_VIEWED { - return false - } else if msg.Action == model.ACTION_PREFERENCE_CHANGED { - return false - } else if msg.Action == model.ACTION_EPHEMERAL_MESSAGE { - // For now, ephemeral messages are sent directly to individual users - return false - } - - // Only report events to a user who is the subject of the event, or is in the channel of the event - if len(msg.ChannelId) > 0 { - allowed, ok := webCon.ChannelAccessCache[msg.ChannelId] - if !ok { - allowed = webCon.updateChannelAccessCache(msg.ChannelId) - } - - if !allowed { - return false - } - } - } - - return true -} -- cgit v1.2.3-1-g7c22