gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert: allow user to redirect after signin (#40160)

Browse Source 
This reverts commit a7eba00690.
This commit is contained in:
Mrugesh Mohapatra
2020-11-02 19:24:24 +05:30
committed by GitHub
parent e6b29dcc2c
commit 5f67843e50
4 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api-server/server/boot/authentication.js
View File

@ -39,12 +39,6 @@ module.exports = function enableAuthentication(app) {
const ifNoUserRedirectHome = ifNoUserRedirectTo(homeLocation);
const saveAuthCookies = saveResponseAuthCookies();
const loginSuccessRedirect = loginRedirect();
const addRedirect = (req, res, next) => {
if (req && req.query && req.query.returnTo) {
req.query.returnTo = `${homeLocation}/${req.query.returnTo}`;
}
return next();
};
const api = app.loopback.Router();
// Use a local mock strategy for signing in if we are in dev mode.
@ -53,18 +47,27 @@ module.exports = function enableAuthentication(app) {
if (process.env.LOCAL_MOCK_AUTH === 'true') {
api.get(
'/signin',
addRedirect,
passport.authenticate('devlogin'),
saveAuthCookies,
loginSuccessRedirect
);
} else {
api.get('/signin', addRedirect, ifUserRedirect, (req, res, next) => {
const state = req.query.returnTo
? Buffer.from(req.query.returnTo).toString('base64')
: null;
return passport.authenticate('auth0-login', { state })(req, res, next);
});
api.get(
'/signin',
(req, res, next) => {
if (req && req.query && req.query.returnTo) {
req.query.returnTo = `${homeLocation}/${req.query.returnTo}`;
}
return next();
},
ifUserRedirect,
(req, res, next) => {
const state = req.query.returnTo
? Buffer.from(req.query.returnTo).toString('base64')
: null;
return passport.authenticate('auth0-login', { state })(req, res, next);
}
);
api.get(
'/auth/auth0/callback',