From 1379c9a79c6a3cd30c2b36fd63c8505a26d2a536 Mon Sep 17 00:00:00 2001 From: Michael Nardolillo Date: Sun, 6 Dec 2020 19:50:41 +0100 Subject: [PATCH] Include callbackUrl in newUser page (#790) * Include callbackUrl in newUser page * Update src/server/routes/callback.js Co-authored-by: Iain Collins * Update src/server/routes/callback.js Co-authored-by: Iain Collins Co-authored-by: Iain Collins Co-authored-by: Nico Domino --- src/server/routes/callback.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/routes/callback.js b/src/server/routes/callback.js index 8c5003ee4f..9ce55161bb 100644 --- a/src/server/routes/callback.js +++ b/src/server/routes/callback.js @@ -110,7 +110,7 @@ export default async (req, res, options, done) => { // e.g. option to send users to a new account landing page on initial login // Note that the callback URL is preserved, so the journey can still be resumed if (isNewUser && pages.newUser) { - return redirect(pages.newUser) + return redirect(`${pages.newUser}${pages.newUser.includes('?') ? '&' : '?'}callbackUrl=${encodeURIComponent(callbackUrl)}`) } // Callback URL is already verified at this point, so safe to use if specified @@ -200,7 +200,7 @@ export default async (req, res, options, done) => { // e.g. option to send users to a new account landing page on initial login // Note that the callback URL is preserved, so the journey can still be resumed if (isNewUser && pages.newUser) { - return redirect(pages.newUser) + return redirect(`${pages.newUser}${pages.newUser.includes('?') ? '&' : '?'}callbackUrl=${encodeURIComponent(callbackUrl)}`) } // Callback URL is already verified at this point, so safe to use if specified