From 2208af7141aba9113baeb1dc50046c6c5197f1ef Mon Sep 17 00:00:00 2001 From: kirrg001 Date: Wed, 7 Nov 2018 14:47:11 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20redirect=20issue=20with?= =?UTF-8?q?=20private=20sites=20(#9960)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #9959 This issue existed because the logic assumed that if there were no query parameters then there would be no `query` object. However this is not the case. What we really wanted to check was for the existence of an "r" query param - the code has been refactor to explicitly do this now. --- core/server/apps/private-blogging/lib/middleware.js | 2 +- core/server/apps/private-blogging/tests/middleware_spec.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/server/apps/private-blogging/lib/middleware.js b/core/server/apps/private-blogging/lib/middleware.js index b042cb1dfe13..c1d0e01144d0 100644 --- a/core/server/apps/private-blogging/lib/middleware.js +++ b/core/server/apps/private-blogging/lib/middleware.js @@ -29,7 +29,7 @@ function verifySessionHash(salt, hash) { } function getRedirectUrl(query) { - var redirect = decodeURIComponent(query ? query.r : '/'); + var redirect = decodeURIComponent(query.r || '/'); try { return url.parse(redirect, config.urlFor('home', true)).pathname; } catch (e) { diff --git a/core/server/apps/private-blogging/tests/middleware_spec.js b/core/server/apps/private-blogging/tests/middleware_spec.js index 522f1a262e50..7ea4a8397d1b 100644 --- a/core/server/apps/private-blogging/tests/middleware_spec.js +++ b/core/server/apps/private-blogging/tests/middleware_spec.js @@ -34,7 +34,9 @@ describe('Private Blogging', function () { var req, res, next; beforeEach(function () { - req = {}; + req = { + query: {} + }; res = {}; apiSettingsStub = sandbox.stub(api.settings, 'read'); next = sinon.spy();