fix: bug where admins without 2fa were sent to 2fa challenge on relogin

Author: julianlam

library.js

@@ -188,6 +188,12 @@ plugin.addRoutes = async ({ router, middleware, helpers }) => {
 	});
 };
 
+plugin.appendConfig = async (config) => {
+	const hasKey = await plugin.hasKey(config.uid);
+	config['2factor'] = { hasKey };
+	return config;
+};
+
 plugin.addAdminNavigation = function (header, callback) {
 	translator.translate('[[2factor:title]]', (title) => {
 		header.plugins.push({

plugin.json

@@ -5,6 +5,7 @@
 	"hooks": [
 		{ "hook": "static:app.load", "method": "init" },
 		{ "hook": "static:api.routes", "method": "addRoutes" },
+		{ "hook": "filter:config.get", "method": "appendConfig" },
 		{ "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
 		{ "hook": "filter:user.profileMenu", "method": "addProfileItem" },
 		{ "hook": "response:router.page", "method": "check" },

static/lib/main.js

@@ -3,7 +3,10 @@
 (async () => {
 	const hooks = await app.require('hooks');
 	hooks.on('filter:admin.reauth', (data) => {
-		data.url = `/login/2fa?next=/${ajaxify.currentPage}`;
+		if (config['2factor'].hasKey) {
+			data.url = `/login/2fa?next=/${ajaxify.currentPage}`;
+		}
+
 		return data;
 	});
 })();