Merge branch 'master' into public-dashboard

# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js

src/mixins/socket.js

@@ -224,11 +224,15 @@ export default {
             }
         },
 
-        login(username, password, callback) {
+        login(username, password, token, callback) {
             socket.emit("login", {
                 username,
                 password,
+                token,
             }, (res) => {
+                if (res.tokenRequired) {
+                    callback(res)
+                }
 
                 if (res.ok) {
                     this.storage().token = res.token;
@@ -263,6 +267,26 @@ export default {
             this.clearData()
         },
 
+        prepare2FA(callback) {
+            socket.emit("prepare2FA", callback)
+        },
+
+        save2FA(secret, callback) {
+            socket.emit("save2FA", callback)
+        },
+
+        disable2FA(callback) {
+            socket.emit("disable2FA", callback)
+        },
+
+        verifyToken(token, callback) {
+            socket.emit("verifyToken", token, callback)
+        },
+
+        twoFAStatus(callback) {
+            socket.emit("twoFAStatus", callback)
+        },
+
         add(monitor, callback) {
             socket.emit("add", monitor, callback)
         },