Skip to content

Commit

Permalink
eslint integration
Browse files Browse the repository at this point in the history
  • Loading branch information
mfaizan1 committed Sep 6, 2019
1 parent 7d31a73 commit 26f15b3
Show file tree
Hide file tree
Showing 11 changed files with 864 additions and 64 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
models/
migrations/
14 changes: 14 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": "strongloop",
"parserOptions": {
"ecmaVersion": 2017
},
"env": {
"es6": true
},
"rules": {
"comma-dangle": ["error", "never"]
}


}
2 changes: 1 addition & 1 deletion config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"dialect": "mysql",
"server_port": 1234
}
}
}
7 changes: 3 additions & 4 deletions config/serverConfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"serverPort": 1234,
"jwtSecret": "putAnythingHere"
}

"serverPort": 1234,
"jwtSecret": "putAnythingHere"
}
75 changes: 40 additions & 35 deletions controllers/user.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
const db = require("./../models");
const jwtHelper = require("./../utils/jwt");
const bcrypt = require("bcrypt");
'use strict';
const db = require('./../models');
const jwtHelper = require('./../utils/jwt');
const bcrypt = require('bcrypt');
const saltRounds = 10;
class Users {
async signUp(req, res) {
let passwrodHash;
try {
passwrodHash = await bcrypt.hash(req.body.password, saltRounds);
} catch (error) {
console.log("Error", err);
console.log('Error', error);
res.status(500);
return res.send({
status: false,
message: "Sorry, couldn't create user, hashing failed"
message: 'Sorry, couldn\'t create user, hashing failed'
});
}
db.User.create({
Expand All @@ -22,12 +23,12 @@ class Users {
password: passwrodHash
})
.then(user => {
res.send({ status: true, message: "user created succesfully" });
res.send({ status: true, message: 'user created succesfully' });
})
.catch(err => {
console.log("Error", err);
console.log('Error', err);
res.status(500);
res.send({ status: false, message: "Sorry , couldn't create user" });
res.send({ status: false, message: 'Sorry , couldn\'t create user' });
});
}
singIn(req, res) {
Expand All @@ -45,41 +46,41 @@ class Users {
res.status(401);
return res.send({
status: false,
message: "Password in correct, please provide correct password"
message: 'Password in correct, please provide correct password'
});
}
const token = jwtHelper.issue({id: result.id});
res.send({ status: true, message: "Singin successful", token });
const token = jwtHelper.issue({ id: result.id });
res.send({ status: true, message: 'Singin successful', token });
})
.catch(err => {
console.log("Error", err);
console.log('Error', err);
res.status(500);
res.send({ status: false, message: "Sorry , couldn't singin" });
res.send({ status: false, message: 'Sorry , couldn\'t singin' });
});
}
userDetails(req, res){
userDetails(req, res) {
db.User.findOne({
attributes: [`firstName`,`lastName`,`email`],
where:{
id : req.userId
attributes: ['firstName', 'lastName', 'email'],
where: {
id: req.userId
}
}).then((result) => {
res.send(result);
}).catch((err) => {
console.log('Error',err);
console.log('Error', err);
res.status(500);
res.send({msgForUser: 'Internal server error', msgForDebugging: err});
res.send({ msgForUser: 'Internal server error', msgForDebugging: err });
});

}
changePassword(req, res){
changePassword(req, res) {
console.log(req.body);
db.User.findOne({
attributes: [`password`],
where:{
id : req.userId
attributes: ['password'],
where: {
id: req.userId
}
}).then(async (result) => {
}).then(async(result) => {
console.log(result);
const isPasswordCorrect = await bcrypt.compare(
req.body.oldPassword,
Expand All @@ -89,18 +90,18 @@ class Users {
res.status(401);
return res.send({
status: false,
message: "Password in correct, please provide correct password"
message: 'Password in correct, please provide correct password'
});
}
let passwrodHash;
try {
passwrodHash = await bcrypt.hash(req.body.newPassword, saltRounds);
} catch (error) {
console.log("Error", error);
console.log('Error', error);
res.status(500);
return res.send({
status: false,
message: "Sorry, couldn't create user, hashing failed"
message: 'Sorry, couldn\'t create user, hashing failed'
});
}
db.User.update(
Expand All @@ -110,16 +111,20 @@ class Users {
id: req.userId
}
}).then((result) => {
return res.send({ status: true, message: "Pasword updated successfull" });
}).catch((err) => {
console.log('Error', err);
res.status(500);
res.send({ msgForUser: 'Internal server error', msgForDebugging: err })
});
return res.send(
{
status: true,
message: 'Pasword updated successfull'
});
}).catch((err) => {
console.log('Error', err);
res.status(500);
res.send({ msgForUser: 'Internal server error', msgForDebugging: err });
});
}).catch((err) => {
console.log('Error',err);
console.log('Error', err);
res.status(500);
res.send({msgForUser: 'Internal server error', msgForDebugging: err});
res.send({ msgForUser: 'Internal server error', msgForDebugging: err });
});

}
Expand Down
Loading

0 comments on commit 26f15b3

Please sign in to comment.