diff --git a/services/web/app/src/infrastructure/RedirectManager.js b/services/web/app/src/infrastructure/RedirectManager.js index f5aadfb589..4f046974bc 100644 --- a/services/web/app/src/infrastructure/RedirectManager.js +++ b/services/web/app/src/infrastructure/RedirectManager.js @@ -63,15 +63,6 @@ module.exports = RedirectManager = { ;({ url } = target) } - // Special handling for redirecting to v1, to ensure that query params - // are encoded - if (target.authWithV1) { - url = `/sign_in_to_v1?${querystring.stringify({ - return_to: url + getQueryString(req) - })}` - return res.redirect(code, url) - } - if (target.baseUrl != null) { url = `${target.baseUrl}${url}` } diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index da0a413e57..a14080fb79 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -174,14 +174,7 @@ block content div a(id="sessions-link", href="/user/sessions") #{translate("manage_sessions")} - if settings.overleaf && !hasFeature('oauth') && !previewOauth - hr - p - | To manage your account's connection to Google, Twitter, ORCID and IEEE, please - | - a(href="/sign_in_to_v1?return_to=/users/edit#linked-accounts") click here - | . - else if hasFeature('oauth') || previewOauth + if hasFeature('oauth') || previewOauth hr include settings/user-oauth diff --git a/services/web/test/acceptance/config/settings.test.coffee b/services/web/test/acceptance/config/settings.test.coffee index b493d65263..481d00dc8e 100644 --- a/services/web/test/acceptance/config/settings.test.coffee +++ b/services/web/test/acceptance/config/settings.test.coffee @@ -141,7 +141,6 @@ module.exports = }, '/redirect/qs': '/destination/qs' '/docs_v1': { - authWithV1: true url: '/docs' } diff --git a/services/web/test/acceptance/src/RedirectUrlsTests.js b/services/web/test/acceptance/src/RedirectUrlsTests.js index 4d9f93842d..46caeaa655 100644 --- a/services/web/test/acceptance/src/RedirectUrlsTests.js +++ b/services/web/test/acceptance/src/RedirectUrlsTests.js @@ -85,13 +85,4 @@ describe('RedirectUrls', function() { return done() } )) - - it('redirects to /sign_in_to_v1 with authWithV1 setting', done => - assertRedirect( - 'get', - '/docs_v1?zip_uri=http%3A%2F%2Foverleaf.test%2Ffoo%3Fbar%3Dbaz%26qux%3Dthing&bar=baz', - 302, - '/sign_in_to_v1?return_to=%2Fdocs%3Fzip_uri%3Dhttp%253A%252F%252Foverleaf.test%252Ffoo%253Fbar%253Dbaz%2526qux%253Dthing%26bar%3Dbaz', - done - )) })