Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ var logger = require("morgan");

var indexRouter = require("./routes/index");
var usersRouter = require("./routes/users");

var batchleader = require("./routes/batchleader");
var passport = require("passport");
const registerBatchLeader = require("./routes/batchleader");

var app = express();

Expand All @@ -26,12 +27,13 @@ require("./middlewares/passport")(passport);

app.use("/", indexRouter);
app.use("/users", usersRouter);
app.use("/",registerBatchLeader)

// catch 404 and forward to error handler
app.use(function (req, res, next) {
next(createError(404));
});

app.listen(8081);
// error handler
app.use(function (err, req, res, next) {
// set locals, only providing error in development
Expand Down
13 changes: 13 additions & 0 deletions contollers/getData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const Scrum = require("../models/scrum");
const getData = async (req, res) => {
const id = req.id;
try {
data = await Scrum.findAll({ where: { user_id: id } });
res.status(200).json({ data: data, success: true });
} catch (err) {
res.status(500).json({
success: false,
});
}
};
module.exports = getData;
60 changes: 60 additions & 0 deletions contollers/loginBatchLeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
const User = require("../models/user");
const bcrypt = require("bcrypt");
const jwt = require("jsonwebtoken");
const { secret } = require("../config/index");
const loginBatchLeader = async (req, res) => {
const { username, password } = req.body;
let user = await User.findOne({ where: { username: username } });
// User.update
console.log("user =", user);

if (!user) {
return res.status(404).json({
message: "You are not registered",
success: false,
});
}

if (user.role !== "bl") {
return res.status(403).json({
message: "Make sure you are in the correct portal",
success: false,
});
}

const passwordMatch = await bcrypt.compare(password, user.password);
if (passwordMatch) {
//Making jwt token
let token = jwt.sign(
{
user_id: user._id,
role: user.role,
username: user.username,
email: user.email,
},
secret,
{
expiresIn: "15 days",
}
);

const result = {
role: user.role,
username: user.username,
email: user.email,
token: `Bearer ${token}`,
expiresIn: 168,
};
return res.status(200).json({
...result,
message: "Logedin",
success: true,
});
} else {
return res.status(403).json({
message: "Incorrect password",
success: false,
});
}
};
module.exports = loginBatchLeader;
36 changes: 36 additions & 0 deletions contollers/registerBatchLeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
const User = require("../models/user");
const bcrypt = require("bcrypt")
const registerBatchLeader = async (req, res)=>{
const {firstName, lastName, email, password, username} = req.body;
try {
const alreadyExists = await User.findOne({where:{ email:"email"}});
console.log("checking of aldready exists", alreadyExists);
if (alreadyExists) {
res.status(401).send("Oops! Email already exists");
} else {
const salt = bcrypt.genSaltSync(12);
const hash = bcrypt.hashSync(password, salt);
const newUser = new User({
firstName: firstName,
lastName: lastName,
role: "bl",
email: email,
password: hash,
username: username
});

const savedUser = await newUser.save();
res.status(201).json({
message: "You have been registered",
user : savedUser,
success: true
});
}
} catch (err) {
console.error(err);
res.status(500).send(err);
}
};


module.exports = registerBatchLeader;
47 changes: 47 additions & 0 deletions contollers/updateData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
const Scrum = require("../models/scrum");
const updateData = async (req, res) => {
const {
id,
attendance,
saw_last_lecture,
tha_progress,
topics_to_cover,
backlog_reasons,
class_rating,
user_id,
} = req.body;
try {
const isUserExists = await Scrum.findOne({where: {user_id: user_id}})
if(! isUserExists)
{
res.status(200).json({
success: true,
message: "user does not existe"
});
}

const updatedData = await Scrum.update(
{
id: id,
attendance,
attendance,
saw_last_lecture: saw_last_lecture,
tha_progress: tha_progress,
topics_to_cover: topics_to_cover,
backlog_reasons: backlog_reasons,
class_rating: class_rating,
},
{ where: { user_id: user_id } }
);
res.status(201).json({
success: true,
message: "Upadated successfully",
user: updatedData
})
} catch (err) {
res.status(500).json({
success: false,
message: "something went wrong"
})
}
};
2 changes: 2 additions & 0 deletions controllers/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.env
6 changes: 6 additions & 0 deletions controllers/getData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const User = require("../models/user");
const Team = require("../models/team");
const getData = (req,res)=>{
const {teamName} = req.body;

}
58 changes: 58 additions & 0 deletions controllers/loginBatchLeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
const Team = require("../models/team");
const User = require("../models/user");
const bcryt = require("bcrypt");
const { validateUsername } = require("../utils/auth");
const loginBatchLeader = async (req, res) => {
const { username, password } = req.body;
const user = await validateUsername(username);

if (!user) {
return res.status(404).json({
message: "You are not registered",
success: false,
});
}

if (user.role !== "bl") {
return res.status(403).json({
message: "Make sure you are in the correct portal",
success: false,
});
}

const passwordMatch = await bcrypt.compare(password, user.password);
if (passwordMatch) {
//Making jwt token
let token = jwt.sign(
{
user_id: user._id,
role: user.role,
username: user.username,
email: user.email,
},
secret,
{
expiresIn: "15 days",
}
);

const result = {
role: user.role,
username: user.username,
email: user.email,
token: `Bearer ${token}`,
expiresIn: 168,
};
return res.status(200).json({
...result,
message: "Logedin",
success: true,
});
} else {
return res.status(403).json({
message: "Incorrect password",
success: false,
});
}
};
module.exports = loginBatchLeader;
37 changes: 37 additions & 0 deletions controllers/registerBatchLeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
const User = require("../models/user");
const bcrypt = require("bcrypt")
const jwt = require("jsonwebtoken");
const registerBatchLeader = async (req, res)=>{
const {firstName, lastName, email, password, userName} = req.body;
try {
const alreadyExists = await User.findOne({ where: {email: email } });
console.log("checking of aldready exists", alreadyExists);
if (alreadyExists) {
res.status(401).send("Oops! Email already exists");
} else {
const salt = bcrypt.genSaltSync(12);
const hash = bcrypt.hashSync(password, salt);
const newUser = new User({
firstName: firstName,
lastName: lastName,
role: "bl",
email: email,
password: hash,
userName: userName
});

const savedUser = await newUser.save();
res.status(201).json({
message: "You have been registered",
user : savedUser,
success: true
});
}
} catch (err) {
console.error(err);
res.status(500).send("something went wrong");
}
};


module.exports = registerBatchLeader;
40 changes: 21 additions & 19 deletions middlewares/initialChecks.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,27 @@ const validatePassword = (password) => {
};

const initialChecks = (req, res, next) => {
const { username, email, password, confirmPassword } = req.body;
console.log(req.body);
const {username, email, password, confirmPassword } = req.body;
console.log(req.body);

if (
// typeof username === 'string' &&
typeof email === "string" &&
typeof password === "string" &&
typeof confirmPassword === "string" &&
email.length > 0 &&
password.length > 0 &&
confirmPassword === password &&
// validateUsername(username) &&
validateEmail(email) &&
validatePassword(password)
) {
next();
} else {
res.status(401).send("Initital checks failed !!!");
}
};
if (
typeof username === 'string' &&
typeof email === 'string' &&
typeof password === 'string' &&
typeof confirmPassword === 'string' &&
email.length > 0 &&
password.length > 0 &&
confirmPassword === password &&
validateUsername(username) &&
validateEmail(email) && validatePassword(password)
) {
next();
} else {
console.log();
res.status(401).send("Initital checks failed !!!");

}

}

module.exports = initialChecks;
2 changes: 1 addition & 1 deletion models/user.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { DataTypes } = require("sequelize");
const sequelize = require("../database");

const User = sequelize.define("Users", {
const User = sequelize.define("User", {
//Model attributes
id: {
type: DataTypes.INTEGER,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"bcrypt": "^5.0.1",
"cookie-parser": "~1.4.4",
"debug": "~2.6.9",
"dotenv": "^10.0.0",
"dotenv": "^10.0.0",
"express": "^4.17.1",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
Expand Down
15 changes: 15 additions & 0 deletions routes/batchleader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const express = require("express");
const router = express.Router();
const initialChecks = require('../middlewares/initialChecks');
const getData = require("../contollers/getData");
const loginBatchLeader = require("../contollers/loginBatchLeader");;
const registerBatchLeader = require('../contollers/registerBatchLeader');
router.get("/bl", (req,res)=>{
res.status(200).send("welcome to batchleader Route");
})
router.post("/batch-leader-login" ,loginBatchLeader);
router.post("/batch-leader-register",initialChecks,registerBatchLeader);
router.post("/get-data",getData);
router.post("/updata-data",)

module.exports = router;
2 changes: 1 addition & 1 deletion utils/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const checkRole = (roles) => (req, res, next) => {

const validateUsername = async (username) => {
//find the row where the username is found
let user = await User.findOne({ where: { username } });
let user = await User.findOne({ where: { username:username } });
console.log("validate username ", user);

//will return null if user not found
Expand Down