benjaminramey/forgetmenot-django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor with base actions methods

Browse Source
This commit is contained in:
Benjamin Ramey
2021-01-25 23:28:04 -06:00
parent 5f23b5b633
commit 9d98ad4e84
11 changed files with 204 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/config/passport.js
View File

@@ -4,7 +4,8 @@
const StrategyJWT = require(`passport-jwt`).Strategy;
const ExtractJWT = require(`passport-jwt`).ExtractJwt;
const { users } = require(`../models`);
const userUtils = require(`../controllers/users/utils`);
const db = require(`../db`);
module.exports = (passport) => {
const options = {};
@@ -15,7 +16,7 @@ module.exports = (passport) => {
new StrategyJWT(options, async (jwtPayload, done) => {
let user;
try {
user = await users.getById(jwtPayload.id);
user = await db.getById(`user`, jwtPayload.id);
} catch (error) {
console.log(error);
return done(error, null);
@@ -24,7 +25,7 @@ module.exports = (passport) => {
if (!user) {
return done(null, false);
}
return done(null, users.convertToPublicFormat(user));
return done(null, userUtils.convertToPublicFormat(user));
})
);
};