@@ -6,55 +6,69 @@ const jwt = require("jsonwebtoken");
6
6
7
7
const User = require ( "./models/Users" ) ;
8
8
9
- const { comparePassword} = require ( "./Utils/utils" ) ;
9
+ const { comparePassword } = require ( "./Utils/utils" ) ;
10
10
11
- passport . use ( new LocalStrategy ( function ( username , password , done ) {
12
- User . findOne ( { username : username } ,
13
- "username isAdmin passwordHash passwordSalt" ,
14
- async function ( err , user ) {
15
- if ( err ) {
16
- return done ( err ) ;
17
- }
11
+ passport . use (
12
+ new LocalStrategy ( function ( username , password , done ) {
13
+ User . findOne (
14
+ { username : username } ,
15
+ "username isAdmin passwordHash passwordSalt" ,
16
+ async function ( err , user ) {
17
+ if ( err ) {
18
+ return done ( err ) ;
19
+ }
18
20
19
- if ( ! user ) {
20
- return done ( null , false , { message : "Incorrect Username." } ) ;
21
- }
22
- const verifyPassword = await comparePassword (
23
- user . passwordHash , user . passwordSalt , password ) ;
24
- if ( ! verifyPassword ) {
25
- return done ( null , false , { message : "Incorrect password." } ) ;
26
- }
21
+ if ( ! user ) {
22
+ return done ( null , false , { message : "Incorrect Username." } ) ;
23
+ }
24
+ const verifyPassword = await comparePassword (
25
+ user . passwordHash ,
26
+ user . passwordSalt ,
27
+ password
28
+ ) ;
29
+ if ( ! verifyPassword ) {
30
+ return done ( null , false , { message : "Incorrect password." } ) ;
31
+ }
27
32
28
- return done ( null , user ) ;
29
- } ) ;
30
- } ) ) ;
33
+ return done ( null , user ) ;
34
+ }
35
+ ) ;
36
+ } )
37
+ ) ;
31
38
32
- passport . serializeUser ( function ( user , done ) { done ( null , user . id ) ; } ) ;
39
+ passport . serializeUser ( function ( user , done ) {
40
+ done ( null , user . id ) ;
41
+ } ) ;
33
42
34
- passport . deserializeUser ( function (
35
- id , done ) { User . findById ( id , function ( err , user ) { done ( err , user ) ; } ) ; } ) ;
43
+ passport . deserializeUser ( function ( id , done ) {
44
+ User . findById ( id , function ( err , user ) {
45
+ done ( err , user ) ;
46
+ } ) ;
47
+ } ) ;
36
48
37
- exports . generateToken = function ( user ) {
38
- return jwt . sign ( user , process . env . TokenSecret , { expiresIn : 36000 } ) ;
49
+ exports . generateToken = function ( user ) {
50
+ return jwt . sign ( user , process . env . TokenSecret , { expiresIn : 36000 } ) ;
39
51
} ;
40
52
41
53
let opts = { } ;
42
54
opts . jwtFromRequest = ExtractJwt . fromAuthHeaderAsBearerToken ( ) ;
43
55
opts . secretOrKey = process . env . TokenSecret ;
44
56
45
- passport . use ( new JwtStrategy ( opts , ( jwt_payload , done ) => {
46
- User . findOne ( { _id : jwt_payload . _id } , "username isAdmin" , ( err , user ) => {
47
- if ( err ) {
48
- return done ( err , false ) ;
49
- } else if ( user ) {
50
- return done ( null , user ) ;
51
- } else {
52
- return done ( null , false ) ;
53
- }
54
- } ) ;
55
- } ) ) ;
57
+ passport . use (
58
+ new JwtStrategy ( opts , ( jwt_payload , done ) => {
59
+ User . findOne ( { _id : jwt_payload . _id } , "username isAdmin" , ( err , user ) => {
60
+ if ( err ) {
61
+ return done ( err , false ) ;
62
+ } else if ( user ) {
63
+ return done ( null , user ) ;
64
+ } else {
65
+ return done ( null , false ) ;
66
+ }
67
+ } ) ;
68
+ } )
69
+ ) ;
56
70
57
- exports . verifyUser = passport . authenticate ( "jwt" , { session : false } ) ;
71
+ exports . verifyUser = passport . authenticate ( "jwt" , { session : false } ) ;
58
72
exports . verifyAdmin = ( req , res , next ) => {
59
73
if ( req . user && req . user . isAdmin ) {
60
74
return next ( ) ;
0 commit comments