Added privacy policy

Updated marketing
Added some keyboard shortcuts
Added settings page
Added accent theming
Added beta 2FA

server/routes/userController.js

@@ -1,7 +1,8 @@
 var express = require('express')
 var router = express.Router()
 
-let User = require('@models/User');
+const User = require('@models/User')
+const Auth = require('@helpers/Auth')
 const cs = require('@helpers/CryptoString')
 
 // middleware that is specific to this router
@@ -9,26 +10,14 @@ router.use(function timeLog (req, res, next) {
 	// console.log('Time: ', Date.now())
 	next()
 })
-// define the home page route
-router.get('/', function (req, res) {
-	res.send('User Home Page ' + User.getUsername())
-})
-// define the about route
-router.get('/about', function (req, res) {
-	User.getUsername(req.headers.userId)
-	.then( data => res.send(data) )
-})
+
 // Login User
 router.post('/login', function (req, res) {
 
-	User.login(req.body.username, req.body.password)
+	User.login(req.body.username, req.body.password, req.body.authToken)
 	.then( returnData => {
-
 		res.send(returnData)
 	})
-	.catch(e => {
-		res.send(false)
-	})
 })
 // Logout User
 router.post('/logout', function (req, res) {
@@ -39,10 +28,7 @@ router.post('/logout', function (req, res) {
 	})
 })
 
-
-
-
-// Login User
+// Register User
 router.post('/register', function (req, res) {
 
 	User.register(req.body.username, req.body.password)
@@ -55,12 +41,36 @@ router.post('/register', function (req, res) {
 	})
 })
 
-
 // fetch counts of users notes
 router.post('/totals', function (req, res) {
 	User.getCounts(req.headers.userId)
 	.then( countsObject => res.send( countsObject ))
 })
 
+//
+// Two Factor Auth Setup
+//
+router.post('/twofactorsetup', function (req, res) {
+
+	//Send QR code to user for 2FA setup
+	Auth.generateTwoFactorSecretKey(req.headers.userId, req.body.password)
+	.then( ({ qrCode }) => { res.send( qrCode ) })
+})
+
+router.post('/verifytwofactorsetuptoken', function (req, res) {
+
+	//Verify Users QR code with token
+	Auth.setTwoFactorEnabled(req.headers.userId, req.body.password, req.body.token, true)
+	.then( ( results ) => { res.send( results ) })
+})
+
+router.post('/validatetwofactortoken', function (req, res) {
+
+	//Verify Users QR code with token
+	Auth.validateTwoFactorToken(req.headers.userId, req.body.password, req.body.token)
+	.then( ( results ) => { res.send( results ) })
+})
+
+
 
 module.exports = router