summaryrefslogtreecommitdiffstats
path: root/api/context.go
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 /api/context.go
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 'api/context.go')
-rw-r--r--api/context.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/api/context.go b/api/context.go
index 13f0f2c42..2dcf51e10 100644
--- a/api/context.go
+++ b/api/context.go
@@ -162,7 +162,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
if len(token) != 0 {
- session := GetSession(token)
+ session := GetSession(c.T, token)
if session == nil || session.IsExpired() {
c.RemoveSessionCookie(w, r)
@@ -515,14 +515,14 @@ func Handle404(w http.ResponseWriter, r *http.Request) {
RenderWebError(err, w, r)
}
-func GetSession(token string) *model.Session {
+func GetSession(T goi18n.TranslateFunc, token string) *model.Session {
var session *model.Session
if ts, ok := sessionCache.Get(token); ok {
session = ts.(*model.Session)
}
if session == nil {
- if sessionResult := <-Srv.Store.Session().Get(token); sessionResult.Err != nil {
+ if sessionResult := <-Srv.Store.Session().Get(T, token); sessionResult.Err != nil {
l4g.Error("Invalid session token=" + token + ", err=" + sessionResult.Err.DetailedError)
} else {
session = sessionResult.Data.(*model.Session)
@@ -551,9 +551,9 @@ func GetMultiSessionCookieTokens(r *http.Request) []string {
return []string{}
}
-func FindMultiSessionForTeamId(r *http.Request, teamId string) (int64, *model.Session) {
+func FindMultiSessionForTeamId(T goi18n.TranslateFunc, r *http.Request, teamId string) (int64, *model.Session) {
for index, token := range GetMultiSessionCookieTokens(r) {
- s := GetSession(token)
+ s := GetSession(T, token)
if s != nil && !s.IsExpired() && s.TeamId == teamId {
return int64(index), s
}