password encryption

.gitignore

@@ -1,3 +1,4 @@
+.idea
 #Env variables
 .env
 

package.json

@@ -7,6 +7,7 @@
     "babel": "^5.8.23",
     "babel-eslint": "^4.1.1",
     "babelify": "^6.3.0",
+    "bcrypt": "^0.8.5",
     "bcrypt-nodejs": "0.0.3",
     "bluebird": "~2.9.34",
     "body-parser": "^1.13.3",

src/public/src/js/components/RaspberryDetails.jsx

@@ -48,15 +48,22 @@ class RaspberriesSettings extends React.Component {
 	render() {
 		let {raspberry} = this.state;
 		return (
-			<Paper style={styles.container}>
-				<h2>{raspberry.name}</h2>
-				{raspberry.modules.map(function(module) {
-					return (
-						<ModuleItem module={module}/>
-					);
+			<div>
+				<Paper style={styles.container}>
+					<h2>{raspberry.name}</h2>
+					{raspberry.modules.map(function(module) {
+						return (
+							<ModuleItem module={module}/>
+						);
+					}.bind(this))}
+
+				</Paper>
 
-				}.bind(this))}
-			</Paper>
+				<Paper style={styles.container}>
+					<h2>Info</h2>
+					IP address: {raspberry.ip}
+				</Paper>
+			</div>
 		)
 	}
 	_getStateView(module) {

src/server/middleware/user.js

@@ -1,6 +1,7 @@
 var userModel = require("../models/mongoose/mongoose-models").User;
 var jwt = require("jwt-simple");
 var fs = require("fs");
+var bcrypt = require('bcrypt');
 var config = require("../data/private/config.js");
 
 var login = function(req, res) {
@@ -27,8 +28,18 @@ var login = function(req, res) {
 	})
 };
 
+var encrypt = function(password, salt) {
+	if (!salt) {
+		salt = bcrypt.genSaltSync(12);
+	}
+	var hash = bcrypt.hashSync(password, salt);
+	return hash
+
+
+}
+
 var checkPassword = function(requestPassword, userInfo) {
-	return requestPassword === userInfo.password;
+	return bcrypt.compareSync(requestPassword, userInfo.password);
 };
 
 var generateToken = function(userInfo) {
@@ -52,13 +63,13 @@ var editPassword = function(req, res) {
 		if (!userInfo) {
 			return res.json({error: "invalid"});
 		} else {
-			if (req.body.oldPassword !== userInfo.password) {
+			if (!checkPassword(req.body.oldPassword, userInfo)) {
 				return res.json({error: "invalid password"});
 			}
 			if (req.body.newPassword !== req.body.confirmNewPassword) {
 				return res.json({error: "invalid new password"});
 			} else {
-				userInfo.password = req.body.newPassword;
+				userInfo.password = encrypt(req.body.newPassword);
 				userInfo.save(function(err) {
 					if(err) {
 						res.json({err: err});
@@ -94,4 +105,4 @@ module.exports = {
 	isLoggedIn: isLoggedIn,
 	me: getMe,
 	editPassword: editPassword
-};
+};

src/server/models/Raspberry.js

@@ -32,6 +32,18 @@ Raspberry.add = function(name, modulesNames) {
 	});
 }
 
+Raspberry.emitTo = function(name, event, data) {
+	return new Promise(function(resolve, reject) {
+		Raspberry.findOne(name)
+			.then(function(raspberry) {
+			if (!raspberry.socketId) {
+				return reject({code: 404, message: "no raspberry with that name", id: "RASPBERRY_NOT_FOUND"});
+			}
+			process.io.sockets.connected[raspberry.socketId].emit(event, data);
+		}).catch(reject);
+	});
+}
+
 Raspberry.findOne = function(name) {
 	return new Promise(function(resolve, reject) {
 		raspberryModel.findOne({name: name}, function(err, raspberry) {

src/server/socket/socket.js

@@ -47,14 +47,16 @@ IO.init = function(server) {
 
 		}
 		socket.on('ping', function(){
+			console.log("ping:received")
 			socket.emit("ping:received");
 		});
 		raspberrySocket(socket);
 
 		ModuleManager.setUpSocket(socket, IO.io);
 		socket.on('disconnect', function(){
 			console.log("client disconnected");
-			if (socket.decoded_token.isRaspberry) {
+			if (socket.decoded_token.isRaspberry
+				&& socket.raspberryInfo) {
 				Raspberry.stop(socket.raspberryInfo.name)
 				.then(function(raspberry) {
 					console.log(JSON.stringify(raspberry))