Merge branch 'master' into frontendFrameworkSwitch-IntegratingAngular

tameeshB · Dec 31, 2017 · a307e18 · a307e18
2 parents f108109 + ef00935
commit a307e18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -3,3 +3,12 @@ A VERY reliable way to communicate on the internet.
 An end-to-end encrypted decentralised cross-platform chat application.
 
 
+
+## Install 
+First, get node, if you don't already [Official website downloads](https://nodejs.org/en/download/) or just brew/apt-get them(node, npm).
+```
+git clone https://github.com/tameeshB/sockChat.git   
+cd sockChat
+npm install
+node server.js
+```
diff --git a/config/passport.js b/config/passport.js
@@ -33,7 +33,10 @@ module.exports = function (passport, app) {
                         return done(err);
                         //check dupes
                     if (user) {
-                        return done(null, false, req.flash('signupMessage', 'That email/username is already taken.'));
+                        if (user.username == req.body.uname)
+                            return done(null, false, req.flash('signupMessage', 'That username is already taken.'));
+                        else
+                            return done(null, false, req.flash('signupMessage', 'That email is already taken.'));
                     } else {
                         var newUser = new User();