Просмотр исходного кода

clsi cookies are given an expire time via settings file

Henry Oswald 10 лет назад
Родитель
Сommit
ed4fdd48d7

+ 1 - 2
services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee

@@ -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)
 

+ 2 - 1
services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee

@@ -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)->