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

expire cookie key from setting file length

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

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

@@ -44,7 +44,7 @@ module.exports = ClsiCookieManager =
 		serverId = ClsiCookieManager._parseServerIdFromResponse(response)
 		serverId = ClsiCookieManager._parseServerIdFromResponse(response)
 		multi = rclient.multi()
 		multi = rclient.multi()
 		multi.set buildKey(project_id), serverId
 		multi.set buildKey(project_id), serverId
-		multi.expire buildKey(project_id), Settings.clsi_cookie_expire_length
+		multi.expire buildKey(project_id), Settings.clsi_cookie_expire_length_seconds
 		multi.exec (err)->
 		multi.exec (err)->
 			callback(err, serverId)
 			callback(err, serverId)
 
 

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

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