Skip to content
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

Jump to bottom

Staging login callback redirect #291

Merged
merged 6 commits into from
Jun 1, 2023
Merged

Staging login callback redirect #291

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0a99bd
Staging login tests
js0mmer May 5, 2023
b6752a9
Change callbackURL to localhost for testing
js0mmer May 5, 2023
e26fd95
Testing callbackURL with localhost again
js0mmer May 6, 2023
53c2f0c
More staging login redirect tests
js0mmer May 6, 2023
ef9596e
Merge branch 'master' into jacob/staging-login
js0mmer Jun 1, 2023
0e8634f
Restore callback url
js0mmer Jun 1, 2023
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
11 changes: 11 additions & 0 deletions api/src/controllers/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ router.get('/auth/google',
passport.authenticate('google', {
scope: ['https://www.googleapis.com/auth/userinfo.profile',
'https://www.googleapis.com/auth/userinfo.email'],
state: req.headers.host
})(req, res);
}
);
Expand All @@ -46,6 +47,16 @@ router.get('/auth/google',
*/
router.get('/auth/google/callback', function (req, res) {
const returnTo = req.session.returnTo;
let host: string = req.query.state as string;
// all staging auths will redirect their callback to prod since all callback URLs must be registered
// with google cloud for security reasons and it isn't feasible to register the callback URLs for all
// staging instances
// if we are not on a staging instance (on prod or local) but original host is a staging instance, redirect back to host
if (host.startsWith('staging-') && !req.headers.host?.startsWith('staging')) {
// req.url doesn't include /api/users part, only /auth/google/callback? and whatever params after that
res.redirect('https://' + host + '/api/users' + req.url);
return;
}
passport.authenticate('google', { failureRedirect: '/', session: true },
// provides user information to determine whether or not to authenticate
function (err, user, info) {
Expand Down