-
![]()
+
![]()
diff --git a/modules/users/server/controllers/users/users.profile.server.controller.js b/modules/users/server/controllers/users/users.profile.server.controller.js
index 8dde7e6e55..da0a708d03 100644
--- a/modules/users/server/controllers/users/users.profile.server.controller.js
+++ b/modules/users/server/controllers/users/users.profile.server.controller.js
@@ -62,7 +62,7 @@ exports.changeProfilePicture = function (req, res) {
message: 'Error occurred while uploading profile picture'
});
} else {
- user.profileImageURL = 'modules/users/img/profile/uploads/' + req.files.file.name;
+ user.profileImageURL = 'modules/users/client/img/profile/uploads/' + req.files.file.name;
user.save(function (saveError) {
if (saveError) {
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 8a4ff0e8da..9be2a618ae 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -72,7 +72,7 @@ var UserSchema = new Schema({
},
profileImageURL: {
type: String,
- default: 'modules/users/img/profile/default.png'
+ default: 'modules/users/client/img/profile/default.png'
},
provider: {
type: String,
diff --git a/modules/users/tests/server/user.server.model.tests.js b/modules/users/tests/server/user.server.model.tests.js
index f7a276173d..6c61a0a22a 100644
--- a/modules/users/tests/server/user.server.model.tests.js
+++ b/modules/users/tests/server/user.server.model.tests.js
@@ -155,6 +155,261 @@ describe('User Model Unit Tests:', function () {
});
+ describe("User E-mail Validation Tests", function() {
+ it('should not allow invalid email address - "123"', function (done) {
+ var _user = new User(user);
+
+ _user.email = '123';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow invalid email address - "123@123"', function (done) {
+ var _user = new User(user);
+
+ _user.email = '123@123';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow invalid email address - "123.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = '123.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow invalid email address - "@123.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = '@123.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow invalid email address - "abc@abc@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc@abc@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow invalid characters in email address - "abc~@#$%^&*()ef=@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc~@#$%^&*()ef=@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow space characters in email address - "abc def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow single quote characters in email address - "abc\'def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc\'def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow doudble quote characters in email address - "abc\"def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc\"def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should not allow double dotted characters in email address - "abcdef@abc..com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abcdef@abc..com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should allow valid email address - "abc@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should allow valid email address - "abc+def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc+def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should allow valid email address - "abc.def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc.def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ it('should allow valid email address - "abc-def@abc.com"', function (done) {
+ var _user = new User(user);
+
+ _user.email = 'abc-def@abc.com';
+ _user.save(function (err) {
+ if (!err) {
+ _user.remove(function (err_remove) {
+ should.not.exist(err_remove);
+ done();
+ });
+ } else {
+ should.exist(err);
+ done();
+ }
+ });
+
+ });
+
+ });
+
after(function (done) {
User.remove().exec(done);
});
diff --git a/package.json b/package.json
index 62049a76d4..c9a92c38ca 100644
--- a/package.json
+++ b/package.json
@@ -23,18 +23,20 @@
"async": "^1.3.0",
"body-parser": "^1.13.1",
"bower": "^1.4.1",
+ "cfenv": "~1.0.0",
"chalk": "^1.1.0",
"compression": "^1.5.0",
"connect-flash": "~0.1.1",
"connect-mongo": "~0.8.1",
"consolidate": "~0.13.1",
"cookie-parser": "^1.3.2",
+ "crypto": "0.0.3",
"express": "^4.13.1",
"express-session": "^1.11.3",
"forever": "~0.14.2",
"glob": "^5.0.13",
- "grunt-cli": "~0.1.13",
"grunt": "0.4.5",
+ "grunt-cli": "~0.1.13",
"helmet": "~0.9.1",
"jasmine-core": "^2.3.4",
"lodash": "^3.10.0",
@@ -57,8 +59,7 @@
"serve-favicon": "^2.3.0",
"socket.io": "^1.3.5",
"swig": "^1.4.2",
- "validator": "^3.41.2",
- "cfenv": "~1.0.0"
+ "validator": "^3.41.2"
},
"devDependencies": {
"grunt-concurrent": "^2.0.0",
+ 