clsi cookies are given an expire time via settings file

This commit is contained in:
Henry Oswald 2016-05-05 16:50:18 +01:00
parent b00bd5cd94
commit ed4fdd48d7
2 changed files with 3 additions and 3 deletions

View file

@ -10,7 +10,6 @@ buildKey = (project_id)->
clsiCookiesEnabled = Settings.clsiCookieKey? and Settings.clsiCookieKey.length != 0
ONE_WEEK_IN_SECONDS = 60 * 60 * 24 * 7
module.exports = ClsiCookieManager =
@ -45,7 +44,7 @@ module.exports = ClsiCookieManager =
serverId = ClsiCookieManager._parseServerIdFromResponse(response)
multi = rclient.multi()
multi.set buildKey(project_id), serverId
multi.expire buildKey(project_id), ONE_WEEK_IN_SECONDS
multi.expire buildKey(project_id), Settings.clsi_cookie_expire_length
multi.exec (err)->
callback(err, serverId)

View file

@ -30,6 +30,7 @@ describe "ClsiCookieManager", ->
apis:
clsi:
url: "http://clsi.example.com"
clsi_cookie_expire_length: Math.random()
clsiCookieKey: "coooookie"
@requires =
"redis-sharelatex" :
@ -89,7 +90,7 @@ describe "ClsiCookieManager", ->
it "should set the server id with a ttl", (done)->
@ClsiCookieManager.setServerId @project_id, @response, (err)=>
@redisMulti.set.calledWith("clsiserver:#{@project_id}", "clsi-8").should.equal true
@redisMulti.expire.calledWith("clsiserver:#{@project_id}", 60 * 60 * 24 * 7).should.equal true
@redisMulti.expire.calledWith("clsiserver:#{@project_id}", @settings.clsi_cookie_expire_length).should.equal true
done()
it "should return the server id", (done)->