diff options
| author | Corey Hulen <corey@hulen.com> | 2016-07-21 08:36:11 -0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-21 12:36:11 -0400 |
| commit | 946302d9a29cbf5702da9e18a52b59864a18c69e (patch) | |
| tree | 2cd2520fc57c2a0681cc938b5e1adcd7b01c8d44 /store | |
| parent | bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3 (diff) | |
| download | chat-946302d9a29cbf5702da9e18a52b59864a18c69e.tar.gz chat-946302d9a29cbf5702da9e18a52b59864a18c69e.tar.bz2 chat-946302d9a29cbf5702da9e18a52b59864a18c69e.zip | |
PLT-3691 Fixing mobile session (#3652)
* PLT-3691 Fixing mobile session
* Fixing unit tests
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_session_store.go | 4 | ||||
| -rw-r--r-- | store/sql_session_store_test.go | 4 | ||||
| -rw-r--r-- | store/store.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/store/sql_session_store.go b/store/sql_session_store.go index 9ad3a5efa..94694267c 100644 --- a/store/sql_session_store.go +++ b/store/sql_session_store.go @@ -283,12 +283,12 @@ func (me SqlSessionStore) UpdateRoles(userId, roles string) StoreChannel { return storeChannel } -func (me SqlSessionStore) UpdateDeviceId(id, deviceId string) StoreChannel { +func (me SqlSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) StoreChannel { storeChannel := make(StoreChannel) go func() { result := StoreResult{} - if _, err := me.GetMaster().Exec("UPDATE Sessions SET DeviceId = :DeviceId WHERE Id = :Id", map[string]interface{}{"DeviceId": deviceId, "Id": id}); err != nil { + if _, err := me.GetMaster().Exec("UPDATE Sessions SET DeviceId = :DeviceId, ExpiresAt = :ExpiresAt WHERE Id = :Id", map[string]interface{}{"DeviceId": deviceId, "Id": id, "ExpiresAt": expiresAt}); err != nil { result.Err = model.NewLocAppError("SqlSessionStore.UpdateDeviceId", "store.sql_session.update_device_id.app_error", nil, err.Error()) } else { result.Data = deviceId diff --git a/store/sql_session_store_test.go b/store/sql_session_store_test.go index d7f07254d..e64a350ba 100644 --- a/store/sql_session_store_test.go +++ b/store/sql_session_store_test.go @@ -156,7 +156,7 @@ func TestSessionUpdateDeviceId(t *testing.T) { s1.UserId = model.NewId() Must(store.Session().Save(&s1)) - if rs1 := (<-store.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs1.Err != nil { + if rs1 := (<-store.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)); rs1.Err != nil { t.Fatal(rs1.Err) } @@ -164,7 +164,7 @@ func TestSessionUpdateDeviceId(t *testing.T) { s2.UserId = model.NewId() Must(store.Session().Save(&s2)) - if rs2 := (<-store.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs2.Err != nil { + if rs2 := (<-store.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)); rs2.Err != nil { t.Fatal(rs2.Err) } } diff --git a/store/store.go b/store/store.go index 8efec5e54..ac424a944 100644 --- a/store/store.go +++ b/store/store.go @@ -163,7 +163,7 @@ type SessionStore interface { PermanentDeleteSessionsByUser(teamId string) StoreChannel UpdateLastActivityAt(sessionId string, time int64) StoreChannel UpdateRoles(userId string, roles string) StoreChannel - UpdateDeviceId(id string, deviceId string) StoreChannel + UpdateDeviceId(id string, deviceId string, expiresAt int64) StoreChannel AnalyticsSessionCount() StoreChannel } |