Optimize code and streamline flow.
- Optimize code and streamline flow. - Add return statements for error display. - Invalidate status vars and TTLs on User Model. - Build Observable for findOrCreate
This commit is contained in:
Mrugesh Mohapatra
committed by
Berkeley Martinez
Berkeley Martinez
parent
f8c818e7e7
commit
e006f5c97d
@@ -139,8 +139,16 @@ function buildDisplayChallenges(
|
||||
module.exports = function(app) {
|
||||
const router = app.loopback.Router();
|
||||
const api = app.loopback.Router();
|
||||
<<<<<<< HEAD
|
||||
const { User, Email } = app.models;
|
||||
const map$ = cachedMap(app.models);
|
||||
=======
|
||||
const User = app.models.User;
|
||||
const AccessToken = app.models.AccessToken;
|
||||
const Block = app.models.Block;
|
||||
const { Email } = app.models;
|
||||
const map$ = cachedMap(Block);
|
||||
>>>>>>> Optimize code and streamline flow.
|
||||
function findUserByUsername$(username, fields) {
|
||||
return observeQuery(
|
||||
User,
|
||||
@@ -152,6 +160,9 @@ module.exports = function(app) {
|
||||
);
|
||||
}
|
||||
|
||||
AccessToken.findOne$ = Observable.fromNodeCallback(
|
||||
AccessToken.findOne, AccessToken);
|
||||
|
||||
router.get('/login', function(req, res) {
|
||||
res.redirect(301, '/signin');
|
||||
});
|
||||
@@ -169,10 +180,8 @@ module.exports = function(app) {
|
||||
router.get('/email-signin', getEmailSignin);
|
||||
router.get('/deprecated-signin', getDepSignin);
|
||||
router.get('/update-email', getUpdateEmail);
|
||||
router.get('/passwordless-signin', getPasswordlessSignin);
|
||||
router.get('/passwordless-signup', getPasswordlessSignup);
|
||||
api.post('/passwordless-signin', postPasswordlessSignin);
|
||||
api.post('/passwordless-signup', postPasswordlessSignup);
|
||||
router.get('/passwordless-auth', getPasswordlessAuth);
|
||||
api.post('/passwordless-auth', postPasswordlessAuth);
|
||||
router.get(
|
||||
'/delete-my-account',
|
||||
sendNonUserToMap,
|
||||
@@ -252,117 +261,24 @@ module.exports = function(app) {
|
||||
});
|
||||
}
|
||||
|
||||
function postPasswordlessSignup(req, res) {
|
||||
if (req.user) {
|
||||
function postPasswordlessAuth(req, res) {
|
||||
if (req.user || !(req.body && req.body.email)) {
|
||||
return res.redirect('/');
|
||||
}
|
||||
|
||||
if (req.body && req.body.email) {
|
||||
var userObj = {
|
||||
username: 'fcc' + uuid.v4().slice(0, 8),
|
||||
email: req.body.email,
|
||||
emailVerified: false
|
||||
};
|
||||
var data = { or: [
|
||||
{ username: userObj.username },
|
||||
{ email: userObj.email },
|
||||
{ emailVerified: userObj.emailVerified }
|
||||
]};
|
||||
return User.findOrCreate({where: data}, userObj, function(err, user) {
|
||||
if (err) {
|
||||
throw err;
|
||||
}
|
||||
User.requestAuthLink(user.email, 'user-request-sign-up.ejs');
|
||||
});
|
||||
} else {
|
||||
return res.redirect('/');
|
||||
}
|
||||
}
|
||||
|
||||
function postPasswordlessSignin(req, res) {
|
||||
if (req.user) {
|
||||
return res.redirect('/');
|
||||
}
|
||||
|
||||
if (req.body && req.body.email) {
|
||||
var data = { or: [
|
||||
{ email: req.body.email },
|
||||
{ emailVerified: true }
|
||||
]};
|
||||
return User.findOne$({ where: { data }})
|
||||
.map(user => {
|
||||
User.requestAuthLink(user.email, 'user-request-sign-in.ejs');
|
||||
});
|
||||
} else {
|
||||
return res.redirect('/');
|
||||
}
|
||||
}
|
||||
|
||||
function getPasswordlessSignup(req, res, next) {
|
||||
if (req.user) {
|
||||
req.flash('info', {
|
||||
msg: 'Hey, looks like you’re already signed in.'
|
||||
});
|
||||
return res.redirect('/');
|
||||
}
|
||||
|
||||
const defaultErrorMsg = [
|
||||
'Oops, something is not right, ',
|
||||
'please request a fresh link to sign in.'].join('');
|
||||
|
||||
if (!req.query || !req.query.email || !req.query.token) {
|
||||
req.flash('info', { msg: defaultErrorMsg });
|
||||
return res.redirect('/email-signup');
|
||||
}
|
||||
|
||||
const email = req.query.email;
|
||||
/* const tokenId = req.query.token; */
|
||||
|
||||
return User.findOne$({ where: { email }})
|
||||
.map(user => {
|
||||
return user.createAccessToken(
|
||||
{ ttl: User.settings.ttl }, (err, accessToken) => {
|
||||
if (err) { throw err; }
|
||||
|
||||
var config = {
|
||||
signed: !!req.signedCookies,
|
||||
maxAge: accessToken.ttl
|
||||
};
|
||||
|
||||
if (accessToken && accessToken.id) {
|
||||
debug('setting cookies');
|
||||
res.cookie('access_token', accessToken.id, config);
|
||||
res.cookie('userId', accessToken.userId, config);
|
||||
}
|
||||
|
||||
return req.logIn({
|
||||
id: accessToken.userId.toString() }, err => {
|
||||
if (err) { return next(err); }
|
||||
|
||||
debug('user logged in');
|
||||
|
||||
if (req.session && req.session.returnTo) {
|
||||
var redirectTo = req.session.returnTo;
|
||||
if (redirectTo === '/map-aside') {
|
||||
redirectTo = '/map';
|
||||
}
|
||||
return res.redirect(redirectTo);
|
||||
}
|
||||
|
||||
req.flash('success', { msg:
|
||||
'Success! You have signed in to your account. Happy Coding!'
|
||||
});
|
||||
return res.redirect('/');
|
||||
});
|
||||
return User.requestAuthLink(req.body.email, 'user-request-sign-in.ejs')
|
||||
.then(msg => {
|
||||
return res.status(200).send({ message: msg });
|
||||
})
|
||||
.catch(err => {
|
||||
debug(err);
|
||||
return res.status(200).send({
|
||||
message: 'Oops, something is not right, please try again later.'
|
||||
});
|
||||
})
|
||||
.subscribe(
|
||||
() => {},
|
||||
next
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
function getPasswordlessSignin(req, res, next) {
|
||||
function getPasswordlessAuth(req, res, next) {
|
||||
if (req.user) {
|
||||
req.flash('info', {
|
||||
msg: 'Hey, looks like you’re already signed in.'
|
||||
@@ -370,9 +286,8 @@ module.exports = function(app) {
|
||||
return res.redirect('/');
|
||||
}
|
||||
|
||||
const defaultErrorMsg = [
|
||||
'Oops, something is not right, ',
|
||||
'please request a fresh link to sign in.'].join('');
|
||||
const defaultErrorMsg = [ 'Oops, something is not right, please request a ',
|
||||
'fresh link to sign in / sign up.' ].join('');
|
||||
|
||||
if (!req.query || !req.query.email || !req.query.token) {
|
||||
req.flash('info', { msg: defaultErrorMsg });
|
||||
@@ -380,10 +295,28 @@ module.exports = function(app) {
|
||||
}
|
||||
|
||||
const email = req.query.email;
|
||||
/* const tokenId = req.query.token; */
|
||||
|
||||
return User.findOne$({ where: { email }})
|
||||
.map(user => {
|
||||
|
||||
if (!user) {
|
||||
debug(`did not find a valid user with email: ${email}`);
|
||||
req.flash('info', { msg: defaultErrorMsg });
|
||||
return res.redirect('/email-signin');
|
||||
}
|
||||
|
||||
const emailVerified = true;
|
||||
const emailAuthLinkTTL = null;
|
||||
const emailVerifyTTL = null;
|
||||
user.update$({
|
||||
emailVerified, emailAuthLinkTTL, emailVerifyTTL
|
||||
})
|
||||
.do((user) => {
|
||||
user.emailVerified = emailVerified;
|
||||
user.emailAuthLinkTTL = emailAuthLinkTTL;
|
||||
user.emailVerifyTTL = emailVerifyTTL;
|
||||
});
|
||||
|
||||
return user.createAccessToken(
|
||||
{ ttl: User.settings.ttl }, (err, accessToken) => {
|
||||
if (err) { throw err; }
|
||||
|
||||
Reference in New Issue
Block a user