Merge pull request #4347 from NginxProxyManager/develop

v2.12.3

.version

@@ -1 +1 @@
-2.12.2
+2.12.3

README.md

@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.12.2-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.12.3-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

backend/internal/access-list.js

@@ -508,8 +508,13 @@ const internalAccessList = {
 								if (typeof item.password !== 'undefined' && item.password.length) {
 									logger.info('Adding: ' + item.username);
 
-									utils.execFile('/usr/bin/htpasswd', ['-b', htpasswd_file, item.username, item.password])
+									utils.execFile('openssl', ['passwd', '-apr1', item.password])
-										.then((/*result*/) => {
+										.then((res) => {
+											try {
+												fs.appendFileSync(htpasswd_file, item.username + ':' + res + '\n', {encoding: 'utf8'});
+											} catch (err) {
+												reject(err);
+											}
 											next();
 										})
 										.catch((err) => {

backend/internal/mfa.js

@@ -1,76 +0,0 @@
-const authModel = require('../models/auth');
-const error     = require('../lib/error');
-const speakeasy = require('speakeasy');
-
-module.exports = {
-	validateMfaTokenForUser: (userId, token) => {
-		return authModel
-			.query()
-			.where('user_id', userId)
-			.first()
-			.then((auth) => {
-				if (!auth || !auth.mfa_enabled) {
-					throw new error.AuthError('MFA is not enabled for this user.');
-				}
-				const verified = speakeasy.totp.verify({
-					secret:   auth.mfa_secret,
-					encoding: 'base32',
-					token:    token,
-					window:   2
-				});
-				if (!verified) {
-					throw new error.AuthError('Invalid MFA token.');
-				}
-				return true;
-			});
-	},
-	isMfaEnabledForUser: (userId) => {
-		return authModel
-			.query()
-			.where('user_id', userId)
-			.first()
-			.then((auth) => {
-				console.log(auth);
-				if (!auth) {
-					throw new error.AuthError('User not found.');
-				}
-				return auth.mfa_enabled === true;
-			});
-	},
-	createMfaSecretForUser: (userId) => {
-		const secret = speakeasy.generateSecret({ length: 20 });
-		console.log(secret);
-		return authModel
-			.query()
-			.where('user_id', userId)
-			.update({
-				mfa_secret: secret.base32
-			})
-			.then(() => secret);
-	},
-	enableMfaForUser: (userId, token) => {
-		return authModel
-			.query()
-			.where('user_id', userId)
-			.first()
-			.then((auth) => {
-				if (!auth || !auth.mfa_secret) {
-					throw new error.AuthError('MFA is not set up for this user.');
-				}
-				const verified = speakeasy.totp.verify({
-					secret:   auth.mfa_secret,
-					encoding: 'base32',
-					token:    token,
-					window:   2
-				});
-				if (!verified) {
-					throw new error.AuthError('Invalid MFA token.');
-				}
-				return authModel
-					.query()
-					.where('user_id', userId)
-					.update({ mfa_enabled: true })
-					.then(() => true);
-			});
-	},
-};

backend/internal/token.js

@@ -4,7 +4,6 @@ const userModel  = require('../models/user');
 const authModel  = require('../models/auth');
 const helpers    = require('../lib/helpers');
 const TokenModel = require('../models/token');
-const mfa        = require('../internal/mfa'); // <-- added MFA import
 
 const ERROR_MESSAGE_INVALID_AUTH = 'Invalid email or password';
 
@@ -22,8 +21,6 @@ module.exports = {
 	getTokenFromEmail: (data, issuer) => {
 		let Token = new TokenModel();
 
-		console.log(data);
-
 		data.scope  = data.scope || 'user';
 		data.expiry = data.expiry || '1d';
 
@@ -44,66 +41,34 @@ module.exports = {
 						.then((auth) => {
 							if (auth) {
 								return auth.verifyPassword(data.secret)
-									.then(async (valid) => {
+									.then((valid) => {
 										if (valid) {
+
 											if (data.scope !== 'user' && _.indexOf(user.roles, data.scope) === -1) {
+												// The scope requested doesn't exist as a role against the user,
+												// you shall not pass.
 												throw new error.AuthError('Invalid scope: ' + data.scope);
 											}
-											return await mfa.isMfaEnabledForUser(user.id)
-												.then((mfaEnabled) => {
-													if (mfaEnabled) {
-														if (!data.mfa_token) {
-															throw new error.AuthError('MFA token required');
-														}
-														console.log(data.mfa_token);
-														return mfa.validateMfaTokenForUser(user.id, data.mfa_token)
-															.then((mfaValid) => {
-																if (!mfaValid) {
-																	throw new error.AuthError('Invalid MFA token');
-																}
-																// Create a moment of the expiry expression
-																let expiry = helpers.parseDatePeriod(data.expiry);
-																if (expiry === null) {
-																	throw new error.AuthError('Invalid expiry time: ' + data.expiry);
-																}
 
-																return Token.create({
+											// Create a moment of the expiry expression
-																	iss:   issuer || 'api',
+											let expiry = helpers.parseDatePeriod(data.expiry);
-																	attrs: {
+											if (expiry === null) {
-																		id: user.id
+												throw new error.AuthError('Invalid expiry time: ' + data.expiry);
-																	},
+											}
-																	scope:     [data.scope],
-																	expiresIn: data.expiry
-																})
-																	.then((signed) => {
-																		return {
-																			token:   signed.token,
-																			expires: expiry.toISOString()
-																		};
-																	});
-															});
-													} else {
-														// Create a moment of the expiry expression
-														let expiry = helpers.parseDatePeriod(data.expiry);
-														if (expiry === null) {
-															throw new error.AuthError('Invalid expiry time: ' + data.expiry);
-														}
 
-														return Token.create({
+											return Token.create({
-															iss:   issuer || 'api',
+												iss:   issuer || 'api',
-															attrs: {
+												attrs: {
-																id: user.id
+													id: user.id
-															},
+												},
-															scope:     [data.scope],
+												scope:     [data.scope],
-															expiresIn: data.expiry
+												expiresIn: data.expiry
-														})
+											})
-															.then((signed) => {
+												.then((signed) => {
-																return {
+													return {
-																	token:   signed.token,
+														token:   signed.token,
-																	expires: expiry.toISOString()
+														expires: expiry.toISOString()
-																};
+													};
-															});
-													}
 												});
 										} else {
 											throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);

backend/internal/user.js

@@ -507,8 +507,7 @@ const internalUser = {
 			.then((user) => {
 				return internalToken.getTokenFromUser(user);
 			});
-	},
+	}
-
 };
 
 module.exports = internalUser;

backend/migrations/20250115041439_mfa_integeration.js

@@ -1,45 +0,0 @@
-const migrate_name = 'identifier_for_migrate';
-const logger       = require('../logger').migrate;
-
-/**
- * Migrate
- *
- * @see http://knexjs.org/#Schema
- *
- * @param {Object} knex
- * @param {Promise} Promise
- * @returns {Promise}
- */
-exports.up = function (knex/*, Promise*/) {
-
-	logger.info('[' + migrate_name + '] Migrating Up...');
-
-	return knex.schema.alterTable('auth', (table) => {
-		table.string('mfa_secret');
-		table.boolean('mfa_enabled').defaultTo(false);
-	})
-		.then(() => {
-			logger.info('[' + migrate_name + '] User Table altered');
-			logger.info('[' + migrate_name + '] Migrating Up Complete');
-		});
-};
-
-/**
- * Undo Migrate
- *
- * @param {Object} knex
- * @param {Promise} Promise
- * @returns {Promise}
- */
-exports.down = function (knex/*, Promise*/) {
-	logger.info('[' + migrate_name + '] Migrating Down...');
-
-	return knex.schema.alterTable('auth', (table) => {
-		table.dropColumn('mfa_key');
-		table.dropColumn('mfa_enabled');
-	})
-		.then(() => {
-			logger.info('[' + migrate_name + '] User Table altered');
-			logger.info('[' + migrate_name + '] Migrating Down Complete');
-		});
-};

backend/package.json

@@ -23,10 +23,8 @@
 		"node-rsa": "^1.0.8",
 		"objection": "3.0.1",
 		"path": "^0.12.7",
-		"qrcode": "^1.5.4",
 		"pg": "^8.13.1",
 		"signale": "1.4.0",
-		"speakeasy": "^2.0.0",
 		"sqlite3": "5.1.6",
 		"temp-write": "^4.0.0"
 	},

backend/routes/main.js

@@ -27,7 +27,6 @@ router.get('/', (req, res/*, next*/) => {
 
 router.use('/schema', require('./schema'));
 router.use('/tokens', require('./tokens'));
-router.use('/mfa', require('./mfa'));
 router.use('/users', require('./users'));
 router.use('/audit-log', require('./audit-log'));
 router.use('/reports', require('./reports'));

backend/routes/mfa.js

@@ -1,89 +0,0 @@
-const express       = require('express');
-const jwtdecode     = require('../lib/express/jwt-decode');
-const apiValidator  = require('../lib/validator/api');
-const internalToken = require('../internal/token');
-const schema        = require('../schema');
-const internalMfa   = require('../internal/mfa');
-const qrcode        = require('qrcode');
-const speakeasy     = require('speakeasy');
-const userModel     = require('../models/user');
-
-let router = express.Router({
-	caseSensitive: true,
-	strict:        true,
-	mergeParams:   true
-});
-
-router
-	.route('/')
-	.options((_, res) => {
-		res.sendStatus(204);
-	})
-
-	.get(async (req, res, next) => {
-		internalToken.getFreshToken(res.locals.access, {
-			expiry: (typeof req.query.expiry !== 'undefined' ? req.query.expiry : null),
-			scope:  (typeof req.query.scope !== 'undefined' ? req.query.scope : null)
-		})
-			.then((data) => {
-				res.status(200)
-					.send(data);
-			})
-			.catch(next);
-	});
-
-router
-	.route('/create')
-	.post(jwtdecode(), (req, res, next) => {
-		if (!res.locals.access) {
-			return next(new Error('Invalid token'));
-		}
-		const userId = res.locals.access.token.getUserId();
-		internalMfa.createMfaSecretForUser(userId)
-			.then((secret) => {
-				return userModel.query()
-					.where('id', '=', userId)
-					.first()
-					.then((user) => {
-						if (!user) {
-							return next(new Error('User not found'));
-						}
-						return { secret, user };
-					});
-			})
-			.then(({ secret, user }) => {
-				const otpAuthUrl = speakeasy.otpauthURL({
-					secret: secret.ascii,
-					label:  user.email,
-					issuer: 'Nginx Proxy Manager'
-				});
-				qrcode.toDataURL(otpAuthUrl, (err, dataUrl) => {
-					if (err) {
-						console.error('Error generating QR code:', err);
-						return next(err);
-					}
-					res.status(200).send({ qrCode: dataUrl });
-				});
-			})
-			.catch(next);
-	});
-
-router
-	.route('/enable')
-	.post(jwtdecode(), (req, res, next) => {
-		apiValidator(schema.getValidationSchema('/mfa', 'post'), req.body).then((params) => {
-			internalMfa.enableMfaForUser(res.locals.access.token.getUserId(), params.token)
-				.then(() => res.status(200).send({ success: true }))
-				.catch(next);
-		}
-		);});
-
-router
-	.route('/check')
-	.get(jwtdecode(), (req, res, next) => {
-		internalMfa.isMfaEnabledForUser(res.locals.access.token.getUserId())
-			.then((active) => res.status(200).send({ active }))
-			.catch(next);
-	});
-
-module.exports = router;

backend/schema/paths/mfa/post.json

@@ -1,41 +0,0 @@
-{
-	"operationId": "enableMfa",
-	"summary": "Enable multi-factor authentication for a user",
-	"tags": ["MFA"],
-	"requestBody": {
-		"description": "MFA Token Payload",
-		"required": true,
-		"content": {
-			"application/json": {
-				"schema": {
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"token": {
-							"type": "string",
-							"minLength": 1
-						}
-					},
-					"required": ["token"]
-				}
-			}
-		}
-	},
-	"responses": {
-		"200": {
-			"description": "MFA enabled successfully",
-			"content": {
-				"application/json": {
-					"schema": {
-						"type": "object",
-						"properties": {
-							"success": {
-								"type": "boolean"
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

backend/schema/paths/tokens/post.json

@@ -22,10 +22,6 @@
 						"secret": {
 							"minLength": 1,
 							"type": "string"
-						},
-						"mfa_token": {
-							"minLength": 1,
-							"type": "string"
 						}
 					},
 					"required": ["identity", "secret"],

backend/schema/paths/users/post.json

@@ -14,7 +14,7 @@
 			"application/json": {
 				"schema": {
 					"type": "object",
-					"additionalProperties": true,
+					"additionalProperties": false,
 					"required": ["name", "nickname", "email"],
 					"properties": {
 						"name": {

backend/schema/swagger.json

@@ -15,11 +15,6 @@
 				"$ref": "./paths/get.json"
 			}
 		},
-		"/mfa": {
-			"post": {
-				"$ref": "./paths/mfa/post.json"
-			}
-		},
 		"/audit-log": {
 			"get": {
 				"$ref": "./paths/audit-log/get.json"

frontend/js/app/api.js

@@ -202,46 +202,7 @@ module.exports = {
         return fetch('get', '');
     },
 
-    Mfa: {
-        create: function () {
-            return fetch('post', 'mfa/create');
-        },
-        enable: function (token) {
-            return fetch('post', 'mfa/enable', {token: token});
-        },
-        check: function () {
-            return fetch('get', 'mfa/check');
-        }
-    },
-
     Tokens: {
-        
-        /**
-         * 
-         * @param {String} identity 
-         * @param {String} secret 
-         * @param {String} token 
-         * @param {Boolean} wipe 
-         * @returns {Promise}
-         */
-
-        loginWithMFA: function (identity, secret, mfaToken, wipe) {
-            return fetch('post', 'tokens', {identity: identity, secret: secret, mfa_token: mfaToken})
-                .then(response => {
-                    if (response.token) {
-                        if (wipe) {
-                            Tokens.clearTokens();
-                        }
-
-                        // Set storage token
-                        Tokens.addToken(response.token);
-                        return response.token;
-                    } else {
-                        Tokens.clearTokens();
-                        throw(new Error('No token returned'));
-                    }
-                });
-        },
 
         /**
          * @param   {String}  identity

frontend/js/app/controller.js

@@ -4,444 +4,438 @@ const Tokens   = require('./tokens');
 
 module.exports = {
 
-    /**
+	/**
-     * @param {String} route
+	 * @param {String} route
-     * @param {Object} [options]
+	 * @param {Object} [options]
-     * @returns {Boolean}
+	 * @returns {Boolean}
-     */
+	 */
-    navigate: function (route, options) {
+	navigate: function (route, options) {
-        options = options || {};
+		options = options || {};
-        Backbone.history.navigate(route.toString(), options);
+		Backbone.history.navigate(route.toString(), options);
-        return true;
+		return true;
-    },
+	},
 
-    /**
+	/**
-     * Login
+	 * Login
-     */
+	 */
-    showLogin: function () {
+	showLogin: function () {
-        window.location = '/login';
+		window.location = '/login';
-    },
+	},
 
-    /**
+	/**
-     * Users
+	 * Users
-     */
+	 */
-    showUsers: function () {
+	showUsers: function () {
-        let controller = this;
+		const controller = this;
-        if (Cache.User.isAdmin()) {
+		if (Cache.User.isAdmin()) {
-            require(['./main', './users/main'], (App, View) => {
+			require(['./main', './users/main'], (App, View) => {
-                controller.navigate('/users');
+				controller.navigate('/users');
-                App.UI.showAppContent(new View());
+				App.UI.showAppContent(new View());
-            });
+			});
-        } else {
+		} else {
-            this.showDashboard();
+			this.showDashboard();
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * User Form
+	 * User Form
-     *
+	 *
-     * @param [model]
+	 * @param [model]
-     */
+	 */
-    showUserForm: function (model) {
+	showUserForm: function (model) {
-        if (Cache.User.isAdmin()) {
+		if (Cache.User.isAdmin()) {
-            require(['./main', './user/form'], function (App, View) {
+			require(['./main', './user/form'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * User Permissions Form
+	 * User Permissions Form
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showUserPermissions: function (model) {
+	showUserPermissions: function (model) {
-        if (Cache.User.isAdmin()) {
+		if (Cache.User.isAdmin()) {
-            require(['./main', './user/permissions'], function (App, View) {
+			require(['./main', './user/permissions'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * User Password Form
+	 * User Password Form
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showUserPasswordForm: function (model) {
+	showUserPasswordForm: function (model) {
-        if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
+		if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
-            require(['./main', './user/password'], function (App, View) {
+			require(['./main', './user/password'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * User Delete Confirm
+	 * User Delete Confirm
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showUserDeleteConfirm: function (model) {
+	showUserDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
+		if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
-            require(['./main', './user/delete'], function (App, View) {
+			require(['./main', './user/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Dashboard
+	 * Dashboard
-     */
+	 */
-    showDashboard: function () {
+	showDashboard: function () {
-        let controller = this;
+		const controller = this;
+		require(['./main', './dashboard/main'], (App, View) => {
+			controller.navigate('/');
+			App.UI.showAppContent(new View());
+		});
+	},
 
-        require(['./main', './dashboard/main'], (App, View) => {
+	/**
-            controller.navigate('/');
+	 * Nginx Proxy Hosts
-            App.UI.showAppContent(new View());
+	 */
-        });
+	showNginxProxy: function () {
-    },
+		if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
+			const controller = this;
 
-    /**
+			require(['./main', './nginx/proxy/main'], (App, View) => {
-     * Nginx Proxy Hosts
+				controller.navigate('/nginx/proxy');
-     */
+				App.UI.showAppContent(new View());
-    showNginxProxy: function () {
+			});
-        if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
+		}
-            let controller = this;
+	},
 
-            require(['./main', './nginx/proxy/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/proxy');
+	 * Nginx Proxy Host Form
-                App.UI.showAppContent(new View());
+	 *
-            });
+	 * @param [model]
-        }
+	 */
-    },
+	showNginxProxyForm: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
+			require(['./main', './nginx/proxy/form'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-    /**
+	/**
-     * Nginx Proxy Host Form
+	 * Proxy Host Delete Confirm
-     *
+	 *
-     * @param [model]
+	 * @param model
-     */
+	 */
-    showNginxProxyForm: function (model) {
+	showNginxProxyDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-            require(['./main', './nginx/proxy/form'], function (App, View) {
+			require(['./main', './nginx/proxy/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Proxy Host Delete Confirm
+	 * Nginx Redirection Hosts
-     *
+	 */
-     * @param model
+	showNginxRedirection: function () {
-     */
+		if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
-    showNginxProxyDeleteConfirm: function (model) {
+			const controller = this;
-        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
+			require(['./main', './nginx/redirection/main'], (App, View) => {
-            require(['./main', './nginx/proxy/delete'], function (App, View) {
+				controller.navigate('/nginx/redirection');
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showAppContent(new View());
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Nginx Redirection Hosts
+	 * Nginx Redirection Host Form
-     */
+	 *
-    showNginxRedirection: function () {
+	 * @param [model]
-        if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
+	 */
-            let controller = this;
+	showNginxRedirectionForm: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
+			require(['./main', './nginx/redirection/form'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-            require(['./main', './nginx/redirection/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/redirection');
+	 * Proxy Redirection Delete Confirm
-                App.UI.showAppContent(new View());
+	 *
-            });
+	 * @param model
-        }
+	 */
-    },
+	showNginxRedirectionDeleteConfirm: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
+			require(['./main', './nginx/redirection/delete'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-    /**
+	/**
-     * Nginx Redirection Host Form
+	 * Nginx Stream Hosts
-     *
+	 */
-     * @param [model]
+	showNginxStream: function () {
-     */
+		if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
-    showNginxRedirectionForm: function (model) {
+			const controller = this;
-        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
+			require(['./main', './nginx/stream/main'], (App, View) => {
-            require(['./main', './nginx/redirection/form'], function (App, View) {
+				controller.navigate('/nginx/stream');
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showAppContent(new View());
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Proxy Redirection Delete Confirm
+	 * Stream Form
-     *
+	 *
-     * @param model
+	 * @param [model]
-     */
+	 */
-    showNginxRedirectionDeleteConfirm: function (model) {
+	showNginxStreamForm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-            require(['./main', './nginx/redirection/delete'], function (App, View) {
+			require(['./main', './nginx/stream/form'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Nginx Stream Hosts
+	 * Stream Delete Confirm
-     */
+	 *
-    showNginxStream: function () {
+	 * @param model
-        if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
+	 */
-            let controller = this;
+	showNginxStreamDeleteConfirm: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
+			require(['./main', './nginx/stream/delete'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-            require(['./main', './nginx/stream/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/stream');
+	 * Nginx Dead Hosts
-                App.UI.showAppContent(new View());
+	 */
-            });
+	showNginxDead: function () {
-        }
+		if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
-    },
+			const controller = this;
+			require(['./main', './nginx/dead/main'], (App, View) => {
+				controller.navigate('/nginx/404');
+				App.UI.showAppContent(new View());
+			});
+		}
+	},
 
-    /**
+	/**
-     * Stream Form
+	 * Dead Host Form
-     *
+	 *
-     * @param [model]
+	 * @param [model]
-     */
+	 */
-    showNginxStreamForm: function (model) {
+	showNginxDeadForm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-            require(['./main', './nginx/stream/form'], function (App, View) {
+			require(['./main', './nginx/dead/form'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Stream Delete Confirm
+	 * Dead Host Delete Confirm
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showNginxStreamDeleteConfirm: function (model) {
+	showNginxDeadDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-            require(['./main', './nginx/stream/delete'], function (App, View) {
+			require(['./main', './nginx/dead/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Nginx Dead Hosts
+	 * Help Dialog
-     */
+	 *
-    showNginxDead: function () {
+	 * @param {String}  title
-        if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
+	 * @param {String}  content
-            let controller = this;
+	 */
+	showHelp: function (title, content) {
+		require(['./main', './help/main'], function (App, View) {
+			App.UI.showModalDialog(new View({title: title, content: content}));
+		});
+	},
 
-            require(['./main', './nginx/dead/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/404');
+	 * Nginx Access
-                App.UI.showAppContent(new View());
+	 */
-            });
+	showNginxAccess: function () {
-        }
+		if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
-    },
+			const controller = this;
+			require(['./main', './nginx/access/main'], (App, View) => {
+				controller.navigate('/nginx/access');
+				App.UI.showAppContent(new View());
+			});
+		}
+	},
 
-    /**
+	/**
-     * Dead Host Form
+	 * Nginx Access List Form
-     *
+	 *
-     * @param [model]
+	 * @param [model]
-     */
+	 */
-    showNginxDeadForm: function (model) {
+	showNginxAccessListForm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-            require(['./main', './nginx/dead/form'], function (App, View) {
+			require(['./main', './nginx/access/form'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Dead Host Delete Confirm
+	 * Access List Delete Confirm
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showNginxDeadDeleteConfirm: function (model) {
+	showNginxAccessListDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-            require(['./main', './nginx/dead/delete'], function (App, View) {
+			require(['./main', './nginx/access/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Help Dialog
+	 * Nginx Certificates
-     *
+	 */
-     * @param {String}  title
+	showNginxCertificates: function () {
-     * @param {String}  content
+		if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
-     */
+			const controller = this;
-    showHelp: function (title, content) {
+			require(['./main', './nginx/certificates/main'], (App, View) => {
-        require(['./main', './help/main'], function (App, View) {
+				controller.navigate('/nginx/certificates');
-            App.UI.showModalDialog(new View({title: title, content: content}));
+				App.UI.showAppContent(new View());
-        });
+			});
-    },
+		}
+	},
 
-    /**
+	/**
-     * Nginx Access
+	 * Nginx Certificate Form
-     */
+	 *
-    showNginxAccess: function () {
+	 * @param [model]
-        if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
+	 */
-            let controller = this;
+	showNginxCertificateForm: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+			require(['./main', './nginx/certificates/form'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-            require(['./main', './nginx/access/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/access');
+	 * Certificate Renew
-                App.UI.showAppContent(new View());
+	 *
-            });
+	 * @param model
-        }
+	 */
-    },
+	showNginxCertificateRenew: function (model) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+			require(['./main', './nginx/certificates/renew'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-    /**
+	/**
-     * Nginx Access List Form
+	 * Certificate Delete Confirm
-     *
+	 *
-     * @param [model]
+	 * @param model
-     */
+	 */
-    showNginxAccessListForm: function (model) {
+	showNginxCertificateDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-            require(['./main', './nginx/access/form'], function (App, View) {
+			require(['./main', './nginx/certificates/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showModalDialog(new View({model: model}));
-            });
+			});
-        }
+		}
-    },
+	},
 
-    /**
+	/**
-     * Access List Delete Confirm
+	 * Certificate Test Reachability
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showNginxAccessListDeleteConfirm: function (model) {
+	showNginxCertificateTestReachability: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+	  if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-            require(['./main', './nginx/access/delete'], function (App, View) {
+		require(['./main', './nginx/certificates/test'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
+		  App.UI.showModalDialog(new View({model: model}));
-            });
+		});
-        }
+	  }
-    },
+	},
 
-    /**
+	/**
-     * Nginx Certificates
+	 * Audit Log
-     */
+	 */
-    showNginxCertificates: function () {
+	showAuditLog: function () {
-        if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
+		const controller = this;
-            let controller = this;
+		if (Cache.User.isAdmin()) {
+			require(['./main', './audit-log/main'], (App, View) => {
+				controller.navigate('/audit-log');
+				App.UI.showAppContent(new View());
+			});
+		} else {
+			this.showDashboard();
+		}
+	},
 
-            require(['./main', './nginx/certificates/main'], (App, View) => {
+	/**
-                controller.navigate('/nginx/certificates');
+	 * Audit Log Metadata
-                App.UI.showAppContent(new View());
+	 *
-            });
+	 * @param model
-        }
+	 */
-    },
+	showAuditMeta: function (model) {
+		if (Cache.User.isAdmin()) {
+			require(['./main', './audit-log/meta'], function (App, View) {
+				App.UI.showModalDialog(new View({model: model}));
+			});
+		}
+	},
 
-    /**
+	/**
-     * Nginx Certificate Form
+	 * Settings
-     *
+	 */
-     * @param [model]
+	showSettings: function () {
-     */
+		const controller = this;
-    showNginxCertificateForm: function (model) {
+		if (Cache.User.isAdmin()) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+			require(['./main', './settings/main'], (App, View) => {
-            require(['./main', './nginx/certificates/form'], function (App, View) {
+				controller.navigate('/settings');
-                App.UI.showModalDialog(new View({model: model}));
+				App.UI.showAppContent(new View());
-            });
+			});
-        }
+		} else {
-    },
+			this.showDashboard();
+		}
+	},
 
-    /**
+	/**
-     * Certificate Renew
+	 * Settings Item Form
-     *
+	 *
-     * @param model
+	 * @param model
-     */
+	 */
-    showNginxCertificateRenew: function (model) {
+	showSettingForm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+		if (Cache.User.isAdmin()) {
-            require(['./main', './nginx/certificates/renew'], function (App, View) {
+			if (model.get('id') === 'default-site') {
-                App.UI.showModalDialog(new View({model: model}));
+				require(['./main', './settings/default-site/main'], function (App, View) {
-            });
+					App.UI.showModalDialog(new View({model: model}));
-        }
+				});
-    },
+			}
+		}
+	},
 
-    /**
+	/**
-     * Certificate Delete Confirm
+	 * Logout
-     *
+	 */
-     * @param model
+	logout: function () {
-     */
+		Tokens.dropTopToken();
-    showNginxCertificateDeleteConfirm: function (model) {
+		this.showLogin();
-        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+	}
-            require(['./main', './nginx/certificates/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
-            });
-        }
-    },
-
-    /**
-     * Certificate Test Reachability
-     *
-     * @param model
-     */
-    showNginxCertificateTestReachability: function (model) {
-      if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-        require(['./main', './nginx/certificates/test'], function (App, View) {
-          App.UI.showModalDialog(new View({model: model}));
-        });
-      }
-    },
-
-    /**
-     * Audit Log
-     */
-    showAuditLog: function () {
-        let controller = this;
-        if (Cache.User.isAdmin()) {
-            require(['./main', './audit-log/main'], (App, View) => {
-                controller.navigate('/audit-log');
-                App.UI.showAppContent(new View());
-            });
-        } else {
-            this.showDashboard();
-        }
-    },
-
-    /**
-     * Audit Log Metadata
-     *
-     * @param model
-     */
-    showAuditMeta: function (model) {
-        if (Cache.User.isAdmin()) {
-            require(['./main', './audit-log/meta'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
-            });
-        }
-    },
-
-    /**
-     * Settings
-     */
-    showSettings: function () {
-        let controller = this;
-        if (Cache.User.isAdmin()) {
-            require(['./main', './settings/main'], (App, View) => {
-                controller.navigate('/settings');
-                App.UI.showAppContent(new View());
-            });
-        } else {
-            this.showDashboard();
-        }
-    },
-
-    /**
-     * Settings Item Form
-     *
-     * @param model
-     */
-    showSettingForm: function (model) {
-        if (Cache.User.isAdmin()) {
-            if (model.get('id') === 'default-site') {
-                require(['./main', './settings/default-site/main'], function (App, View) {
-                    App.UI.showModalDialog(new View({model: model}));
-                });
-            }
-        }
-    },
-
-    /**
-     * Logout
-     */
-    logout: function () {
-        Tokens.dropTopToken();
-        this.showLogin();
-    }
 };

frontend/js/app/dashboard/main.js

@@ -6,87 +6,85 @@ const Helpers    = require('../../lib/helpers');
 const template   = require('./main.ejs');
 
 module.exports = Mn.View.extend({
-    template: template,
+	template: template,
-    id:       'dashboard',
+	id:       'dashboard',
-    columns:  0,
+	columns:  0,
 
-    stats: {},
+	stats: {},
 
-    ui: {
+	ui: {
-        links: 'a'
+		links: 'a'
-    },
+	},
 
-    events: {
+	events: {
-        'click @ui.links': function (e) {
+		'click @ui.links': function (e) {
-            e.preventDefault();
+			e.preventDefault();
-            Controller.navigate($(e.currentTarget).attr('href'), true);
+			Controller.navigate($(e.currentTarget).attr('href'), true);
-        }
+		}
-    },
+	},
 
-    templateContext: function () {
+	templateContext: function () {
-        let view = this;
+		const view = this;
 
-        return {
+		return {
-            getUserName: function () {
+			getUserName: function () {
-                return Cache.User.get('nickname') || Cache.User.get('name');
+				return Cache.User.get('nickname') || Cache.User.get('name');
-            },
+			},
 
-            getHostStat: function (type) {
+			getHostStat: function (type) {
-                if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
+				if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
-                    return Helpers.niceNumber(view.stats.hosts[type]);
+					return Helpers.niceNumber(view.stats.hosts[type]);
-                }
+				}
 
-                return '-';
+				return '-';
-            },
+			},
 
-            canShow: function (perm) {
+			canShow: function (perm) {
-                return Cache.User.isAdmin() || Cache.User.canView(perm);
+				return Cache.User.isAdmin() || Cache.User.canView(perm);
-            },
+			},
 
-            columns: view.columns
+			columns: view.columns
-        };
+		};
-    },
+	},
 
-    onRender: function () {
+	onRender: function () {
-        let view = this;
+		const view = this;
+		if (typeof view.stats.hosts === 'undefined') {
+			Api.Reports.getHostStats()
+				.then(response => {
+					if (!view.isDestroyed()) {
+						view.stats.hosts = response;
+						view.render();
+					}
+				})
+				.catch(err => {
+					console.log(err);
+				});
+		}
+	},
 
-        if (typeof view.stats.hosts === 'undefined') {
+	/**
-            Api.Reports.getHostStats()
+	 * @param {Object}  [model]
-                .then(response => {
+	 */
-                    if (!view.isDestroyed()) {
+	preRender: function (model) {
-                        view.stats.hosts = response;
+		this.columns = 0;
-                        view.render();
-                    }
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        }
-    },
 
-    /**
+		// calculate the available columns based on permissions for the objects
-     * @param {Object}  [model]
+		// and store as a variable
-     */
+		const perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
-    preRender: function (model) {
-        this.columns = 0;
 
-        // calculate the available columns based on permissions for the objects
+		perms.map(perm => {
-        // and store as a variable
+			this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
-        //let view = this;
+		});
-        let perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
 
-        perms.map(perm => {
+		// Prevent double rendering on initial calls
-            this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
+		if (typeof model !== 'undefined') {
-        });
+			this.render();
+		}
+	},
 
-        // Prevent double rendering on initial calls
+	initialize: function () {
-        if (typeof model !== 'undefined') {
+		this.preRender();
-            this.render();
+		this.listenTo(Cache.User, 'change', this.preRender);
-        }
+	}
-    },
-
-    initialize: function () {
-        this.preRender();
-        this.listenTo(Cache.User, 'change', this.preRender);
-    }
 });

frontend/js/app/user/form.ejs

@@ -25,17 +25,6 @@
                         <div class="invalid-feedback secret-error"></div>
                     </div>
                 </div>
-
-                <div class="col-sm-12 col-md-12">
-                    <label class="form-label mfa-label" style="display: none;"><%- i18n('mfa', 'mfa') %></label>
-                    <button type="button" class="btn btn-info add-mfa"><%- i18n('mfa', 'add-mfa') %></button>
-                    <p class="qr-instructions" style="display: none;"><%- i18n('mfa', 'mfa-setup-instruction') %></p>
-                    <div class="mfa-validation-container" style="display: none;">
-                        <label class="form-label"><%- i18n('mfa', 'mfa-token') %> <span class="form-required">*</span></label>
-                        <input name="mfa_validation" type="text" class="form-control" placeholder="000000" value="">
-                    </div>
-                </div>
-
                 <% if (isAdmin() && !isSelf()) { %>
                 <div class="col-sm-12 col-md-12">
                     <div class="form-label"><%- i18n('roles', 'title') %></div>

frontend/js/app/user/form.js

@@ -14,11 +14,7 @@ module.exports = Mn.View.extend({
         buttons: '.modal-footer button',
         cancel:  'button.cancel',
         save:    'button.save',
-        error:   '.secret-error',
+        error:   '.secret-error'
-        addMfa:  '.add-mfa',
-        mfaLabel: '.mfa-label', // added binding
-        mfaValidation: '.mfa-validation-container', // added binding
-        qrInstructions: '.qr-instructions' // added binding for instructions
     },
 
     events: {
@@ -29,10 +25,6 @@ module.exports = Mn.View.extend({
             let view = this;
             let data = this.ui.form.serializeJSON();
 
-            // Save "mfa_validation" value and remove it from data
-            let mfaToken = data.mfa_validation;
-            delete data.mfa_validation;
-
             let show_password = this.model.get('email') === 'admin@example.com';
 
             // admin@example.com is not allowed
@@ -70,15 +62,6 @@ module.exports = Mn.View.extend({
                     }
 
                     view.model.set(result);
-
-                    if (mfaToken) {
-                        return App.Api.Mfa.enable(mfaToken)
-                            .then(() => result);
-                    }
-                    console.log(result);
-                    return result;
-                })
-                .then(result => {
                     App.UI.closeModal(function () {
                         if (method === App.Api.Users.create) {
                             // Show permissions dialog immediately
@@ -92,20 +75,6 @@ module.exports = Mn.View.extend({
                     this.ui.error.text(err.message).show();
                     this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
                 });
-        },
-        'click @ui.addMfa': function (e) {
-            let view = this;
-            App.Api.Mfa.create()
-                .then(response => {
-                    view.ui.addMfa.replaceWith(`<img class="qr-code" src="${response.qrCode}" alt="QR Code">`);
-                    view.ui.qrInstructions.show();
-                    view.ui.mfaValidation.show();
-                    // Add required attribute once MFA is activated
-                    view.ui.mfaValidation.find('input[name="mfa_validation"]').attr('required', true);
-                })
-                .catch(err => {
-                    view.ui.error.text(err.message).show();
-                });
         }
     },
 
@@ -135,29 +104,5 @@ module.exports = Mn.View.extend({
         if (typeof options.model === 'undefined' || !options.model) {
             this.model = new UserModel.Model();
         }
-    },
-
-    onRender: function () {
-        let view = this;
-        App.Api.Mfa.check()
-            .then(response => {
-                if (response.active) {
-                    view.ui.addMfa.hide();
-                    view.ui.mfaLabel.hide();
-                    view.ui.qrInstructions.hide();
-                    view.ui.mfaValidation.hide();
-                    // Remove required attribute if MFA is active & field is hidden
-                    view.ui.mfaValidation.find('input[name="mfa_validation"]').removeAttr('required');
-                } else {
-                    view.ui.addMfa.show();
-                    view.ui.mfaLabel.show();
-                    view.ui.qrInstructions.hide();
-                    view.ui.mfaValidation.hide();
-                    view.ui.mfaValidation.find('input[name="mfa_validation"]').removeAttr('required');
-                }
-            })
-            .catch(err => {
-                view.ui.error.text(err.message).show();
-            });
     }
 });

frontend/js/i18n/messages.json

@@ -37,15 +37,8 @@
       "all": "All",
       "any": "Any"
     },
-    "mfa": {
-      "mfa": "Multi Factor Authentication",
-      "add-mfa": "Generate secret",
-      "mfa-setup-instruction": "Scan this QR code in your authenticator app to set up MFA and then enter the current MFA code in the input field.",
-      "mfa-token": "Multi factor authentication token"
-    },
     "login": {
-      "title": "Login to your account",
+      "title": "Login to your account"
-      "mfa-required-text": "Please enter your MFA token to continue"
     },
     "main": {
       "app": "Nginx Proxy Manager",

frontend/js/login/ui/login.ejs

@@ -1,4 +1,3 @@
-
 <div class="container">
     <div class="row">
         <div class="col col-login mx-auto">
@@ -25,12 +24,6 @@
                                     <input name="secret" type="password" class="form-control" placeholder="<%- i18n('str', 'password') %>" required>
                                     <div class="invalid-feedback secret-error"></div>
                                 </div>
-                                <div class="form-group mfa-group" style="display: none;">
-                                    <p class="mfa-info"><%- i18n('login', 'mfa-required-text') %>:</p>
-                                    <label class="form-label"><%- i18n('mfa', 'mfa-token') %></label>
-                                    <input name="mfa_token" type="text" class="form-control" placeholder="<%- i18n('mfa', 'mfa-token') %>">
-                                    <div class="invalid-feedback mfa-error"></div>
-                                </div>
                                 <div class="form-footer">
                                     <button type="submit" class="btn btn-teal btn-block"><%- i18n('str', 'sign-in') %></button>
                                 </div>
@@ -41,4 +34,4 @@
             </form>
         </div>
     </div>
-</div>
+</div>

frontend/js/login/ui/login.js

@@ -13,11 +13,7 @@ module.exports = Mn.View.extend({
         identity: 'input[name="identity"]',
         secret:   'input[name="secret"]',
         error:    '.secret-error',
-        error_mfa:'.mfa-error',
+        button:   'button'
-        button:   'button',
-        mfaGroup: '.mfa-group',    // added MFA group selector
-        mfaToken: 'input[name="mfa_token"]', // added MFA token input
-        mfaInfo:  '.mfa-info' // added MFA info element
     },
 
     events: {
@@ -26,36 +22,14 @@ module.exports = Mn.View.extend({
             this.ui.button.addClass('btn-loading').prop('disabled', true);
             this.ui.error.hide();
 
-            if(this.ui.mfaToken.val()) {
+            Api.Tokens.login(this.ui.identity.val(), this.ui.secret.val(), true)
-                Api.Tokens.loginWithMFA(this.ui.identity.val(), this.ui.secret.val(), this.ui.mfaToken.val(), true)
                 .then(() => {
                     window.location = '/';
                 })
                 .catch(err => {
-                    if (err.message === 'Invalid MFA token.') {
+                    this.ui.error.text(err.message).show();
-                        this.ui.error_mfa.text(err.message).show();
-                    } else {
-                        this.ui.error.text(err.message).show();
-                    }
                     this.ui.button.removeClass('btn-loading').prop('disabled', false);
                 });
-            } else {
-                Api.Tokens.login(this.ui.identity.val(), this.ui.secret.val(), true)
-                .then(() => {
-                    window.location = '/';
-                })
-                .catch(err => {
-                    if (err.message === 'MFA token required') {
-                        this.ui.mfaGroup.show();
-                        this.ui.mfaInfo.show();
-                    } else {
-                        this.ui.error.text(err.message).show();
-                    }
-                    this.ui.button.removeClass('btn-loading').prop('disabled', false);
-                });
-            }
-
-            
         }
     },
 
@@ -66,5 +40,3 @@ module.exports = Mn.View.extend({
         }
     }
 });
-
-

global/certbot-dns-plugins.json

@@ -161,11 +161,11 @@
 	},
 	"domainoffensive": {
 		"name": "DomainOffensive (do.de)",
-		"package_name": "certbot-dns-do",
+		"package_name": "certbot-dns-domainoffensive",
-		"version": "~=0.31.0",
+		"version": "~=2.0.0",
 		"dependencies": "",
 		"credentials": "dns_do_api_token = YOUR_DO_DE_AUTH_TOKEN",
-		"full_plugin_name": "dns-do"
+		"full_plugin_name": "dns-domainoffensive"
 	},
 	"domeneshop": {
 		"name": "Domeneshop",
@@ -534,5 +534,13 @@
 		"dependencies": "",
 		"credentials": "edgedns_client_secret = as3d1asd5d1a32sdfsdfs2d1asd5=\nedgedns_host = sdflskjdf-dfsdfsdf-sdfsdfsdf.luna.akamaiapis.net\nedgedns_access_token = kjdsi3-34rfsdfsdf-234234fsdfsdf\nedgedns_client_token = dkfjdf-342fsdfsd-23fsdfsdfsdf",
 		"full_plugin_name": "edgedns"
-	}
+	},
+	"zoneedit": {
+		"name": "ZoneEdit",
+		"package_name": "certbot-dns-zoneedit",
+		"version": "~=0.3.2",
+		"dependencies": "--no-deps dnspython",
+		"credentials": "dns_zoneedit_user = <login-user-id>\ndns_zoneedit_token = <dyn-authentication-token>",
+		"full_plugin_name": "dns-zoneedit"
+ 	}
 }