From ca895ae1b1484259a199b0e8fc55b2e99b07cf0c Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Tue, 25 Sep 2018 09:37:22 +0100 Subject: [PATCH] Redirect to v1 via sign in link --- .../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 d5d704703d..504a7fc24f 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, settings.overleaf.host + '/' + token) + return res.redirect(302, "/sign_in_to_v1?return_to=#{settings.overleaf.host}/#{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 b0fbd7a0a1..a2e6a1ee7c 100644 --- a/services/web/test/acceptance/coffee/TokenAccessTests.coffee +++ b/services/web/test/acceptance/coffee/TokenAccessTests.coffee @@ -422,6 +422,6 @@ describe 'TokenAccess', -> try_read_and_write_token_access(@owner, unimportedV1Token, (response, body) => expect(response.statusCode).to.equal 302 expect(response.headers.location).to.equal( - 'http://overleaf.test:5000/123abc' + '/sign_in_to_v1?return_to=http://overleaf.test:5000/123abc' ) , done) diff --git a/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee b/services/web/test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee index 97312ab415..a94a502396 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, - 'http://overleaf.test:5000/123abc' + '/sign_in_to_v1?return_to=http://overleaf.test:5000/123abc' )).to.equal true done()