summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-20 10:18:11 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-20 10:18:11 -0600
commit3ac5ecf0e98823cab22c77d3a56393cbe6bbc19a (patch)
treecc580dd16ec079650fb58f3f48c559d11659579a /web
parent11c035aef45fbc6dfbc360123611108a199eca79 (diff)
downloadchat-3ac5ecf0e98823cab22c77d3a56393cbe6bbc19a.tar.gz
chat-3ac5ecf0e98823cab22c77d3a56393cbe6bbc19a.tar.bz2
chat-3ac5ecf0e98823cab22c77d3a56393cbe6bbc19a.zip
PLT-7 adding loc db calls for session table
Diffstat (limited to 'web')
-rw-r--r--web/web.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/web.go b/web/web.go
index f9a899b6f..df65d6da8 100644
--- a/web/web.go
+++ b/web/web.go
@@ -238,7 +238,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
// We still might be able to switch to this team because we've logged in before
- _, session := api.FindMultiSessionForTeamId(r, team.Id)
+ _, session := api.FindMultiSessionForTeamId(c.T, r, team.Id)
if session != nil {
w.Header().Set(model.HEADER_TOKEN, session.Token)
lastViewChannelName := "town-square"
@@ -496,7 +496,7 @@ func checkSessionSwitch(c *api.Context, w http.ResponseWriter, r *http.Request,
// We are logged into a different team. Lets see if we have another
// session in the cookie that will give us access.
if c.Session.TeamId != team.Id {
- index, session := api.FindMultiSessionForTeamId(r, team.Id)
+ index, session := api.FindMultiSessionForTeamId(c.T, r, team.Id)
if session == nil {
// redirect to login
http.Redirect(w, r, c.GetSiteURL()+"/"+team.Name+"/?redirect="+url.QueryEscape(r.URL.Path), http.StatusTemporaryRedirect)
@@ -985,7 +985,7 @@ func getAccessToken(c *api.Context, w http.ResponseWriter, r *http.Request) {
session := &model.Session{UserId: user.Id, TeamId: user.TeamId, Roles: user.Roles, IsOAuth: true}
- if result := <-api.Srv.Store.Session().Save(session); result.Err != nil {
+ if result := <-api.Srv.Store.Session().Save(c.T, session); result.Err != nil {
c.Err = model.NewAppError("getAccessToken", "server_error: Encountered internal server error while saving session to database", "")
return
} else {