summaryrefslogtreecommitdiffstats
path: root/model/session.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-31 12:59:32 -0400
committerGitHub <noreply@github.com>2017-07-31 12:59:32 -0400
commit59992ae4a4638006ec1489dd834151b258c1728c (patch)
tree8bc5c0fa8f6a4d6a40026c965bd865c1110af838 /model/session.go
parented62660e96528920b0ecb8c755265c6c8d2756c4 (diff)
downloadchat-59992ae4a4638006ec1489dd834151b258c1728c.tar.gz
chat-59992ae4a4638006ec1489dd834151b258c1728c.tar.bz2
chat-59992ae4a4638006ec1489dd834151b258c1728c.zip
PLT-6763 Implement user access tokens and new roles (server-side) (#6972)
* Implement user access tokens and new roles * Update config.json * Add public post permission to apiv3 * Remove old comment * Fix model unit test * Updates to store per feedback * Updates per feedback from CS
Diffstat (limited to 'model/session.go')
-rw-r--r--model/session.go22
1 files changed, 14 insertions, 8 deletions
diff --git a/model/session.go b/model/session.go
index 4f3547582..960c18cbf 100644
--- a/model/session.go
+++ b/model/session.go
@@ -10,13 +10,17 @@ import (
)
const (
- SESSION_COOKIE_TOKEN = "MMAUTHTOKEN"
- SESSION_COOKIE_USER = "MMUSERID"
- SESSION_CACHE_SIZE = 35000
- SESSION_PROP_PLATFORM = "platform"
- SESSION_PROP_OS = "os"
- SESSION_PROP_BROWSER = "browser"
- SESSION_ACTIVITY_TIMEOUT = 1000 * 60 * 5 // 5 minutes
+ SESSION_COOKIE_TOKEN = "MMAUTHTOKEN"
+ SESSION_COOKIE_USER = "MMUSERID"
+ SESSION_CACHE_SIZE = 35000
+ SESSION_PROP_PLATFORM = "platform"
+ SESSION_PROP_OS = "os"
+ SESSION_PROP_BROWSER = "browser"
+ SESSION_PROP_TYPE = "type"
+ SESSION_PROP_USER_ACCESS_TOKEN_ID = "user_access_token_id"
+ SESSION_TYPE_USER_ACCESS_TOKEN = "UserAccessToken"
+ SESSION_ACTIVITY_TIMEOUT = 1000 * 60 * 5 // 5 minutes
+ SESSION_USER_ACCESS_TOKEN_EXPIRY = 100 * 365 // 100 years
)
type Session struct {
@@ -58,7 +62,9 @@ func (me *Session) PreSave() {
me.Id = NewId()
}
- me.Token = NewId()
+ if me.Token == "" {
+ me.Token = NewId()
+ }
me.CreateAt = GetMillis()
me.LastActivityAt = me.CreateAt