summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-09-28 09:04:52 -0400
committerGeorge Goldberg <george@gberg.me>2017-09-28 14:04:52 +0100
commit15b361094a64fe024db6d3eaf9539143cee73ce4 (patch)
tree9ff071eec6aa408b81484fb9e73340ed7ef3dbe3 /api4
parent8d662105d3049a5cd67a7bf42ab70d479d4348e2 (diff)
downloadchat-15b361094a64fe024db6d3eaf9539143cee73ce4.tar.gz
chat-15b361094a64fe024db6d3eaf9539143cee73ce4.tar.bz2
chat-15b361094a64fe024db6d3eaf9539143cee73ce4.zip
PLT-7633 (E20) Add session idle timeout config setting (#7524)
* Add session idle timeout config setting * Modify config setting name to SessionIdleTimeoutInMinutes * Small re-org of if statement * Merge with latest master
Diffstat (limited to 'api4')
-rw-r--r--api4/context.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/api4/context.go b/api4/context.go
index c526f38bb..9af15d72b 100644
--- a/api4/context.go
+++ b/api4/context.go
@@ -157,6 +157,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
c.Err = model.NewAppError("ServeHTTP", "api.context.token_provided.app_error", nil, "token="+token, http.StatusUnauthorized)
} else {
c.Session = *session
+ c.App.UpdateLastActivityAtIfNeeded(*session)
}
}