Skip to content

Include callbackUrl in newUser page #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 6, 2020
Merged

Include callbackUrl in newUser page #790

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66b105a
Include callbackUrl in newUser page
ramiel Oct 20, 2020
e6a978c
Update src/server/routes/callback.js
ramiel Oct 24, 2020
cb2de40
Update src/server/routes/callback.js
ramiel Oct 24, 2020
2ac4b41
Merge branch 'main' into callbackurl-welcome
ramiel Nov 2, 2020
d29b550
Merge branch 'canary' into callbackurl-welcome
ndom91 Dec 6, 2020
cfcf083
Merge branch 'canary' into callbackurl-welcome
ndom91 Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/server/routes/callback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down