Commit f4b926a6 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

set paths to relative instead of global

parent 2ccf70e7
const fs = require('fs'); const fs = require('fs');
const SamlStrategy = require('passport-saml').Strategy; const SamlStrategy = require('passport-saml').Strategy;
const dbconn = require('./dbconn'); const dbconn = require('/dbconn');
const methods = require('./methods'); const methods = require('/methods');
// pwd encryption // pwd encryption
const bcrypt = require('bcryptjs'); const bcrypt = require('bcryptjs');
const saltRounds = 10; const saltRounds = 10;
...@@ -64,14 +64,14 @@ module.exports = function (app, config, passport) { ...@@ -64,14 +64,14 @@ module.exports = function (app, config, passport) {
}); });
*/ */
app.get('/', function (req, res) { app.get('/', function (req, res) {
res.redirect('./profile') res.redirect('/profile')
}); });
app.get('./login', app.get('/login',
passport.authenticate(config.passport.strategy, passport.authenticate(config.passport.strategy,
{ {
successRedirect: '/', successRedirect: '/',
failureRedirect: './login' failureRedirect: '/login'
}) })
); );
...@@ -86,17 +86,17 @@ module.exports = function (app, config, passport) { ...@@ -86,17 +86,17 @@ module.exports = function (app, config, passport) {
} }
); );
app.get('./profile', function (req, res) { app.get('/profile', function (req, res) {
if (req.isAuthenticated()) { if (req.isAuthenticated()) {
res.render('profile', { res.render('profile', {
user: req.user // useful for view engine, useless for HTML user: req.user // useful for view engine, useless for HTML
}); });
} else { } else {
res.redirect('./login'); res.redirect('/login');
} }
}); });
app.get('./services', function (req, res) { app.get('/services', function (req, res) {
if (req.isAuthenticated()) { if (req.isAuthenticated()) {
async.waterfall([ async.waterfall([
// get userId by email from userdb // get userId by email from userdb
...@@ -156,21 +156,21 @@ module.exports = function (app, config, passport) { ...@@ -156,21 +156,21 @@ module.exports = function (app, config, passport) {
} }
]) ])
} else { } else {
res.redirect('./login'); res.redirect('/login');
} }
}); });
app.get('./security', function (req, res) { app.get('/security', function (req, res) {
if (req.isAuthenticated()) { if (req.isAuthenticated()) {
res.render('security', { res.render('security', {
user: req.user // useful for view engine, useless for HTML user: req.user // useful for view engine, useless for HTML
}); });
} else { } else {
res.redirect('./login'); res.redirect('/login');
} }
}); });
app.post('./updateProfile', function (req, res) { app.post('/updateProfile', function (req, res) {
var userData = { var userData = {
title: req.body.inputTitle, title: req.body.inputTitle,
firstname: req.body.inputFirstname, firstname: req.body.inputFirstname,
...@@ -195,13 +195,13 @@ module.exports = function (app, config, passport) { ...@@ -195,13 +195,13 @@ module.exports = function (app, config, passport) {
}) })
} }
} else { } else {
res.redirect('./login'); res.redirect('/login');
} }
}); });
// todo: user registration with captcha // todo: user registration with captcha
app.post('./changePwd', function (req, res) { app.post('/changePwd', function (req, res) {
if (req.isAuthenticated()) { if (req.isAuthenticated()) {
var currPwd = req.body.inputCurrPwd var currPwd = req.body.inputCurrPwd
var newPwd = req.body.inputNewPwd var newPwd = req.body.inputNewPwd
...@@ -210,7 +210,7 @@ module.exports = function (app, config, passport) { ...@@ -210,7 +210,7 @@ module.exports = function (app, config, passport) {
// Load hashed passwd from DB. // Load hashed passwd from DB.
dbconn.user.query('SELECT password FROM user WHERE email="'+req.user.email+'"', function (err, rows, fields) { dbconn.user.query('SELECT password FROM user WHERE email="'+req.user.email+'"', function (err, rows, fields) {
if (err) { if (err) {
res.redirect('./500') res.redirect('/500')
throw err throw err
} }
var userPwd = rows[0].password var userPwd = rows[0].password
...@@ -218,16 +218,16 @@ module.exports = function (app, config, passport) { ...@@ -218,16 +218,16 @@ module.exports = function (app, config, passport) {
// check if the password is correct // check if the password is correct
bcrypt.compare(currPwd, userPwd, function(err, isMatch) { bcrypt.compare(currPwd, userPwd, function(err, isMatch) {
if (err) { if (err) {
res.redirect('./500') res.redirect('/500')
throw err throw err
} }
else if (!isMatch) { else if (!isMatch) {
req.flash('error', "Sorry, your password was incorrect. Please double-check your password.") req.flash('error', "Sorry, your password was incorrect. Please double-check your password.")
res.redirect('./security') res.redirect('/security')
} else { } else {
if ( newPwd != retypePwd ) { if ( newPwd != retypePwd ) {
req.flash('error', "Passwords do no match. Please make sure you re-type your new password correctly.") req.flash('error', "Passwords do no match. Please make sure you re-type your new password correctly.")
res.redirect('./security') res.redirect('/security')
} }
else { else {
// update password // update password
...@@ -242,7 +242,7 @@ module.exports = function (app, config, passport) { ...@@ -242,7 +242,7 @@ module.exports = function (app, config, passport) {
req.flash('success', "Pasword updated!") req.flash('success', "Pasword updated!")
console.log('pasword updated!') console.log('pasword updated!')
} }
res.redirect('./security') res.redirect('/security')
}) })
}); });
}); });
...@@ -251,11 +251,11 @@ module.exports = function (app, config, passport) { ...@@ -251,11 +251,11 @@ module.exports = function (app, config, passport) {
}) })
}) })
} else { } else {
res.redirect('./login'); res.redirect('/login');
} }
}); });
app.get('./forgotPwd', function (req, res) { app.get('/forgotPwd', function (req, res) {
res.render('forgotPwd', { res.render('forgotPwd', {
user: req.user user: req.user
}); });
...@@ -284,7 +284,7 @@ module.exports = function (app, config, passport) { ...@@ -284,7 +284,7 @@ module.exports = function (app, config, passport) {
text: "" text: ""
}; };
app.post('./forgotPwd', function(req, res, next) { app.post('/forgotPwd', function(req, res, next) {
//methods.currentDate(); //methods.currentDate();
/* do something: write down reset password procedure in Technical Req. Document /* do something: write down reset password procedure in Technical Req. Document
ref: https://meanstackdeveloper.in/implement-reset-password-functionality-in-node-js-express.html ref: https://meanstackdeveloper.in/implement-reset-password-functionality-in-node-js-express.html
...@@ -345,16 +345,16 @@ module.exports = function (app, config, passport) { ...@@ -345,16 +345,16 @@ module.exports = function (app, config, passport) {
else { else {
req.flash('success', 'An e-mail has been sent to ' + emailAddress + ' with further instructions.'); req.flash('success', 'An e-mail has been sent to ' + emailAddress + ' with further instructions.');
} }
res.redirect('./forgotPwd'); res.redirect('/forgotPwd');
}); });
}); });
app.get('./reset/:token', function(req, res) { app.get('/reset/:token', function(req, res) {
methods.checkUserToken(req.params.token, function(err, user){ methods.checkUserToken(req.params.token, function(err, user){
//console.log(user); //console.log(user);
if (!user) { if (!user) {
req.flash('error', 'Password reset token is invalid or has expired.'); req.flash('error', 'Password reset token is invalid or has expired.');
res.redirect('./forgotPwd'); res.redirect('/forgotPwd');
} }
else { else {
res.render('reset'); res.render('reset');
...@@ -362,7 +362,7 @@ module.exports = function (app, config, passport) { ...@@ -362,7 +362,7 @@ module.exports = function (app, config, passport) {
}); });
}); });
app.post('./reset/:token', function(req, res) { app.post('/reset/:token', function(req, res) {
methods.checkUserToken(req.params.token, function(err, user){ methods.checkUserToken(req.params.token, function(err, user){
if (user) { if (user) {
// update password // update password
...@@ -387,10 +387,10 @@ module.exports = function (app, config, passport) { ...@@ -387,10 +387,10 @@ module.exports = function (app, config, passport) {
} }
}); });
res.redirect('./login') res.redirect('/login')
}); });
app.get('./logout', function (req, res) { app.get('/logout', function (req, res) {
if (req.user == null) { if (req.user == null) {
return res.redirect('/'); return res.redirect('/');
} }
...@@ -414,7 +414,7 @@ module.exports = function (app, config, passport) { ...@@ -414,7 +414,7 @@ module.exports = function (app, config, passport) {
}); });
// to generate Service Provider's XML metadata // to generate Service Provider's XML metadata
app.get('./saml/metadata', app.get('/saml/metadata',
function(req, res) { function(req, res) {
res.type('application/xml'); res.type('application/xml');
var spMetadata = samlStrategy.generateServiceProviderMetadata(fs.readFileSync(__dirname + '/cert/cert.pem', 'utf8')); var spMetadata = samlStrategy.generateServiceProviderMetadata(fs.readFileSync(__dirname + '/cert/cert.pem', 'utf8'));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment