Skip to content
GitLab
Commit 6836e43c authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

clean up codes

parent fc9ff738
master MLAB-677 devel reset-jul13 reset-merge testing
5 merge requests!143updating yml config,!91Prepare prod,!90Testing,!89Testing,!70Mlab 383
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 207 deletions
+113 -207
routes/routes-account.js
+ 113
- 207
View file @ 6836e43c
...@@ -11,7 +11,6 @@ const salt = 64; // salt length ...@@ -11,7 +11,6 @@ const salt = 64; // salt length
const async = require('async') const async = require('async')
const crypto = require('crypto') const crypto = require('crypto')
const mailer = require('./mailer') const mailer = require('./mailer')
const axios = require('axios')
const logoDir = 'public/upload/' const logoDir = 'public/upload/'
const tpGitlabURL = 'https://transfer.hft-stuttgart.de/gitlab/' const tpGitlabURL = 'https://transfer.hft-stuttgart.de/gitlab/'
...@@ -113,7 +112,9 @@ module.exports = function (app, config, passport, i18n) { ...@@ -113,7 +112,9 @@ module.exports = function (app, config, passport, i18n) {
var updatePasswordMailContent = '<div>Lieber Nutzer,<br/><br/>Ihr Passwort wurde erfolgreich geändert.<br/><br/>' + mailSignature + '</div>'; var updatePasswordMailContent = '<div>Lieber Nutzer,<br/><br/>Ihr Passwort wurde erfolgreich geändert.<br/><br/>' + mailSignature + '</div>';
app.get('/', function (req, res) { app.get('/', function (req, res) {
if (req.isAuthenticated()) { if ( !req.isAuthenticated() ) {
res.redirect('/login')
} else {
methods.getUserByEmail(req.user.email, function(data, err){ methods.getUserByEmail(req.user.email, function(data, err){
if (!err) { if (!err) {
// Initialize user // Initialize user
...@@ -128,17 +129,11 @@ module.exports = function (app, config, passport, i18n) { ...@@ -128,17 +129,11 @@ module.exports = function (app, config, passport, i18n) {
}) })
} }
let userData = {
fullName: loggedInUser.getFullName(),
m4lab_idp: loggedInUser.getIdpStatus(),
verificationStatus: loggedInUser.getVerificationStatus()}
res.render(lang+'/account/home', { res.render(lang+'/account/home', {
user: userData user: loggedInUser
}); });
} }
}) })
} else {
res.redirect('/login'); // localhost
} }
}); });
...@@ -172,47 +167,30 @@ module.exports = function (app, config, passport, i18n) { ...@@ -172,47 +167,30 @@ module.exports = function (app, config, passport, i18n) {
}); });
app.get('/profile', function (req, res) { app.get('/profile', function (req, res) {
if (req.isAuthenticated()) { if(!req.isAuthenticated() && !loggedInUser) {
// RS: to be updated = get data from loggedinuser res.redirect('/login')
console.log(loggedInUser)
methods.getUserByEmail(req.user.email, function(data, err){
if (!err) {
if (data.verificationStatus == 1) {
console.log(data)
res.render(lang+'/account/profile', {
user: data,
email: req.user.email
})
}
else {
res.render(lang+'/account/home', {
user: data
});
}
}
})
} else { } else {
res.redirect('/login'); if(loggedInUser.getVerificationStatus() != 1) {
res.redirect('/account/')
} else {
res.render(lang+'/account/profile', {
user: loggedInUser
})
}
} }
}); })
app.get('/services', function(req, res){ app.get('/services', function(req, res){
if(!req.isAuthenticated() && !loggedInUser) { if(!req.isAuthenticated() && !loggedInUser) {
res.redirect('/login') res.redirect('/login')
} else { } else {
let userData = { if(loggedInUser.getVerificationStatus() != 1) { // unverified users
fullName: loggedInUser.getFullName(), res.redirect('/account/')
m4lab_idp: loggedInUser.getIdpStatus()}
if(loggedInUser.getVerificationStatus() != 1) {
res.render(lang+'/account/home', {
user: userData
})
} else { } else {
let gitlabReposArr = [] let gitlabReposArr = []
let gitlabPagesArr = [] let gitlabPagesArr = []
if(loggedInUser.getGitlabUserId()) { if(loggedInUser.getGitlabUserId()) { // for users who have activated their gitlab account
async.waterfall([ async.waterfall([
// check projects in runners // check projects in runners
function(callback) { function(callback) {
...@@ -234,7 +212,6 @@ module.exports = function (app, config, passport, i18n) { ...@@ -234,7 +212,6 @@ module.exports = function (app, config, passport, i18n) {
if (gitlabData[i].tag_list.includes('website')) { if (gitlabData[i].tag_list.includes('website')) {
let idxRunners = gitlabRunnersProjectIdsArr.indexOf(gitlabData[i].id) let idxRunners = gitlabRunnersProjectIdsArr.indexOf(gitlabData[i].id)
let isWebsitePublished = false let isWebsitePublished = false
//let isWebsitePublished = true
if (idxRunners > 0) { if (idxRunners > 0) {
isWebsitePublished = true isWebsitePublished = true
} }
...@@ -248,29 +225,28 @@ module.exports = function (app, config, passport, i18n) { ...@@ -248,29 +225,28 @@ module.exports = function (app, config, passport, i18n) {
} }
res.render(lang+'/account/services', { res.render(lang+'/account/services', {
user: userData, user: loggedInUser,
gitlabRepos: gitlabReposArr, gitlabRepos: gitlabReposArr,
gitlabPages: gitlabPagesArr gitlabPages: gitlabPagesArr
}) })
}) })
}) })
} else { } else { // for users who have not activated their gitlab account yet
// ========== to do next =================== gitlab.getUserIdByEmail(loggedInUser.getEmail(), function(data){
gitlab.getUserIdByEmail(req.user.email, function(data){ if (data.error) {
if (!data.error) { res.status(500).render(lang+'/500', { error: data.data })
} else {
let gitlabActivationData = { let gitlabActivationData = {
user_id: loggedInUser.id, user_id: loggedInUser.getId(),
gitlab_userId: data.data} gitlab_userId: data.data}
methods.addGitlabUser(gitlabActivationData, function(err){ methods.addGitlabUser(gitlabActivationData, function(err){
if(!err) { if(err) {
loggedInUser.gitlabUserId = gitlabActivationData.gitlab_userId res.status(500).render(lang+'/500', { error: err })
res.redirect('/services') } else {
loggedInUser.setGitlabUserId(gitlabActivationData.gitlab_userId)
res.redirect('/account/services')
} }
}) })
} else {
res.render(lang+'/account/services', {
user: userData
})
} }
}) })
} }
...@@ -279,26 +255,18 @@ module.exports = function (app, config, passport, i18n) { ...@@ -279,26 +255,18 @@ module.exports = function (app, config, passport, i18n) {
}) })
app.get('/security', function (req, res) { app.get('/security', function (req, res) {
if (req.isAuthenticated()) { if (!req.isAuthenticated() && !loggedInUser) {
// RS: to be updated = get data from loggedinuser res.redirect('/login')
methods.getUserByEmail(req.user.email, function(data, err){
if (!err) {
if (data.verificationStatus == 1 && data.m4lab_idp == 1) {
res.render(lang+'/account/security', {
user: data
})
}
else {
res.render(lang+'/account/home', {
user: data
});
}
}
})
} else { } else {
res.redirect('/login'); if(loggedInUser.getVerificationStatus() == 1 && loggedInUser.getIdpStatus() == 1) {
res.render(lang+'/account/security', {
user: loggedInUser
})
} else {
res.redirect('/account/')
}
} }
}); })
app.post('/updateProfile', function (req, res) { app.post('/updateProfile', function (req, res) {
var userData = { var userData = {
...@@ -312,104 +280,83 @@ module.exports = function (app, config, passport, i18n) { ...@@ -312,104 +280,83 @@ module.exports = function (app, config, passport, i18n) {
speciality: req.body.inputSpeciality, speciality: req.body.inputSpeciality,
} }
if (req.isAuthenticated()) { if (!req.isAuthenticated() && !loggedInUser) {
res.redirect('/login')
} else {
if (userData.email) { if (userData.email) {
dbconn.user.query('UPDATE user SET ? WHERE email = "' +userData.email+'"', userData, function (err, rows, fields) { dbconn.user.query('UPDATE user SET ? WHERE email = "' +userData.email+'"', userData, function (err, rows, fields) {
if (err) { if (err) {
res.flash('error', "Failed") res.flash('error', "Failed")
} }
else { else {
loggedInUser.updateProfile(userData.salutation, userData.title, userData.firstname, userData.lastname, userData.email,
userData.organisation, userData.industry, userData.speciality)
res.flash('success', 'Ihr Benutzerprofil wurde aktualisiert!') res.flash('success', 'Ihr Benutzerprofil wurde aktualisiert!')
} }
res.redirect('/account/profile'); res.redirect('/account/profile');
// RS: to be updated = update loggedinuser
}) })
} }
} else {
res.redirect('/login');
} }
}); });
app.post('/changePwd', function (req, res) { app.post('/changePwd', function (req, res) {
if (req.isAuthenticated()) { if(!req.isAuthenticated() && !loggedInUser) {
res.redirect('/login')
} else {
var currPwd = req.body.inputCurrPwd var currPwd = req.body.inputCurrPwd
var newPwd = req.body.inputNewPwd var newPwd = req.body.inputNewPwd
var retypePwd = req.body.inputConfirm var retypePwd = req.body.inputConfirm
// RS: to be updated = get data from loggedinuser // update - get userId from loggedInUser
methods.getUserIdByEmail(req.user.email, function(userId, err) { dbconn.user.query('SELECT password FROM credential WHERE user_id='+loggedInUser.getId(), function (err, rows, fields) {
if (!err) { if (err) {
// Load hashed passwd from DB console.error(err)
dbconn.user.query('SELECT password FROM credential WHERE user_id='+userId, function (err, rows, fields) { res.status(500).render(lang+'/500', { error: err })
if (err) { }
console.error(err) var userPwd = rows[0].password
res.status(500).render(lang+'/500', {
error: err
})
}
var userPwd = rows[0].password
// 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) {
console.error(err) console.error(err)
res.status(500).render(lang+'/500', { res.status(500).render(lang+'/500', { error: err })
error: err } else if (!isMatch) {
}) res.flash('error', "Das Passwort ist leider falsch. Bitte überprüfen Sie Ihre Eingabe.")
} res.redirect('/account/security')
else if (!isMatch) { } else {
//res.flash('error', "Sorry, your password was incorrect. Please double-check your password.") if ( newPwd != retypePwd ) {
res.flash('error', "Das Passwort ist leider falsch. Bitte überprüfen Sie Ihre Eingabe.") res.flash('error', 'Passwörter stimmen nicht überein. Bitte stellen Sie sicher, dass Sie das Passwort beide Male genau gleich eingeben.')
//res.redirect('/security') res.redirect('/account/security')
res.redirect('/account/security') } else {
} // update password
else { bcrypt.genSalt(saltRounds, function(err, salt) {
if ( newPwd != retypePwd ) { bcrypt.hash(newPwd, salt, function(err, hash) {
//res.flash('error', "Passwords do no match. Please make sure you re-type your new password correctly.") var credentialData = {
res.flash('error', 'Passwörter stimmen nicht überein. Bitte stellen Sie sicher, dass Sie das Passwort beide Male genau gleich eingeben.') password: hash,
res.redirect('/account/security') user_id: userId
} }
else { methods.updateCredential(credentialData, function(err){
// update password if (err) {
bcrypt.genSalt(saltRounds, function(err, salt) { res.flash('error', "Datenbankfehler: Passwort kann nicht geändert werden.")
bcrypt.hash(newPwd, salt, function(err, hash) { throw err
var credentialData = { } else {
password: hash, res.flash('success', "Passwort aktualisiert!")
user_id: userId mailer.options.to = req.user.email
} mailer.options.subject = updatePasswordMailSubject
methods.updateCredential(credentialData, function(err){ mailer.options.html = updatePasswordMailContent
if (err) { mailer.transport.sendMail(mailer.options, function(err) {
//res.flash('error', "Database error: Password cannot be modified.") if (err) { console.log(err) }
res.flash('error', "Datenbankfehler: Passwort kann nicht geändert werden.") });
throw err }
} res.redirect('/account/security')
else { })
//res.flash('success', "Pasword updated!") });
res.flash('success', "Passwort aktualisiert!") });
mailer.options.to = req.user.email }
//mailOptions.subject = "Your M4_LAB Password has been updated." }
mailer.options.subject = updatePasswordMailSubject
mailer.options.html = updatePasswordMailContent
mailer.transport.sendMail(mailer.options, function(err) {
if (err) {
console.log(err)
}
});
}
res.redirect('/account/security')
})
});
});
}
}
})
}) })
}
}) })
} }
else {
res.redirect('/login');
}
}); });
app.get('/forgotPwd', function (req, res) { app.get('/forgotPwd', function (req, res) {
...@@ -419,14 +366,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -419,14 +366,7 @@ module.exports = function (app, config, passport, i18n) {
}); });
app.post('/forgotPwd', function(req, res, next) { app.post('/forgotPwd', function(req, res, next) {
//methods.currentDate(); let emailAddress = req.body.inputEmail
var emailAddress = req.body.inputEmail;
/* var emailContent = "Hi there,\n\n"+
"we've received a request to reset your password. However, this email address is not on our database of registered users.\n\n"+
"Thanks,\nM4_LAB Team";
var emailSubject = "Account Access Attempted"; */
async.waterfall([ async.waterfall([
function(done) { function(done) {
crypto.randomBytes(20, function(err, buf) { crypto.randomBytes(20, function(err, buf) {
...@@ -438,17 +378,10 @@ module.exports = function (app, config, passport, i18n) { ...@@ -438,17 +378,10 @@ module.exports = function (app, config, passport, i18n) {
methods.checkUserEmail(emailAddress, function(err, user){ methods.checkUserEmail(emailAddress, function(err, user){
if (user) { if (user) {
console.log("email: user found"); console.log("email: user found");
//var emailSubject = "M4_LAB Password Reset";
var emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart"; var emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart";
/* var emailContent = "Hi User,\n\n"+
"we've received a request to reset your password. If you didn't make the request, just ignore this email.\n\n"+
"Otherwise, you can reset your password using this link: http://m4lab.hft-stuttgart.de/account/reset/" + token + "\n" +
"This password reset is only valid for 1 hour.\n\n"+
"Thanks,\nM4_LAB Team" */
// var emailContent = "Lieber Nutzer,\n\n"+ // var emailContent = "Lieber Nutzer,\n\n"+
// "wir haben Ihre Anfrage zur Erneuerung Ihres Passwortes erhalten. Falls Sie diese Anfrage nicht gesendet haben, ignorieren Sie bitte diese E-Mail.\n\n"+ // "wir haben Ihre Anfrage zur Erneuerung Ihres Passwortes erhalten. Falls Sie diese Anfrage nicht gesendet haben, ignorieren Sie bitte diese E-Mail.\n\n"+
// "Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://m4lab.hft-stuttgart.de/account/reset/" + token + "\n" + // test server // "Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://localhost:9989/reset/" + token + "\n" + // localhost
// //"Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://localhost:9989/reset/" + token + "\n" + // localhost
// "Dieser Link ist aus Sicherheitsgründen nur für 1 Stunde gültig.\n\n"+mailSignature // "Dieser Link ist aus Sicherheitsgründen nur für 1 Stunde gültig.\n\n"+mailSignature
var emailContent = '<div>Lieber Nutzer, Varun<br/><br/>' + var emailContent = '<div>Lieber Nutzer, Varun<br/><br/>' +
...@@ -474,35 +407,29 @@ module.exports = function (app, config, passport, i18n) { ...@@ -474,35 +407,29 @@ module.exports = function (app, config, passport, i18n) {
}); });
} }
else { else {
//done(err, null, null);
done(err, 'no user found'); done(err, 'no user found');
} }
}); });
} }
], function(err) { ], function(err) {
if (err) { if (err) {
//res.flash('error', 'An error occured. Please try again.');
res.flash('error', 'Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.'); res.flash('error', 'Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.');
} }
else { else {
//res.flash('success', 'If your email is registered, an e-mail has been sent to ' + emailAddress + ' with further instructions.');
res.flash('success', 'Wenn Ihre E-Mail-Adresse registriert ist, wurde eine E-Mail mit dem weiteren Vorgehen an ' + emailAddress + ' versendet.'); res.flash('success', 'Wenn Ihre E-Mail-Adresse registriert ist, wurde eine E-Mail mit dem weiteren Vorgehen an ' + emailAddress + ' versendet.');
} }
//res.redirect('/forgotPwd'); // deployment res.redirect('/account/forgotPwd');
res.redirect('/account/forgotPwd'); // localhost
}); });
}); });
app.get('/reset/:token', function(req, res) { app.get('/reset/:token', function(req, res) {
methods.getUserByToken(req.params.token, function(err, user){ methods.getUserByToken(req.params.token, function(err, user){
if (!user) { if (!user) {
//res.flash('error', 'Password reset token is invalid or has expired.'); res.flash('error', 'Der Schlüssel zum zurücksetzen des Passworts ist ungültig oder abgelaufen.')
res.flash('error', 'Der Schlüssel zum zurücksetzen des Passworts ist ungültig oder abgelaufen.'); res.redirect('/account/forgotPwd')
//res.redirect('/forgotPwd'); // deployment
res.redirect('/account/forgotPwd'); // deployment
} }
else { else {
res.render(lang+'/account/reset'); res.render(lang+'/account/reset')
} }
}); });
}); });
...@@ -521,12 +448,10 @@ module.exports = function (app, config, passport, i18n) { ...@@ -521,12 +448,10 @@ module.exports = function (app, config, passport, i18n) {
// update password // update password
methods.updateCredential(credentialData, function(err){ methods.updateCredential(credentialData, function(err){
if (err) { if (err) {
//res.flash('error', "Database error: Password cannot be modified.")
res.flash('error', "Datenbankfehler: Passwort kann nicht geändert werden.") res.flash('error', "Datenbankfehler: Passwort kann nicht geändert werden.")
throw err throw err
} }
else { else {
//res.flash('success', "Your pasword has been updated.")
res.flash('success', "Passwort aktualisiert!") res.flash('success', "Passwort aktualisiert!")
// send notifiaction email // send notifiaction email
mailer.options.to = user.email mailer.options.to = user.email
...@@ -558,12 +483,8 @@ module.exports = function (app, config, passport, i18n) { ...@@ -558,12 +483,8 @@ module.exports = function (app, config, passport, i18n) {
if (!req.isAuthenticated() && !loggedInUser) { if (!req.isAuthenticated() && !loggedInUser) {
res.redirect('/login') res.redirect('/login')
} else { } else {
let userData = {
fullName: loggedInUser.getFullName(),
m4lab_idp: loggedInUser.getIdpStatus()
}
res.render(lang+'/account/newInformation', { res.render(lang+'/account/newInformation', {
user: userData user: loggedInUser
}) })
} }
}) })
...@@ -573,8 +494,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -573,8 +494,7 @@ module.exports = function (app, config, passport, i18n) {
} else { } else {
if (!req.body.name && !req.body.description) { if (!req.body.name && !req.body.description) {
res.flash('error', 'Please provide the required data') res.flash('error', 'Please provide the required data')
//res.redirect('/account/newInformation') res.redirect('/account/newInformation')
res.redirect('/newInformation')
} else { } else {
let projectName = req.body.name.toLowerCase().replace(/\s/g, '-') let projectName = req.body.name.toLowerCase().replace(/\s/g, '-')
let projectDesc = req.body.description let projectDesc = req.body.description
...@@ -582,8 +502,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -582,8 +502,7 @@ module.exports = function (app, config, passport, i18n) {
if (!req.files) { if (!req.files) {
res.flash('error', 'Please choose a project logo') res.flash('error', 'Please choose a project logo')
//res.redirect('/account/newInformation') res.redirect('/account/newInformation')
res.redirect('/newInformation')
} else { } else {
let newLogoFile = req.files.logo let newLogoFile = req.files.logo
async.waterfall([ async.waterfall([
...@@ -602,8 +521,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -602,8 +521,7 @@ module.exports = function (app, config, passport, i18n) {
} else { } else {
res.flash("error", "Something went wrong. Please try again.") res.flash("error", "Something went wrong. Please try again.")
} }
//res.redirect('/account/newInformation') res.redirect('/account/newInformation')
res.redirect('/newInformation')
} else { } else {
newInformation.setId(result.id) newInformation.setId(result.id)
newInformation.setLogo(result.avatar_url) newInformation.setLogo(result.avatar_url)
...@@ -611,8 +529,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -611,8 +529,7 @@ module.exports = function (app, config, passport, i18n) {
newInformation.setKontaktUrl(tpGitlabURL+result.namespace.path+'/'+result.name+'/-/edit/master/public/kontakt.html') newInformation.setKontaktUrl(tpGitlabURL+result.namespace.path+'/'+result.name+'/-/edit/master/public/kontakt.html')
res.flash("success", "Your website has been created, but not published yet. Please continue to Step 2 and Step 3 to have your new website published.") res.flash("success", "Your website has been created, but not published yet. Please continue to Step 2 and Step 3 to have your new website published.")
//res.redirect('/account/updateInformation?id='+newInformation.getId()) res.redirect('/account/updateInformation?id='+newInformation.getId())
res.redirect('/updateInformation?id='+newInformation.getId())
} }
callback(null) callback(null)
}) })
...@@ -633,18 +550,12 @@ module.exports = function (app, config, passport, i18n) { ...@@ -633,18 +550,12 @@ module.exports = function (app, config, passport, i18n) {
if(!req.isAuthenticated() && !loggedInUser) { if(!req.isAuthenticated() && !loggedInUser) {
res.redirect('/login') res.redirect('/login')
} else { } else {
let userData = {
fullName: loggedInUser.getFullName(),
m4lab_idp: loggedInUser.getIdpStatus()}
if(!req.query.id) { if(!req.query.id) {
res.redirect('/account/services') res.redirect('/account/services')
} else { } else {
gitlab.getUserProjects(loggedInUser.getGitlabUserId(), function(data){ gitlab.getUserProjects(loggedInUser.getGitlabUserId(), function(data){
if (data.error) { if (data.error) {
res.status(500).render(lang+'/500', { res.status(500).render(lang+'/500', { error: data.data })
error: data.data
})
} else { } else {
// quick way to decide whether a website is already published or not // quick way to decide whether a website is already published or not
let informationStatus let informationStatus
...@@ -670,7 +581,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -670,7 +581,7 @@ module.exports = function (app, config, passport, i18n) {
} }
} }
res.render(lang+'/account/updateInformation', { res.render(lang+'/account/updateInformation', {
user: userData, user: loggedInUser,
information: curInformation information: curInformation
}) })
} }
...@@ -685,8 +596,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -685,8 +596,7 @@ module.exports = function (app, config, passport, i18n) {
} else { } else {
if (!req.body.name && !req.body.description) { if (!req.body.name && !req.body.description) {
res.flash('error', 'Please provide the required data') res.flash('error', 'Please provide the required data')
//res.redirect('/account/updateInformation') res.redirect('/account/updateInformation')
res.redirect('/updateInformation')
} else { } else {
let projectName = req.body.name.toLowerCase().replace(/\s/g, '-') let projectName = req.body.name.toLowerCase().replace(/\s/g, '-')
let projectDesc = req.body.description let projectDesc = req.body.description
...@@ -720,9 +630,8 @@ module.exports = function (app, config, passport, i18n) { ...@@ -720,9 +630,8 @@ module.exports = function (app, config, passport, i18n) {
updatedInformation.setKontaktUrl(tpGitlabURL+result.namespace.path+'/'+result.name+'/-/edit/master/public/kontakt.html') updatedInformation.setKontaktUrl(tpGitlabURL+result.namespace.path+'/'+result.name+'/-/edit/master/public/kontakt.html')
res.flash("success", "Your website has been updated") res.flash("success", "Your website has been updated")
} }
//res.redirect('/account/updateInformation?id='+updatedInformation.getId()) res.redirect('/account/updateInformation?id='+updatedInformation.getId())
res.redirect('/updateInformation?id='+updatedInformation.getId())
callback(null) callback(null)
}) })
} }
...@@ -746,7 +655,6 @@ module.exports = function (app, config, passport, i18n) { ...@@ -746,7 +655,6 @@ module.exports = function (app, config, passport, i18n) {
} else { } else {
let emailAddress = loggedInUser.getEmail() let emailAddress = loggedInUser.getEmail()
let supportAddress = "support-transfer@hft-stuttgart.de" let supportAddress = "support-transfer@hft-stuttgart.de"
//let supportAddress = "rosanny.sihombing@hft-stuttgart.de"
let projectName = req.body.projectName let projectName = req.body.projectName
let emailContent = "Guten Tag, \n\nhiermit beantrage Ich die Freischaltung einer Webseite auf dem Transferportal für folgendes Projekt: \n" let emailContent = "Guten Tag, \n\nhiermit beantrage Ich die Freischaltung einer Webseite auf dem Transferportal für folgendes Projekt: \n"
+projectName+"\n\nVielen Dank,\n"+loggedInUser.getFullName() +projectName+"\n\nVielen Dank,\n"+loggedInUser.getFullName()
...@@ -865,7 +773,6 @@ module.exports = function (app, config, passport, i18n) { ...@@ -865,7 +773,6 @@ module.exports = function (app, config, passport, i18n) {
}) })
// ============= USER VERIFICATION ================================ // ============= USER VERIFICATION ================================
// RS: update loggedInUser status after successfull verification?
app.get("/verifyAccount", function(req, res){ app.get("/verifyAccount", function(req, res){
console.log(req.query) console.log(req.query)
methods.getUserIdByVerificationToken(req.query.token, function(userId, err){ methods.getUserIdByVerificationToken(req.query.token, function(userId, err){
...@@ -890,9 +797,6 @@ module.exports = function (app, config, passport, i18n) { ...@@ -890,9 +797,6 @@ module.exports = function (app, config, passport, i18n) {
else { else {
// send email // send email
var emailSubject = "Herzlich willkommen" var emailSubject = "Herzlich willkommen"
// var emailContent = "Lieber Nutzer,\n\n"+
// "herzlich willkommen beim Transferportal der HFT Stuttgart!\n"+
// "Sie können nun alle Dienste des Portals nutzen.\n\n"+mailSignature
var emailContent = '<div>Lieber Nutzer,<br/><br/>' + var emailContent = '<div>Lieber Nutzer,<br/><br/>' +
'<p>herzlich willkommen beim Transferportal der HFT Stuttgart!<br/>' + '<p>herzlich willkommen beim Transferportal der HFT Stuttgart!<br/>' +
'Sie können nun alle Dienste des Portals nutzen.<p/><br/>' + mailSignature; 'Sie können nun alle Dienste des Portals nutzen.<p/><br/>' + mailSignature;
...@@ -908,6 +812,9 @@ module.exports = function (app, config, passport, i18n) { ...@@ -908,6 +812,9 @@ module.exports = function (app, config, passport, i18n) {
} }
}) })
if(!loggedInUser) {
loggedInUser.setVerificationStatus(userData.verificationStatus)
}
res.render(lang+'/account/verification', { res.render(lang+'/account/verification', {
status: true status: true
}); });
...@@ -1012,8 +919,7 @@ module.exports = function (app, config, passport, i18n) { ...@@ -1012,8 +919,7 @@ module.exports = function (app, config, passport, i18n) {
else { else {
res.flash('success', 'Vielen Dank für Ihre Anfrage. Wir melden uns baldmöglichst bei Ihnen. Eine Kopie Ihrer Anfrage wurde an ' + emailAddress + ' versandt.'); res.flash('success', 'Vielen Dank für Ihre Anfrage. Wir melden uns baldmöglichst bei Ihnen. Eine Kopie Ihrer Anfrage wurde an ' + emailAddress + ' versandt.');
} }
//res.redirect('/forgotPwd'); // deployment res.redirect('/account/contact')
res.redirect('/account/contact'); // localhost
}) })
}) })
......
Supports Markdown
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal