got token to return!
This commit is contained in:
parent
17fa8939a2
commit
a9833797a2
|
@ -17,7 +17,7 @@ passport.use('signup', new localStrategy(
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
|
|
||||||
passport.use(
|
passport.use('login',
|
||||||
new localStrategy(
|
new localStrategy(
|
||||||
{
|
{
|
||||||
usernameField: "email",
|
usernameField: "email",
|
||||||
|
@ -25,6 +25,7 @@ passport.use(
|
||||||
session: false
|
session: false
|
||||||
},
|
},
|
||||||
async (email, password, done) => {
|
async (email, password, done) => {
|
||||||
|
console.log("local strategy called")
|
||||||
try {
|
try {
|
||||||
const user: User = await UserModel.findOne({ email })
|
const user: User = await UserModel.findOne({ email })
|
||||||
console.log(`user: ${user}`)
|
console.log(`user: ${user}`)
|
||||||
|
@ -33,12 +34,13 @@ passport.use(
|
||||||
}
|
}
|
||||||
|
|
||||||
const validate: boolean = await user.isValidPassword(password)
|
const validate: boolean = await user.isValidPassword(password)
|
||||||
|
console.log(`isValidPassword? ${validate}`)
|
||||||
|
|
||||||
if (!validate) {
|
if (!validate) {
|
||||||
return done(null, false, { message: "wrong password" })
|
return done(null, false, { message: "wrong password" })
|
||||||
}
|
}
|
||||||
|
|
||||||
return done(null, false, { message: "logged in successfully" })
|
return done(null, user, { message: "logged in successfully" })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return done(error)
|
return done(error)
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,11 +23,12 @@ passport.use('signup', new localStrategy({
|
||||||
done(err);
|
done(err);
|
||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
passport.use(new localStrategy({
|
passport.use('login', new localStrategy({
|
||||||
usernameField: "email",
|
usernameField: "email",
|
||||||
passwordField: "password",
|
passwordField: "password",
|
||||||
session: false
|
session: false
|
||||||
}, (email, password, done) => __awaiter(void 0, void 0, void 0, function* () {
|
}, (email, password, done) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
|
console.log("local strategy called");
|
||||||
try {
|
try {
|
||||||
const user = yield UserModel.findOne({ email });
|
const user = yield UserModel.findOne({ email });
|
||||||
console.log(`user: ${user}`);
|
console.log(`user: ${user}`);
|
||||||
|
@ -35,10 +36,11 @@ passport.use(new localStrategy({
|
||||||
return done(null, false, { message: "user not found" });
|
return done(null, false, { message: "user not found" });
|
||||||
}
|
}
|
||||||
const validate = yield user.isValidPassword(password);
|
const validate = yield user.isValidPassword(password);
|
||||||
|
console.log(`isValidPassword? ${validate}`);
|
||||||
if (!validate) {
|
if (!validate) {
|
||||||
return done(null, false, { message: "wrong password" });
|
return done(null, false, { message: "wrong password" });
|
||||||
}
|
}
|
||||||
return done(null, false, { message: "logged in successfully" });
|
return done(null, user, { message: "logged in successfully" });
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
return done(error);
|
return done(error);
|
||||||
|
|
|
@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
||||||
};
|
};
|
||||||
import express from "express";
|
import express from "express";
|
||||||
import passport from "passport";
|
import passport from "passport";
|
||||||
|
import jwt from 'jsonwebtoken';
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
router.post("/signup", passport.authenticate("signup", { session: false }), (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
router.post("/signup", passport.authenticate("signup", { session: false }), (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
res.json({
|
res.json({
|
||||||
|
@ -16,39 +17,28 @@ router.post("/signup", passport.authenticate("signup", { session: false }), (req
|
||||||
user: req.user
|
user: req.user
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
router.post("/login", passport.authenticate('local'), function (req, res) {
|
// router.post("/login", passport.authenticate('local'),
|
||||||
console.log("BOOM!");
|
// function(req, res) {
|
||||||
});
|
// res.json({ res })
|
||||||
// router.post(
|
// })
|
||||||
// '/login',
|
router.post('/login', (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
// async (req, res, next) => {
|
passport.authenticate('login', (err, user, info) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
// passport.authenticate(
|
try {
|
||||||
// 'login',
|
if (err || !user) {
|
||||||
// async (err, user, info) => {
|
const error = new Error('An error occurred.');
|
||||||
// try {
|
return next(error);
|
||||||
// if (err || !user) {
|
}
|
||||||
// const error = new Error('An error occurred.');
|
req.login(user, { session: false }, (error) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
//
|
if (error)
|
||||||
// return next(error);
|
return next(error);
|
||||||
// }
|
const body = { _id: user._id, email: user.email };
|
||||||
//
|
const token = jwt.sign({ user: body }, 'TOP_SECRET');
|
||||||
// req.login(
|
return res.json({ token });
|
||||||
// user,
|
}));
|
||||||
// { session: false },
|
}
|
||||||
// async (error) => {
|
catch (error) {
|
||||||
// if (error) return next(error);
|
return next(error);
|
||||||
//
|
}
|
||||||
// const body = { _id: user._id, email: user.email };
|
}))(req, res, next);
|
||||||
// const token = jwt.sign({ user: body }, 'TOP_SECRET');
|
}));
|
||||||
//
|
|
||||||
// return res.json({ token });
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
// } catch (error) {
|
|
||||||
// return next(error);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// )(req, res, next);
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|
|
@ -12,41 +12,41 @@ router.post("/signup",
|
||||||
user: req.user
|
user: req.user
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
router.post("/login", passport.authenticate('local'),
|
// router.post("/login", passport.authenticate('local'),
|
||||||
function(req, res) {
|
// function(req, res) {
|
||||||
console.log("BOOM!")
|
// res.json({ res })
|
||||||
})
|
// })
|
||||||
// router.post(
|
router.post(
|
||||||
// '/login',
|
'/login',
|
||||||
// async (req, res, next) => {
|
async (req, res, next) => {
|
||||||
// passport.authenticate(
|
passport.authenticate(
|
||||||
// 'login',
|
'login',
|
||||||
// async (err, user, info) => {
|
async (err, user, info) => {
|
||||||
// try {
|
try {
|
||||||
// if (err || !user) {
|
if (err || !user) {
|
||||||
// const error = new Error('An error occurred.');
|
const error = new Error('An error occurred.');
|
||||||
//
|
|
||||||
// return next(error);
|
return next(error);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// req.login(
|
req.login(
|
||||||
// user,
|
user,
|
||||||
// { session: false },
|
{ session: false },
|
||||||
// async (error) => {
|
async (error) => {
|
||||||
// if (error) return next(error);
|
if (error) return next(error);
|
||||||
//
|
|
||||||
// const body = { _id: user._id, email: user.email };
|
const body = { _id: user._id, email: user.email };
|
||||||
// const token = jwt.sign({ user: body }, 'TOP_SECRET');
|
const token = jwt.sign({ user: body }, 'TOP_SECRET');
|
||||||
//
|
|
||||||
// return res.json({ token });
|
return res.json({ token });
|
||||||
// }
|
}
|
||||||
// );
|
);
|
||||||
// } catch (error) {
|
} catch (error) {
|
||||||
// return next(error);
|
return next(error);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// )(req, res, next);
|
)(req, res, next);
|
||||||
// }
|
}
|
||||||
// );
|
);
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|
Loading…
Reference in New Issue