From 298ee2dbb494c733583a6b5831fc67c9f6c79c8d Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Tue, 25 Sep 2018 10:06:24 +0100 Subject: [PATCH] Fix v1 return to path --- .../coffee/Features/TokenAccess/TokenAccessController.coffee | 2 +- services/web/test/acceptance/coffee/TokenAccessTests.coffee | 2 +- .../unit/coffee/TokenAccess/TokenAccessControllerTests.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee b/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee index 504a7fc24f..a0bd471630 100644 --- a/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee +++ b/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee @@ -37,7 +37,7 @@ module.exports = TokenAccessController = if !projectExists and settings.overleaf logger.log {token, userId}, "[TokenAccess] no project found for this token" - return res.redirect(302, "/sign_in_to_v1?return_to=#{settings.overleaf.host}/#{token}") + return res.redirect(302, "/sign_in_to_v1?return_to=/#{token}") if !project? logger.log {token, userId}, "[TokenAccess] no token-based project found for readAndWrite token" diff --git a/services/web/test/acceptance/coffee/TokenAccessTests.coffee b/services/web/test/acceptance/coffee/TokenAccessTests.coffee index 8636012f23..31be9523ba 100644 --- a/services/web/test/acceptance/coffee/TokenAccessTests.coffee +++ b/services/web/test/acceptance/coffee/TokenAccessTests.coffee @@ -422,7 +422,7 @@ describe 'TokenAccess', -> try_read_and_write_token_access(@owner, unimportedV1Token, (response, body) => expect(response.statusCode).to.equal 302 expect(response.headers.location).to.equal( - '/sign_in_to_v1?return_to=http://overleaf.test:5000/123abc' + '/sign_in_to_v1?return_to=/123abc' ) , done) diff --git a/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee b/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee index a94a502396..a0177a79a7 100644 --- a/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee +++ b/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee @@ -254,7 +254,7 @@ describe "TokenAccessController", -> expect(@res.redirect.callCount).to.equal 1 expect(@res.redirect.calledWith( 302, - '/sign_in_to_v1?return_to=http://overleaf.test:5000/123abc' + '/sign_in_to_v1?return_to=/123abc' )).to.equal true done()