Skip to content
GitLab
Commit 8907e4c5 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

Merge branch 'MLAB-566-fix' into 'MLAB-566' 

Mlab 566 fix

See merge request !121
parents 4253099f 63dcd534
Show whitespace changes
Inline Side-by-side
Showing
with 65 additions and 57 deletions
+65 -57
functions/methods.ts
+ 57
- 53
View file @ 8907e4c5
...@@ -3,12 +3,13 @@ import dbconn = require('../config/dbconn') ...@@ -3,12 +3,13 @@ import dbconn = require('../config/dbconn')
var methods = { var methods = {
// ===================== user db ===================== // ===================== user db =====================
registerNewUser: function(data:any, callback:any) { registerNewUser: function(data:any, callback:any) {
dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION dbconn.user.getConnection(function(err:any, thisconn){
thisconn.beginTransaction(function(err:any) { // START TRANSACTION
if (err) { throw err } if (err) { throw err }
// insert profile // insert profile
dbconn.user.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) { thisconn.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { return thisconn.rollback(function() {
throw err throw err
}); });
} }
...@@ -18,9 +19,9 @@ var methods = { ...@@ -18,9 +19,9 @@ var methods = {
user_id: newUserId, user_id: newUserId,
password: data.password password: data.password
} }
dbconn.user.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) { thisconn.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { return thisconn.rollback(function() {
throw err throw err
}); });
} }
...@@ -30,9 +31,9 @@ var methods = { ...@@ -30,9 +31,9 @@ var methods = {
role_id: 2, // USER role_id: 2, // USER
user_id: newUserId user_id: newUserId
} }
dbconn.user.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) { thisconn.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { return thisconn.rollback(function() {
throw err throw err
}); });
} }
...@@ -41,16 +42,16 @@ var methods = { ...@@ -41,16 +42,16 @@ var methods = {
user_id: newUserId, user_id: newUserId,
token: data.verificationToken token: data.verificationToken
} }
dbconn.user.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) { thisconn.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { return thisconn.rollback(function() {
throw err throw err
}); });
} }
// COMMIT // COMMIT
dbconn.user.commit(function(err:any) { thisconn.commit(function(err:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { return thisconn.rollback(function() {
throw err throw err
}) })
} }
...@@ -59,6 +60,7 @@ var methods = { ...@@ -59,6 +60,7 @@ var methods = {
}) })
}); });
}); });
});
callback(err) callback(err)
}) })
}, },
...@@ -162,26 +164,28 @@ var methods = { ...@@ -162,26 +164,28 @@ var methods = {
return null return null
}, },
verifyUserAccount: function(userData:any, callback:any) { verifyUserAccount: function(userData:any, callback:any) {
dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION dbconn.user.getConnection(function(err:any, thisconn){
thisconn.beginTransaction(function(err:any) { // START TRANSACTION
if (err) { throw err } if (err) { throw err }
// update user status // update user status
dbconn.user.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) { thisconn.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { throw err }) return thisconn.rollback(function() { throw err })
} }
// delete verification token // delete verification token
dbconn.user.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) { thisconn.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { throw err }) return thisconn.rollback(function() { throw err })
} }
// COMMIT // COMMIT
dbconn.user.commit(function(err:any) { thisconn.commit(function(err:any) {
if (err) { if (err) {
return dbconn.user.rollback(function() { throw err }) return thisconn.rollback(function() { throw err })
} }
}) })
}) })
}) })
})
callback(err) callback(err)
}) })
}, },
......
routes/account.ts
+ 8
- 4
View file @ 8907e4c5
...@@ -106,11 +106,15 @@ export = function (app:any, config:any, passport:any, lang:string) { ...@@ -106,11 +106,15 @@ export = function (app:any, config:any, passport:any, lang:string) {
res.redirect('/login') res.redirect('/login')
} else { } else {
let loggedInUser = await getLoggedInUserData(req.user.email) let loggedInUser = await getLoggedInUserData(req.user.email)
if (!loggedInUser) {
console.error("user data is not found")
res.status(500).render(lang+'/500', { error: "Your data is not found. Please try again." })
} else {
res.render(lang+'/account/home', { res.render(lang+'/account/home', {
user: loggedInUser user: loggedInUser
}); });
} }
}
}); });
app.get('/login', app.get('/login',
......
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