Skip to content

Commit e83316d

Browse files
UlisesGasconUlisesGascon
authored
Merge pull request OWASP#171 from OWASP/revert-167-issue#152_data
Revert "issue#152 data folder es6 migration"
2 parents 0d9440d + d8718ba commit e83316d

File tree

6 files changed

+54
-56
lines changed

6 files changed

+54
-56
lines changed

‎app/data/benefits-dao.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ function BenefitsDAO(db) {
1010
return new BenefitsDAO(db);
1111
}
1212

13-
const usersCol = db.collection("users");
13+
var usersCol = db.collection("users");
1414

15-
this.getAllNonAdminUsers = (callback) => {
15+
this.getAllNonAdminUsers = function(callback) {
1616
usersCol.find({
1717
"isAdmin": {
1818
$ne: true
1919
}
20-
}).toArray((err, users) => {
20+
}).toArray(function(err, users) {
2121
callback(null, users);
2222
});
2323
};
2424

25-
this.updateBenefits = (userId, startDate, callback) => {
25+
this.updateBenefits = function(userId, startDate, callback) {
2626
usersCol.update({
2727
_id: parseInt(userId)
2828
}, {
2929
$set: {
3030
benefitStartDate: startDate
3131
}
3232
},
33-
(err, result) => {
33+
function(err, result) {
3434
if (!err) {
3535
console.log("Updated benefits");
3636
return callback(null, result);

‎app/data/contributions-dao.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const UserDAO = require("./user-dao").UserDAO;
1+
var UserDAO = require("./user-dao").UserDAO;
22

33
/* The ContributionsDAO must be constructed with a connected database object */
44
function ContributionsDAO(db) {
@@ -11,31 +11,31 @@ function ContributionsDAO(db) {
1111
return new ContributionsDAO(db);
1212
}
1313

14-
const contributionsDB = db.collection("contributions");
15-
const userDAO = new UserDAO(db);
14+
var contributionsDB = db.collection("contributions");
15+
var userDAO = new UserDAO(db);
1616

17-
this.update = (userId, preTax, afterTax, roth, callback) => {
18-
const parsedUserId = parseInt(userId);
17+
this.update = function(userId, preTax, afterTax, roth, callback) {
18+
var parsedUserId = parseInt(userId);
1919

2020
// Create contributions document
21-
const contributions = {
21+
var contributions = {
2222
userId: parsedUserId,
23-
preTax,
24-
afterTax,
25-
roth
23+
preTax: preTax,
24+
afterTax: afterTax,
25+
roth: roth
2626
};
27-
const {} = contributions;
27+
2828
contributionsDB.update({
2929
userId: userId
3030
},
3131
contributions, {
3232
upsert: true
3333
},
34-
(err, result) => {
34+
function(err, result) {
3535
if (!err) {
3636
console.log("Updated contributions");
3737
// add user details
38-
userDAO.getUserById(parsedUserId, (err, user) => {
38+
userDAO.getUserById(parsedUserId, function(err, user) {
3939

4040
if (err) return callback(err, null);
4141

@@ -53,11 +53,11 @@ function ContributionsDAO(db) {
5353
);
5454
};
5555

56-
this.getByUserId = (userId, callback) => {
56+
this.getByUserId = function(userId, callback) {
5757
contributionsDB.findOne({
5858
userId: userId
5959
},
60-
(err, contributions) => {
60+
function(err, contributions) {
6161
if (err) return callback(err, null);
6262

6363
// Set defualt contributions if not set
@@ -68,7 +68,7 @@ function ContributionsDAO(db) {
6868
};
6969

7070
// add user details
71-
userDAO.getUserById(userId, (err, user) => {
71+
userDAO.getUserById(userId, function(err, user) {
7272

7373
if (err) return callback(err, null);
7474

‎app/data/memos-dao.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ function MemosDAO(db) {
1010
return new MemosDAO(db);
1111
}
1212

13-
const memosCol = db.collection("memos");
13+
var memosCol = db.collection("memos");
1414

15-
this.insert = (memo, callback) => {
15+
this.insert = function(memo, callback) {
1616

1717
// Create allocations document
18-
const memos = {
18+
var memos = {
1919
memo: memo,
2020
timestamp: new Date()
2121
};
2222

23-
memosCol.insert(memos, (err, result) => {
23+
memosCol.insert(memos, function(err, result) {
2424

2525
if (!err) {
2626
return callback(null, result);
@@ -30,11 +30,11 @@ function MemosDAO(db) {
3030
});
3131
};
3232

33-
this.getAllMemos = (callback) => {
33+
this.getAllMemos = function(callback) {
3434

3535
memosCol.find({}).sort({
3636
timestamp: -1
37-
}).toArray((err, memos) => {
37+
}).toArray(function(err, memos) {
3838
if (err) return callback(err, null);
3939
if (!memos) return callback("ERROR: No memos found", null);
4040

‎app/data/profile-dao.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function ProfileDAO(db) {
1010
return new ProfileDAO(db);
1111
}
1212

13-
const users = db.collection("users");
13+
var users = db.collection("users");
1414

1515
/* Fix for A6 - Sensitive Data Exposure
1616
@@ -39,10 +39,10 @@ function ProfileDAO(db) {
3939
};
4040
*/
4141

42-
this.updateUser = (userId, firstName, lastName, ssn, dob, address, bankAcc, bankRouting, callback) => {
42+
this.updateUser = function(userId, firstName, lastName, ssn, dob, address, bankAcc, bankRouting, callback) {
4343

4444
// Create user document
45-
const user = {};
45+
var user = {};
4646
if (firstName) {
4747
user.firstName = firstName;
4848
}
@@ -80,7 +80,7 @@ function ProfileDAO(db) {
8080
}, {
8181
$set: user
8282
},
83-
(err, result) => {
83+
function(err, result) {
8484
if (!err) {
8585
console.log("Updated user profile");
8686
return callback(null, user);
@@ -91,11 +91,11 @@ function ProfileDAO(db) {
9191
);
9292
};
9393

94-
this.getByUserId = (userId, callback) => {
94+
this.getByUserId = function(userId, callback) {
9595
users.findOne({
9696
_id: parseInt(userId)
9797
},
98-
(err, user) => {
98+
function(err, user) {
9999
if (err) return callback(err, null);
100100
/*
101101
// Fix for A6 - Sensitive Data Exposure

‎app/data/research-dao.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ function ResearchDAO(db) {
1010
return new ResearchDAO(db);
1111
}
1212

13-
this.getBySymbol= (symbol, callback) =>{
13+
this.getBySymbol= function(symbol, callback) {
1414

15-
const searchCriteria = () => {
15+
function searchCriteria() {
1616

1717
if (symbol) {
1818
console.log("in if symbol");
@@ -21,8 +21,6 @@ function ResearchDAO(db) {
2121
};
2222
}
2323
}
24-
25-
return searchCriteria;
2624
}
2725
}
2826

‎app/data/user-dao.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const bcrypt = require("bcrypt-nodejs");
1+
var bcrypt = require("bcrypt-nodejs");
22

33
/* The UserDAO must be constructed with a connected database object */
44
function UserDAO(db) {
@@ -12,12 +12,12 @@ function UserDAO(db) {
1212
return new UserDAO(db);
1313
}
1414

15-
const usersCol = db.collection("users");
15+
var usersCol = db.collection("users");
1616

17-
this.addUser = (userName, firstName, lastName, password, email, callback) => {
17+
this.addUser = function(userName, firstName, lastName, password, email, callback) {
1818

1919
// Create user document
20-
const user = {
20+
var user = {
2121
userName: userName,
2222
firstName: firstName,
2323
lastName: lastName,
@@ -35,15 +35,15 @@ function UserDAO(db) {
3535
user.email = email;
3636
}
3737

38-
this.getNextSequence("userId", (err, id) => {
38+
this.getNextSequence("userId", function(err, id) {
3939
if (err) {
4040
return callback(err, null);
4141
}
4242
console.log(typeof(id));
4343

4444
user._id = id;
4545

46-
usersCol.insert(user, (err, result) => {
46+
usersCol.insert(user, function(err, result) {
4747

4848
if (!err) {
4949
return callback(null, result.ops[0]);
@@ -54,18 +54,18 @@ function UserDAO(db) {
5454
});
5555
};
5656

57-
this.getRandomFutureDate = () => {
58-
const today = new Date();
59-
const day = (Math.floor(Math.random() * 10) + today.getDay()) % 29;
60-
const month = (Math.floor(Math.random() * 10) + today.getMonth()) % 12;
61-
const year = Math.ceil(Math.random() * 30) + today.getFullYear();
57+
this.getRandomFutureDate = function() {
58+
var today = new Date();
59+
var day = (Math.floor(Math.random() * 10) + today.getDay()) % 29;
60+
var month = (Math.floor(Math.random() * 10) + today.getMonth()) % 12;
61+
var year = Math.ceil(Math.random() * 30) + today.getFullYear();
6262
return year + "-" + ("0" + month).slice(-2) + "-" + ("0" + day).slice(-2);
6363
};
6464

65-
this.validateLogin = (userName, password, callback) => {
65+
this.validateLogin = function(userName, password, callback) {
6666

6767
// Helper function to compare passwords
68-
const comparePassword = (fromDB, fromUser) => {
68+
function comparePassword(fromDB, fromUser) {
6969
return fromDB === fromUser;
7070
/*
7171
// Fix for A2-Broken Auth
@@ -75,21 +75,21 @@ function UserDAO(db) {
7575
}
7676

7777
// Callback to pass to MongoDB that validates a user document
78-
const validateUserDoc = (err, user) => {
78+
function validateUserDoc(err, user) {
7979

8080
if (err) return callback(err, null);
8181

8282
if (user) {
8383
if (comparePassword(password, user.password)) {
8484
callback(null, user);
8585
} else {
86-
const invalidPasswordError = new Error("Invalid password");
86+
var invalidPasswordError = new Error("Invalid password");
8787
// Set an extra field so we can distinguish this from a db error
8888
invalidPasswordError.invalidPassword = true;
8989
callback(invalidPasswordError, null);
9090
}
9191
} else {
92-
const noSuchUserError = new Error("User: " + user + " does not exist");
92+
var noSuchUserError = new Error("User: " + user + " does not exist");
9393
// Set an extra field so we can distinguish this from a db error
9494
noSuchUserError.noSuchUser = true;
9595
callback(noSuchUserError, null);
@@ -102,19 +102,19 @@ function UserDAO(db) {
102102
};
103103

104104
// This is the good one, see the next function
105-
this.getUserById = (userId, callback) => {
105+
this.getUserById = function(userId, callback) {
106106
usersCol.findOne({
107107
_id: parseInt(userId)
108108
}, callback);
109109
};
110110

111-
this.getUserByUserName = (userName, callback) => {
111+
this.getUserByUserName = function(userName, callback) {
112112
usersCol.findOne({
113113
userName: userName
114114
}, callback);
115115
};
116116

117-
this.getNextSequence = (name, callback) => {
117+
this.getNextSequence = function(name, callback) {
118118
db.collection("counters").findAndModify({
119119
_id: name
120120
}, [], {
@@ -124,7 +124,7 @@ function UserDAO(db) {
124124
}, {
125125
new: true
126126
},
127-
(err, data) => {
127+
function(err, data) {
128128
if (err) {
129129
return callback(err, null);
130130
}

0 commit comments

Comments
 (0)