Changed encryptedPW to password

Author: drhurdle

README.md

@@ -22,12 +22,12 @@ API endpoints at ```localhost:8000/api/``` :
 
 | Method | Path | Parameters |  Protected |     |
 | :---: | :---: | :---: | :---: | :--- |
-| POST | /user | username : encryptedPW | none | Create a User and returns token|
+| POST | /user | username : password | none | Create a User and returns token|
 | GET | /user | - - - | none | Returns List of User Objects |
 | GET | /user/:id | - - - | none | Returns the user with the given ID |
 | PUT | /user/:id | - - - | isAuthorized, isCurrentUser | Updates user with the a given ID |
 | DEL | /user/:id | - - - | isAuthorized, isCurrentUser | Deletes a user with the given ID |
-| POST | /login | username : encryptedPW | none | Log In Route : Returns logged in user and token |
+| POST | /login | username : password | none | Log In Route : Returns logged in user and token |
 
 
 

server/controllers/userController.js

@@ -8,7 +8,7 @@ var tokenAuth = require('../services/tokenAuth');
 exports.register = function(req , res){
 
 	if(!req.body.username){return res.json({Error : "Username is Required"});}
-	if(!req.body.encryptedPW){return res.json({Error : "Password is Required"});}
+	if(!req.body.password){return res.json({Error : "Password is Required"});}
 
 	User.filter({username:req.body.username}).run().then(function(userArray){
 		if(userArray[0]){return res.json({Error : "Username is in use"});}
@@ -55,7 +55,7 @@ exports.editUser = function(req , res){
 	var id = req.params.id;
 	User.get(id).run().then(function(user){
 		if (req.body.username) {user.username = req.body.username;}
-		if (req.body.encyptedPW) {user.encryptedPW = req.body.encryptedPW;}
+		if (req.body.encyptedPW) {user.password = req.body.password;}
 		user.save().then(function(result) {
 			res.json({ message: 'User Updated !!'});
 		}).error(function(res){

server/models/user.js

@@ -6,7 +6,7 @@ var bcrypt = require('bcrypt');
 var User = thinky.createModel("user", {
 
 	username        : type.string(),
-	encryptedPW     : type.string()
+	password        : type.string()
 
 });
 
@@ -18,10 +18,10 @@ User.pre('save', function(next) {
   bcrypt.genSalt(10, function (err, salt) {
 
     if(err) return next(err);
-    bcrypt.hash(self.encryptedPW, salt, function (err, hash) {
+    bcrypt.hash(self.password, salt, function (err, hash) {
 
       if(err) return next(err);
-      self.encryptedPW = hash;
+      self.password = hash;
       next();
 
     });
@@ -31,7 +31,7 @@ User.pre('save', function(next) {
 
 User.comparePassword = function(password, user, callback) {
 
-  bcrypt.compare(password, user.encryptedPW, function(err, match) {
+  bcrypt.compare(password, user.password, function(err, match) {
 
     if (err) callback(err);