Skip to content

fix (makeen-user): make passport.deserializeUser async #10

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

Open
redbmk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix (makeen-user): make passport.deserializeUser async #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions packages/makeen-user/src/libs/passport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ export default ({ jwtSecret }) => {
new JwtStrategy(
{
secretOrKey: jwtSecret,
jwtFromRequest: ExtractJwt.fromExtractors([
ExtractJwt.fromAuthHeaderWithScheme('Bearer'),
]),
jwtFromRequest: ExtractJwt.fromExtractors([ExtractJwt.fromAuthHeaderWithScheme('Bearer')]),
passReqToCallback: true,
},
async (req, id, done) => {
const { UserRepository, AccountRepository, User } = req.app.modules.get(
'makeen.user',
);
const { UserRepository, AccountRepository, User } = req.app.modules.get('makeen.user');
try {
const user = await UserRepository.findById(objectId(id));
const account = await AccountRepository.findById(user.accountId);
Expand Down Expand Up @@ -65,11 +61,10 @@ export default ({ jwtSecret }) => {
cb(null, user._id.toString());
});

passport.deserializeUser((req, id, cb) => {
req.app.modules
.get('makeen.user.UserRepository')
.findById(objectId(id))
.then(user => cb(null, user), cb);
passport.deserializeUser(async (req, id, cb) => {
const { UserRepository } = await req.app.modules.get('makeen.user');
Copy link
Copy Markdown
Contributor

@viczam viczam Nov 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for that - modules.get('some-module-name') is synchronous and it returns a map of that module's exports


UserRepository.findById(objectId(id)).then(user => cb(null, user), cb);
});

return passport;
Expand Down