Fully Encrypted notes Beta

* Encrypts all notes going to the database
* Creates encrypted snippets for loading note title cards
* Creates an encrypted search index when note is changed
* Migrates users to encrypted notes on login
* Creates new encrypted master keys for newly logged in users

server/routes/userController.js

@@ -2,6 +2,7 @@ var express = require('express')
 var router = express.Router()
 
 let User = require('@models/User');
+const cs = require('@helpers/CryptoString')
 
 // middleware that is specific to this router
 router.use(function timeLog (req, res, next) {
@@ -31,19 +32,19 @@ router.post('/login', function (req, res) {
 	}
 
 	User.login(username, password)
-		.then(function(loginToken){
+	.then( ({token, userId}) => {
 
-			//Return json web token to user
-			returnData['success'] = true
-			returnData['token'] = loginToken
-			returnData['username'] = username
+		returnData['username'] = username
+		returnData['token'] = token
+		returnData['success'] = true
 
-			res.send(returnData)
-		})
-		.catch(e => {
-			console.log(e)
-			res.send(returnData)
-		})
+		res.send(returnData)
+		return
+	})
+	.catch(e => {
+		console.log(e)
+		res.send(returnData)
+	})
 })
 
 // fetch counts of users notes