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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DB = school_system
DB_HOST = localhost
DB_USER = root
DB_PWD = admin
DB_PWD = "ENTER YOUR PASSWORD"
JWT_SECRET = myawesomepassword
JWT_EXPIRESIN = 90d
JWT_COOKIE_EXPIRES = 90
Expand Down
11 changes: 10 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const cookieParser = require('cookie-parser');
const passport = require('passport');
const cookieSession = require('cookie-session');
require('./passport-setup');

var hbs = require('hbs');
dotenv.config({ path: './.env' });

const app = express();
Expand Down Expand Up @@ -40,6 +40,15 @@ app.use(passport.session());

app.set('view engine', 'hbs');

const isEqual = function(a, b, opts) {
if (a == b) {
return opts.fn(this)
} else {
return opts.inverse(this)
}
}
hbs.registerHelper('ifeq', isEqual);

app.use('/', router);
app.use('/auth', authRouter);
app.use('/google', googleRouter);
Expand Down
15 changes: 11 additions & 4 deletions controllers/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const db = mysql.createConnection({

exports.register = (req, res) => {
console.log(req.body);
const { id, first_name, last_name, role, email, pass } = req.body;
const {first_name, last_name, role, email, pass } = req.body;

function is_alpha(str) {
return /^[a-zA-Z]+$/.test(str);
Expand Down Expand Up @@ -43,7 +43,6 @@ exports.register = (req, res) => {
db.query(
'insert into user_table set ?',
{
UserID: id,
FirstName: first_name.trim(),
LastName: last_name.trim(),
UserRole: role,
Expand Down Expand Up @@ -82,7 +81,7 @@ exports.login = async (req, res) => {
[email],
async (err, result) => {
console.log(result);
if (!result || !(await bcrypt.compare(pass, result[0].password))) {
if (!result || result.length == 0 || !(await bcrypt.compare(pass, result[0].password))) {
res.status(401).render('login', {
message: 'Email or password is incorrect',
});
Expand All @@ -103,7 +102,15 @@ exports.login = async (req, res) => {
httpOnly: true,
};
res.cookie('token', token, cookieOptions);
res.redirect('/success');
if(result[0].UserRole == 0){
res.redirect('/admin');
}
else if (result[0].UserRole == 1) {
res.redirect('/teacher');
}
else if (result[0].UserRole == 2) {
res.redirect('/student');
}
}
}
);
Expand Down
Loading