From 8029bf34f49205cac5ecc7ee75ca00c32e1d7721 Mon Sep 17 00:00:00 2001 From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Tue, 5 Jul 2022 19:34:39 -0500 Subject: [PATCH] passport auth integrated to login route --- loaders/passport.js | 2 +- routes/login.js | 13 ++++++++----- services/Auth.js | 5 +---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/loaders/passport.js b/loaders/passport.js index 23db773..d926d1f 100644 --- a/loaders/passport.js +++ b/loaders/passport.js @@ -20,7 +20,7 @@ module.exports = (app) => { passport.use(new LocalStrategy(async (email, password, done) => { try { - const response = await LoginService(email, password); + const response = await LoginService({ email: email, password: password }); return done(null, response); } catch(e) { return done(e); diff --git a/routes/login.js b/routes/login.js index b67065d..c8e1674 100644 --- a/routes/login.js +++ b/routes/login.js @@ -3,10 +3,11 @@ const { LoginService } = require('../services/Auth'); module.exports = (app, passport) => { app.use('/api/login', loginRouter); - // loginRouter.use(passport.authenticate('local')); - loginRouter.route('/').post(async (req, res, next) => { - console.log('login post got called'); + app.use('/api/login', passport.authenticate('local')); + + loginRouter.post('/', async (req, res, next) => { + console.log('login called'); const { email, password } = req.body; /** @@ -19,10 +20,12 @@ module.exports = (app, passport) => { * authenticated: boolean, * user: { email, password } */ - + try { const data = await LoginService(email, password); - res.status(200).send(data); + const { session, userProfile } = data; + + res.status(200).send({ session, userProfile }); } catch(e) { next(e); } diff --git a/services/Auth.js b/services/Auth.js index 45d1c33..a98480d 100644 --- a/services/Auth.js +++ b/services/Auth.js @@ -30,10 +30,7 @@ async function LoginService(email, password) { userProfile: fullUserProfile.rows[0] } } else { - return { - session: 'not found', - userProfile: 'not found' - } + throw new Error("Auth unsuccessful."); } } catch(e) { await client.query("ROLLBACK");