Bump mdast-util-to-hast from 13.2.0 to 13.2.1 in /frontend

Bumps [mdast-util-to-hast](https://github.com/syntax-tree/mdast-util-to-hast) from 13.2.0 to 13.2.1.
- [Release notes](https://github.com/syntax-tree/mdast-util-to-hast/releases)
- [Commits](https://github.com/syntax-tree/mdast-util-to-hast/compare/13.2.0...13.2.1)

---
updated-dependencies:
- dependency-name: mdast-util-to-hast
  dependency-version: 13.2.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -1,104 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/backend"
-    schedule:
-      interval: "weekly"
-    groups:
-      dev-patch-updates:
-        dependency-type: "development"
-        update-types:
-          - "patch"
-      dev-minor-updates:
-        dependency-type: "development"
-        update-types:
-          - "minor"
-      prod-patch-updates:
-        dependency-type: "production"
-        update-types:
-          - "patch"
-      prod-minor-updates:
-        dependency-type: "production"
-        update-types:
-          - "minor"
-
-  - package-ecosystem: "npm"
-    directory: "/frontend"
-    schedule:
-      interval: "weekly"
-    groups:
-      dev-patch-updates:
-        dependency-type: "development"
-        update-types:
-          - "patch"
-      dev-minor-updates:
-        dependency-type: "development"
-        update-types:
-          - "minor"
-      prod-patch-updates:
-        dependency-type: "production"
-        update-types:
-          - "patch"
-      prod-minor-updates:
-        dependency-type: "production"
-        update-types:
-          - "minor"
-
-  - package-ecosystem: "npm"
-    directory: "/docs"
-    schedule:
-      interval: "weekly"
-    groups:
-      dev-patch-updates:
-        dependency-type: "development"
-        update-types:
-          - "patch"
-      dev-minor-updates:
-        dependency-type: "development"
-        update-types:
-          - "minor"
-      prod-patch-updates:
-        dependency-type: "production"
-        update-types:
-          - "patch"
-      prod-minor-updates:
-        dependency-type: "production"
-        update-types:
-          - "minor"
-
-  - package-ecosystem: "npm"
-    directory: "/test"
-    schedule:
-      interval: "weekly"
-    groups:
-      dev-patch-updates:
-        dependency-type: "development"
-        update-types:
-          - "patch"
-      dev-minor-updates:
-        dependency-type: "development"
-        update-types:
-          - "minor"
-      prod-patch-updates:
-        dependency-type: "production"
-        update-types:
-          - "patch"
-      prod-minor-updates:
-        dependency-type: "production"
-        update-types:
-          - "minor"
-
-  - package-ecosystem: "docker"
-    directory: "/docker"
-    schedule:
-      interval: "weekly"
-    groups:
-      updates:
-        update-types:
-          - "patch"
-          - "minor"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         with:
           stale-issue-label: 'stale'
           stale-pr-label: 'stale'

.version

@@ -1 +1 @@
-2.13.7
+2.13.5

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.13.7-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.13.5-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/biome.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.3.14/schema.json",
+    "$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
     "vcs": {
         "enabled": true,
         "clientKind": "git",

backend/certbot/dns-plugins.json

@@ -74,7 +74,7 @@
 	"cloudns": {
 		"name": "ClouDNS",
 		"package_name": "certbot-dns-cloudns",
-		"version": "~=0.7.0",
+		"version": "~=0.6.0",
 		"dependencies": "",
 		"credentials": "# Target user ID (see https://www.cloudns.net/api-settings/)\n\tdns_cloudns_auth_id=1234\n\t# Alternatively, one of the following two options can be set:\n\t# dns_cloudns_sub_auth_id=1234\n\t# dns_cloudns_sub_auth_user=foobar\n\n\t# API password\n\tdns_cloudns_auth_password=password1",
 		"full_plugin_name": "dns-cloudns"
@@ -295,14 +295,6 @@
 		"credentials": "dns_he_user = Me\ndns_he_pass = my HE password",
 		"full_plugin_name": "dns-he"
 	},
-	"he-ddns": {
-		"name": "Hurricane Electric - DDNS",
-		"package_name": "certbot-dns-he-ddns",
-		"version": "~=0.1.0",
-		"dependencies": "",
-		"credentials": "dns_he_ddns_password = verysecurepassword",
-		"full_plugin_name": "dns-he-ddns"
-	},
 	"hetzner": {
 		"name": "Hetzner",
 		"package_name": "certbot-dns-hetzner",
@@ -383,14 +375,6 @@
 		"credentials": "dns_joker_username = <Dynamic DNS Authentication Username>\ndns_joker_password = <Dynamic DNS Authentication Password>\ndns_joker_domain = <Dynamic DNS Domain>",
 		"full_plugin_name": "dns-joker"
 	},
-	"kas": {
-        "name": "All-Inkl",
-        "package_name": "certbot-dns-kas",
-        "version": "~=0.1.1",
-        "dependencies": "kasserver",
-        "credentials": "dns_kas_user = your_kas_user\ndns_kas_password = your_kas_password",
-        "full_plugin_name": "dns-kas"
-    },
 	"leaseweb": {
 		"name": "LeaseWeb",
 		"package_name": "certbot-dns-leaseweb",
@@ -551,14 +535,6 @@
 		"credentials": "[default]\naws_access_key_id=AKIAIOSFODNN7EXAMPLE\naws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
 		"full_plugin_name": "dns-route53"
 	},
-	"simply": {
-		"name": "Simply",
-		"package_name": "certbot-dns-simply",
-		"version": "~=0.1.2",
-		"dependencies": "",
-		"credentials": "dns_simply_account_name = UExxxxxx\ndns_simply_api_key = DsHJdsjh2812872sahj",
-		"full_plugin_name": "dns-simply"
-	},
 	"spaceship": {
 		"name": "Spaceship",
 		"package_name": "certbot-dns-spaceship",

backend/internal/2fa.js

@@ -1,302 +0,0 @@
-import crypto from "node:crypto";
-import bcrypt from "bcrypt";
-import { createGuardrails, generateSecret, generateURI, verify } from "otplib";
-import errs from "../lib/error.js";
-import authModel from "../models/auth.js";
-import internalUser from "./user.js";
-
-const APP_NAME = "Nginx Proxy Manager";
-const BACKUP_CODE_COUNT = 8;
-
-/**
- * Generate backup codes
- * @returns {Promise<{plain: string[], hashed: string[]}>}
- */
-const generateBackupCodes = async () => {
-	const plain = [];
-	const hashed = [];
-
-	for (let i = 0; i < BACKUP_CODE_COUNT; i++) {
-		const code = crypto.randomBytes(4).toString("hex").toUpperCase();
-		plain.push(code);
-		const hash = await bcrypt.hash(code, 10);
-		hashed.push(hash);
-	}
-
-	return { plain, hashed };
-};
-
-const internal2fa = {
-	/**
-	 * Check if user has 2FA enabled
-	 * @param {number} userId
-	 * @returns {Promise<boolean>}
-	 */
-	isEnabled: async (userId) => {
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-		return auth?.meta?.totp_enabled === true;
-	},
-
-	/**
-	 * Get 2FA status for user
-	 * @param   {Access}  access
-	 * @param   {number}  userId
-	 * @returns {Promise<{enabled: boolean, backup_codes_remaining: number}>}
-	 */
-	getStatus: async (access, userId) => {
-		await access.can("users:password", userId);
-		await internalUser.get(access, { id: userId });
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-		const enabled = auth?.meta?.totp_enabled === true;
-		let backup_codes_remaining = 0;
-
-		if (enabled) {
-			const backupCodes = auth.meta.backup_codes || [];
-			backup_codes_remaining = backupCodes.length;
-		}
-
-		return {
-			enabled,
-			backup_codes_remaining,
-		};
-	},
-
-	/**
-	 * Start 2FA setup - store pending secret
-	 *
-	 * @param   {Access}  access
-	 * @param   {number} userId
-	 * @returns {Promise<{secret: string, otpauth_url: string}>}
-	 */
-	startSetup: async (access, userId) => {
-		await access.can("users:password", userId);
-		const user = await internalUser.get(access, { id: userId });
-		const secret = generateSecret();
-		const otpauth_url = generateURI({
-			issuer: APP_NAME,
-			label: user.email,
-			secret: secret,
-		});
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-
-		// ensure user isn't already setup for 2fa
-		const enabled = auth?.meta?.totp_enabled === true;
-		if (enabled) {
-			throw new errs.ValidationError("2FA is already enabled");
-		}
-
-		const meta = auth.meta || {};
-		meta.totp_pending_secret = secret;
-
-		await authModel
-			.query()
-			.where("id", auth.id)
-			.andWhere("user_id", userId)
-			.andWhere("type", "password")
-			.patch({ meta });
-
-		return { secret, otpauth_url };
-	},
-
-	/**
-	 * Enable 2FA after verifying code
-	 *
-	 * @param   {Access}  access
-	 * @param   {number}  userId
-	 * @param   {string}  code
-	 * @returns {Promise<{backup_codes: string[]}>}
-	 */
-	enable: async (access, userId, code) => {
-		await access.can("users:password", userId);
-		await internalUser.get(access, { id: userId });
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-		const secret = auth?.meta?.totp_pending_secret || false;
-
-		if (!secret) {
-			throw new errs.ValidationError("No pending 2FA setup found");
-		}
-
-		const result = await verify({ token: code, secret });
-		if (!result.valid) {
-			throw new errs.ValidationError("Invalid verification code");
-		}
-
-		const { plain, hashed } = await generateBackupCodes();
-
-		const meta = {
-			...auth.meta,
-			totp_secret: secret,
-			totp_enabled: true,
-			totp_enabled_at: new Date().toISOString(),
-			backup_codes: hashed,
-		};
-		delete meta.totp_pending_secret;
-
-		await authModel
-			.query()
-			.where("id", auth.id)
-			.andWhere("user_id", userId)
-			.andWhere("type", "password")
-			.patch({ meta });
-
-		return { backup_codes: plain };
-	},
-
-	/**
-	 * Disable 2FA
-	 *
-	 * @param   {Access}  access
-	 * @param   {number} userId
-	 * @param   {string} code
-	 * @returns {Promise<void>}
-	 */
-	disable: async (access, userId, code) => {
-		await access.can("users:password", userId);
-		await internalUser.get(access, { id: userId });
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-
-		const enabled = auth?.meta?.totp_enabled === true;
-		if (!enabled) {
-			throw new errs.ValidationError("2FA is not enabled");
-		}
-
-		const result = await verify({
-			token: code,
-			secret: auth.meta.totp_secret,
-		});
-
-		if (!result.valid) {
-			throw new errs.AuthError("Invalid verification code");
-		}
-
-		const meta = { ...auth.meta };
-		delete meta.totp_secret;
-		delete meta.totp_enabled;
-		delete meta.totp_enabled_at;
-		delete meta.backup_codes;
-
-		await authModel
-			.query()
-			.where("id", auth.id)
-			.andWhere("user_id", userId)
-			.andWhere("type", "password")
-			.patch({ meta });
-	},
-
-	/**
-	 * Verify 2FA code for login
-	 *
-	 * @param   {number} userId
-	 * @param   {string} token
-	 * @returns {Promise<boolean>}
-	 */
-	verifyForLogin: async (userId, token) => {
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-		const secret = auth?.meta?.totp_secret || false;
-
-		if (!secret) {
-			return false;
-		}
-
-		// Try TOTP code first, if it's 6 chars. it will throw errors if it's not 6 chars
-		// and the backup codes are 8 chars.
-		if (token.length === 6) {
-			const result = await verify({
-				token,
-				secret,
-				// These guardrails lower the minimum length requirement for secrets.
-				// In v12 of otplib the default minimum length is 10 and in v13 it is 16.
-				// Since there are 2fa secrets in the wild generated with v12 we need to allow shorter secrets
-				// so people won't be locked out when upgrading.
-				guardrails: createGuardrails({
-					MIN_SECRET_BYTES: 10,
-				}),
-			});
-
-			if (result.valid) {
-				return true;
-			}
-		}
-
-		// Try backup codes
-		const backupCodes = auth?.meta?.backup_codes || [];
-		for (let i = 0; i < backupCodes.length; i++) {
-			const match = await bcrypt.compare(token.toUpperCase(), backupCodes[i]);
-			if (match) {
-				// Remove used backup code
-				const updatedCodes = [...backupCodes];
-				updatedCodes.splice(i, 1);
-				const meta = { ...auth.meta, backup_codes: updatedCodes };
-				await authModel
-					.query()
-					.where("id", auth.id)
-					.andWhere("user_id", userId)
-					.andWhere("type", "password")
-					.patch({ meta });
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	/**
-	 * Regenerate backup codes
-	 *
-	 * @param   {Access}  access
-	 * @param   {number}  userId
-	 * @param   {string}  token
-	 * @returns {Promise<{backup_codes: string[]}>}
-	 */
-	regenerateBackupCodes: async (access, userId, token) => {
-		await access.can("users:password", userId);
-		await internalUser.get(access, { id: userId });
-		const auth = await internal2fa.getUserPasswordAuth(userId);
-		const enabled = auth?.meta?.totp_enabled === true;
-		const secret = auth?.meta?.totp_secret || false;
-
-		if (!enabled) {
-			throw new errs.ValidationError("2FA is not enabled");
-		}
-		if (!secret) {
-			throw new errs.ValidationError("No 2FA secret found");
-		}
-
-		const result = await verify({
-			token,
-			secret,
-		});
-
-		if (!result.valid) {
-			throw new errs.ValidationError("Invalid verification code");
-		}
-
-		const { plain, hashed } = await generateBackupCodes();
-
-		const meta = { ...auth.meta, backup_codes: hashed };
-		await authModel
-			.query()
-			.where("id", auth.id)
-			.andWhere("user_id", userId)
-			.andWhere("type", "password")
-			.patch({ meta });
-
-		return { backup_codes: plain };
-	},
-
-	getUserPasswordAuth: async (userId) => {
-		const auth = await authModel
-			.query()
-			.where("user_id", userId)
-			.andWhere("type", "password")
-			.first();
-
-		if (!auth) {
-			throw new errs.ItemNotFoundError("Auth not found");
-		}
-
-		return auth;
-	},
-};
-
-export default internal2fa;

backend/internal/certificate.js

@@ -798,11 +798,6 @@ const internalCertificate = {
 			certificate.domain_names.join(","),
 		];
 
-		// Add key-type parameter if specified
-		if (certificate.meta?.key_type) {
-			args.push("--key-type", certificate.meta.key_type);
-		}
-
 		const adds = internalCertificate.getAdditionalCertbotArgs(certificate.id);
 		args.push(...adds.args);
 
@@ -863,11 +858,6 @@ const internalCertificate = {
 			);
 		}
 
-		// Add key-type parameter if specified
-		if (certificate.meta?.key_type) {
-			args.push("--key-type", certificate.meta.key_type);
-		}
-
 		const adds = internalCertificate.getAdditionalCertbotArgs(certificate.id, certificate.meta.dns_provider);
 		args.push(...adds.args);
 
@@ -948,11 +938,6 @@ const internalCertificate = {
 			"--disable-hook-validation",
 		];
 
-		// Add key-type parameter if specified
-		if (certificate.meta?.key_type) {
-			args.push("--key-type", certificate.meta.key_type);
-		}
-
 		const adds = internalCertificate.getAdditionalCertbotArgs(certificate.id, certificate.meta.dns_provider);
 		args.push(...adds.args);
 
@@ -994,11 +979,6 @@ const internalCertificate = {
 			"--no-random-sleep-on-renew",
 		];
 
-		// Add key-type parameter if specified
-		if (certificate.meta?.key_type) {
-			args.push("--key-type", certificate.meta.key_type);
-		}
-
 		const adds = internalCertificate.getAdditionalCertbotArgs(certificate.id, certificate.meta.dns_provider);
 		args.push(...adds.args);
 

backend/internal/report.js

@@ -15,10 +15,10 @@ const internalReport = {
 				const userId = access.token.getUserId(1);
 
 				const promises = [
-					internalProxyHost.getCount(userId, access_data.permission_visibility),
-					internalRedirectionHost.getCount(userId, access_data.permission_visibility),
-					internalStream.getCount(userId, access_data.permission_visibility),
-					internalDeadHost.getCount(userId, access_data.permission_visibility),
+					internalProxyHost.getCount(userId, access_data.visibility),
+					internalRedirectionHost.getCount(userId, access_data.visibility),
+					internalStream.getCount(userId, access_data.visibility),
+					internalDeadHost.getCount(userId, access_data.visibility),
 				];
 
 				return Promise.all(promises);

backend/internal/token.js

@@ -4,12 +4,9 @@ import { parseDatePeriod } from "../lib/helpers.js";
 import authModel from "../models/auth.js";
 import TokenModel from "../models/token.js";
 import userModel from "../models/user.js";
-import twoFactor from "./2fa.js";
 
 const ERROR_MESSAGE_INVALID_AUTH = "Invalid email or password";
 const ERROR_MESSAGE_INVALID_AUTH_I18N = "error.invalid-auth";
-const ERROR_MESSAGE_INVALID_2FA = "Invalid verification code";
-const ERROR_MESSAGE_INVALID_2FA_I18N = "error.invalid-2fa";
 
 export default {
 	/**
@@ -62,25 +59,6 @@ export default {
 			throw new errs.AuthError(`Invalid scope: ${data.scope}`);
 		}
 
-		// Check if 2FA is enabled
-		const has2FA = await twoFactor.isEnabled(user.id);
-		if (has2FA) {
-			// Return challenge token instead of full token
-			const challengeToken = await Token.create({
-				iss: issuer || "api",
-				attrs: {
-					id: user.id,
-				},
-				scope: ["2fa-challenge"],
-				expiresIn: "5m",
-			});
-
-			return {
-				requires_2fa: true,
-				challenge_token: challengeToken.token,
-			};
-		}
-
 		// Create a moment of the expiry expression
 		const expiry = parseDatePeriod(data.expiry);
 		if (expiry === null) {
@@ -151,65 +129,6 @@ export default {
 		throw new error.AssertionFailedError("Existing token contained invalid user data");
 	},
 
-	/**
-	 * Verify 2FA code and return full token
-	 * @param {string} challengeToken
-	 * @param {string} code
-	 * @param {string} [expiry]
-	 * @returns {Promise}
-	 */
-	verify2FA: async (challengeToken, code, expiry) => {
-		const Token = TokenModel();
-		const tokenExpiry = expiry || "1d";
-
-		// Verify challenge token
-		let tokenData;
-		try {
-			tokenData = await Token.load(challengeToken);
-		} catch {
-			throw new errs.AuthError("Invalid or expired challenge token");
-		}
-
-		// Check scope
-		if (!tokenData.scope || tokenData.scope[0] !== "2fa-challenge") {
-			throw new errs.AuthError("Invalid challenge token");
-		}
-
-		const userId = tokenData.attrs?.id;
-		if (!userId) {
-			throw new errs.AuthError("Invalid challenge token");
-		}
-
-		// Verify 2FA code
-		const valid = await twoFactor.verifyForLogin(userId, code);
-		if (!valid) {
-			throw new errs.AuthError(
-				ERROR_MESSAGE_INVALID_2FA,
-				ERROR_MESSAGE_INVALID_2FA_I18N,
-			);
-		}
-
-		// Create full token
-		const expiryDate = parseDatePeriod(tokenExpiry);
-		if (expiryDate === null) {
-			throw new errs.AuthError(`Invalid expiry time: ${tokenExpiry}`);
-		}
-
-		const signed = await Token.create({
-			iss: "api",
-			attrs: {
-				id: userId,
-			},
-			scope: ["user"],
-			expiresIn: tokenExpiry,
-		});
-
-		return {
-			token: signed.token,
-			expires: expiryDate.toISOString(),
-		};
-	},
-
 	/**
 	 * @param   {Object} user
 	 * @returns {Promise}

backend/lib/config.js

@@ -5,7 +5,7 @@ import { global as logger } from "../logger.js";
 const keysFile         = '/data/keys.json';
 const mysqlEngine      = 'mysql2';
 const postgresEngine   = 'pg';
-const sqliteClientName = 'better-sqlite3';
+const sqliteClientName = 'sqlite3';
 
 let instance = null;
 
@@ -84,7 +84,6 @@ const configure = () => {
 	}
 
 	const envSqliteFile = process.env.DB_SQLITE_FILE || "/data/database.sqlite";
-
 	logger.info(`Using Sqlite: ${envSqliteFile}`);
 	instance = {
 		database: {

backend/package.json

@@ -12,38 +12,36 @@
 		"validate-schema": "node validate-schema.js"
 	},
 	"dependencies": {
-		"@apidevtools/json-schema-ref-parser": "^14.1.1",
+		"@apidevtools/json-schema-ref-parser": "^11.7.0",
 		"ajv": "^8.17.1",
-		"archiver": "^7.0.1",
+		"archiver": "^5.3.0",
 		"batchflow": "^0.4.0",
-		"bcrypt": "^6.0.0",
-		"better-sqlite3": "^12.6.2",
-		"body-parser": "^2.2.2",
+		"bcrypt": "^5.0.0",
+		"body-parser": "^1.20.3",
 		"compression": "^1.7.4",
-		"express": "^5.2.1",
+		"express": "^4.20.0",
 		"express-fileupload": "^1.5.2",
 		"gravatar": "^1.8.2",
-		"jsonwebtoken": "^9.0.3",
-		"knex": "3.1.0",
-		"liquidjs": "10.24.0",
-		"lodash": "^4.17.23",
+		"jsonwebtoken": "^9.0.2",
+		"knex": "2.4.2",
+		"liquidjs": "10.6.1",
+		"lodash": "^4.17.21",
 		"moment": "^2.30.1",
-		"mysql2": "^3.16.3",
+		"mysql2": "^3.15.3",
 		"node-rsa": "^1.1.1",
-		"objection": "3.1.5",
-		"otplib": "^13.2.1",
+		"objection": "3.0.1",
 		"path": "^0.12.7",
-		"pg": "^8.18.0",
+		"pg": "^8.16.3",
 		"proxy-agent": "^6.5.0",
 		"signale": "1.4.0",
 		"sqlite3": "^5.1.7",
 		"temp-write": "^4.0.0"
 	},
 	"devDependencies": {
-		"@apidevtools/swagger-parser": "^12.1.0",
-		"@biomejs/biome": "^2.3.14",
-		"chalk": "5.6.2",
-		"nodemon": "^3.1.11"
+		"@apidevtools/swagger-parser": "^10.1.0",
+		"@biomejs/biome": "^2.3.2",
+		"chalk": "4.1.2",
+		"nodemon": "^2.0.2"
 	},
 	"signale": {
 		"displayDate": true,

backend/routes/tokens.js

@@ -53,26 +53,4 @@ router
 		}
 	});
 
-router
-	.route("/2fa")
-	.options((_, res) => {
-		res.sendStatus(204);
-	})
-
-	/**
-	 * POST /tokens/2fa
-	 *
-	 * Verify 2FA code and get full token
-	 */
-	.post(async (req, res, next) => {
-		try {
-			const { challenge_token, code } = await apiValidator(getValidationSchema("/tokens/2fa", "post"), req.body);
-			const result = await internalToken.verify2FA(challenge_token, code);
-			res.status(200).send(result);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	});
-
 export default router;

backend/routes/users.js

@@ -1,5 +1,4 @@
 import express from "express";
-import internal2FA from "../internal/2fa.js";
 import internalUser from "../internal/user.js";
 import Access from "../lib/access.js";
 import { isCI } from "../lib/config.js";
@@ -326,130 +325,4 @@ router
 		}
 	});
 
-/**
- * User 2FA status
- *
- * /api/users/123/2fa
- */
-router
-	.route("/:user_id/2fa")
-	.options((_, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode())
-	.all(userIdFromMe)
-
-	/**
-	 * POST /api/users/123/2fa
-	 *
-	 * Start 2FA setup, returns QR code URL
-	 */
-	.post(async (req, res, next) => {
-		try {
-			const result = await internal2FA.startSetup(res.locals.access, req.params.user_id);
-			res.status(200).send(result);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	})
-
-	/**
-	 * GET /api/users/123/2fa
-	 *
-	 * Get 2FA status for a user
-	 */
-	.get(async (req, res, next) => {
-		try {
-			const status = await internal2FA.getStatus(res.locals.access, req.params.user_id);
-			res.status(200).send(status);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	})
-
-	/**
-	 * DELETE /api/users/123/2fa?code=XXXXXX
-	 *
-	 * Disable 2FA for a user
-	 */
-	.delete(async (req, res, next) => {
-		try {
-			const code = typeof req.query.code === "string" ? req.query.code : null;
-			if (!code) {
-				throw new errs.ValidationError("Missing required parameter: code");
-			}
-			await internal2FA.disable(res.locals.access, req.params.user_id, code);
-			res.status(200).send(true);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	});
-
-/**
- * User 2FA enable
- *
- * /api/users/123/2fa/enable
- */
-router
-	.route("/:user_id/2fa/enable")
-	.options((_, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode())
-	.all(userIdFromMe)
-
-	/**
-	 * POST /api/users/123/2fa/enable
-	 *
-	 * Verify code and enable 2FA
-	 */
-	.post(async (req, res, next) => {
-		try {
-			const { code } = await apiValidator(
-				getValidationSchema("/users/{userID}/2fa/enable", "post"),
-				req.body,
-			);
-			const result = await internal2FA.enable(res.locals.access, req.params.user_id, code);
-			res.status(200).send(result);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	});
-
-/**
- * User 2FA backup codes
- *
- * /api/users/123/2fa/backup-codes
- */
-router
-	.route("/:user_id/2fa/backup-codes")
-	.options((_, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode())
-	.all(userIdFromMe)
-
-	/**
-	 * POST /api/users/123/2fa/backup-codes
-	 *
-	 * Regenerate backup codes
-	 */
-	.post(async (req, res, next) => {
-		try {
-			const { code } = await apiValidator(
-				getValidationSchema("/users/{userID}/2fa/backup-codes", "post"),
-				req.body,
-			);
-			const result = await internal2FA.regenerateBackupCodes(res.locals.access, req.params.user_id, code);
-			res.status(200).send(result);
-		} catch (err) {
-			debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`);
-			next(err);
-		}
-	});
-
 export default router;

backend/schema/components/certificate-object.json

@@ -71,11 +71,6 @@
 				"propagation_seconds": {
 					"type": "integer",
 					"minimum": 0
-				},
-				"key_type": {
-					"type": "string",
-					"enum": ["rsa", "ecdsa"],
-					"default": "rsa"
 				}
 			},
 			"example": {

backend/schema/components/token-challenge.json

@@ -1,18 +0,0 @@
-{
-	"type": "object",
-	"description": "Token object",
-	"required": ["requires_2fa", "challenge_token"],
-	"additionalProperties": false,
-	"properties": {
-		"requires_2fa": {
-			"description": "Whether this token request requires two-factor authentication",
-			"example": true,
-			"type": "boolean"
-		},
-		"challenge_token": {
-			"description": "Challenge Token used in subsequent 2FA verification",
-			"example": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4",
-			"type": "string"
-		}
-	}
-}

backend/schema/paths/tokens/2fa/post.json

@@ -1,55 +0,0 @@
-{
-	"operationId": "loginWith2FA",
-	"summary": "Verify 2FA code and get full token",
-	"tags": ["tokens"],
-	"requestBody": {
-		"description": "2fa Challenge Payload",
-		"required": true,
-		"content": {
-			"application/json": {
-				"schema": {
-					"additionalProperties": false,
-					"properties": {
-						"challenge_token": {
-							"minLength": 1,
-							"type": "string",
-							"example": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4"
-						},
-						"code": {
-							"minLength": 6,
-							"maxLength": 8,
-							"type": "string",
-							"example": "012345"
-						}
-					},
-					"required": ["challenge_token", "code"],
-					"type": "object"
-				},
-				"example": {
-					"challenge_token": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4",
-					"code": "012345"
-				}
-			}
-		}
-	},
-	"responses": {
-		"200": {
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": {
-								"expires": "2025-02-04T20:40:46.340Z",
-								"token": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4"
-							}
-						}
-					},
-					"schema": {
-						"$ref": "../../../components/token-object.json"
-					}
-				}
-			},
-			"description": "200 response"
-		}
-	}
-}

backend/schema/paths/tokens/post.json

@@ -50,14 +50,7 @@
 						}
 					},
 					"schema": {
-						"oneOf": [
-							{
-								"$ref": "../../components/token-object.json"
-							},
-							{
-								"$ref": "../../components/token-challenge.json"
-							}
-						]
+						"$ref": "../../components/token-object.json"
 					}
 				}
 			},

backend/schema/paths/users/userID/2fa/backup-codes/post.json

@@ -1,92 +0,0 @@
-{
-	"operationId": "regenUser2faCodes",
-	"summary": "Regenerate 2FA backup codes",
-	"tags": ["users"],
-	"parameters": [
-		{
-			"in": "path",
-			"name": "userID",
-			"schema": {
-				"type": "integer",
-				"minimum": 1
-			},
-			"required": true,
-			"description": "User ID",
-			"example": 2
-		}
-	],
-	"requestBody": {
-		"description": "Verification Payload",
-		"required": true,
-		"content": {
-			"application/json": {
-				"schema": {
-					"additionalProperties": false,
-					"properties": {
-						"code": {
-							"minLength": 6,
-							"maxLength": 8,
-							"type": "string",
-							"example": "123456"
-						}
-					},
-					"required": ["code"],
-					"type": "object"
-				},
-				"example": {
-					"code": "123456"
-				}
-			}
-		}
-	},
-	"responses": {
-		"200": {
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": {
-								"backup_codes": [
-									"6CD7CB06",
-									"495302F3",
-									"D8037852",
-									"A6FFC956",
-									"BC1A1851",
-									"A05E644F",
-									"A406D2E8",
-									"0AE3C522"
-								]
-							}
-						}
-					},
-					"schema": {
-						"type": "object",
-						"required": ["backup_codes"],
-						"additionalProperties": false,
-						"properties": {
-							"backup_codes": {
-								"description": "Backup codes",
-								"example": [
-									"6CD7CB06",
-									"495302F3",
-									"D8037852",
-									"A6FFC956",
-									"BC1A1851",
-									"A05E644F",
-									"A406D2E8",
-									"0AE3C522"
-								],
-								"type": "array",
-								"items": {
-									"type": "string",
-									"example": "6CD7CB06"
-								}
-							}
-						}
-					}
-				}
-			},
-			"description": "200 response"
-		}
-	}
-}

backend/schema/paths/users/userID/2fa/delete.json

@@ -1,48 +0,0 @@
-{
-	"operationId": "disableUser2fa",
-	"summary": "Disable 2fa for user",
-	"tags": ["users"],
-	"parameters": [
-		{
-			"in": "path",
-			"name": "userID",
-			"schema": {
-				"type": "integer",
-				"minimum": 1
-			},
-			"required": true,
-			"description": "User ID",
-			"example": 2
-		},
-		{
-			"in": "query",
-			"name": "code",
-			"schema": {
-				"type": "string",
-				"minLength": 6,
-				"maxLength": 6,
-				"example": "012345"
-			},
-			"required": true,
-			"description": "2fa Code",
-			"example": "012345"
-		}
-	],
-	"responses": {
-		"200": {
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": true
-						}
-					},
-					"schema": {
-						"type": "boolean"
-					}
-				}
-			},
-			"description": "200 response"
-		}
-	}
-}

backend/schema/paths/users/userID/2fa/enable/post.json

@@ -1,92 +0,0 @@
-{
-	"operationId": "enableUser2fa",
-	"summary": "Verify code and enable 2FA",
-	"tags": ["users"],
-	"parameters": [
-		{
-			"in": "path",
-			"name": "userID",
-			"schema": {
-				"type": "integer",
-				"minimum": 1
-			},
-			"required": true,
-			"description": "User ID",
-			"example": 2
-		}
-	],
-	"requestBody": {
-		"description": "Verification Payload",
-		"required": true,
-		"content": {
-			"application/json": {
-				"schema": {
-					"additionalProperties": false,
-					"properties": {
-						"code": {
-							"minLength": 6,
-							"maxLength": 8,
-							"type": "string",
-							"example": "123456"
-						}
-					},
-					"required": ["code"],
-					"type": "object"
-				},
-				"example": {
-					"code": "123456"
-				}
-			}
-		}
-	},
-	"responses": {
-		"200": {
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": {
-								"backup_codes": [
-									"6CD7CB06",
-									"495302F3",
-									"D8037852",
-									"A6FFC956",
-									"BC1A1851",
-									"A05E644F",
-									"A406D2E8",
-									"0AE3C522"
-								]
-							}
-						}
-					},
-					"schema": {
-						"type": "object",
-						"required": ["backup_codes"],
-						"additionalProperties": false,
-						"properties": {
-							"backup_codes": {
-								"description": "Backup codes",
-								"example": [
-									"6CD7CB06",
-									"495302F3",
-									"D8037852",
-									"A6FFC956",
-									"BC1A1851",
-									"A05E644F",
-									"A406D2E8",
-									"0AE3C522"
-								],
-								"type": "array",
-								"items": {
-									"type": "string",
-									"example": "6CD7CB06"
-								}
-							}
-						}
-					}
-				}
-			},
-			"description": "200 response"
-		}
-	}
-}

backend/schema/paths/users/userID/2fa/get.json

@@ -1,57 +0,0 @@
-{
-	"operationId": "getUser2faStatus",
-	"summary": "Get user 2fa Status",
-	"tags": ["users"],
-	"security": [
-		{
-			"bearerAuth": []
-		}
-	],
-	"parameters": [
-		{
-			"in": "path",
-			"name": "userID",
-			"schema": {
-				"type": "integer",
-				"minimum": 1
-			},
-			"required": true,
-			"description": "User ID",
-			"example": 2
-		}
-	],
-	"responses": {
-		"200": {
-			"description": "200 response",
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": {
-								"enabled": false,
-								"backup_codes_remaining": 0
-							}
-						}
-					},
-					"schema": {
-						"type": "object",
-						"additionalProperties": false,
-						"required": ["enabled", "backup_codes_remaining"],
-						"properties": {
-							"enabled": {
-								"type": "boolean",
-								"description": "Is 2FA enabled for this user",
-								"example": true
-							},
-							"backup_codes_remaining": {
-								"type": "integer",
-								"description": "Number of remaining backup codes for this user",
-								"example": 5
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

backend/schema/paths/users/userID/2fa/post.json

@@ -1,52 +0,0 @@
-{
-	"operationId": "setupUser2fa",
-	"summary": "Start 2FA setup, returns QR code URL",
-	"tags": ["users"],
-	"parameters": [
-		{
-			"in": "path",
-			"name": "userID",
-			"schema": {
-				"type": "integer",
-				"minimum": 1
-			},
-			"required": true,
-			"description": "User ID",
-			"example": 2
-		}
-	],
-	"responses": {
-		"200": {
-			"content": {
-				"application/json": {
-					"examples": {
-						"default": {
-							"value": {
-								"secret": "JZYCEBIEEJYUGPQM",
-								"otpauth_url": "otpauth://totp/Nginx%20Proxy%20Manager:jc%40jc21.com?secret=JZYCEBIEEJYUGPQM&period=30&digits=6&algorithm=SHA1&issuer=Nginx%20Proxy%20Manager"
-							}
-						}
-					},
-					"schema": {
-						"type": "object",
-						"required": ["secret", "otpauth_url"],
-						"additionalProperties": false,
-						"properties": {
-							"secret": {
-								"description": "TOTP Secret",
-								"example": "JZYCEBIEEJYUGPQM",
-								"type": "string"
-							},
-							"otpauth_url": {
-								"description": "OTP Auth URL for QR Code generation",
-								"example": "otpauth://totp/Nginx%20Proxy%20Manager:jc%40jc21.com?secret=JZYCEBIEEJYUGPQM&period=30&digits=6&algorithm=SHA1&issuer=Nginx%20Proxy%20Manager",
-								"type": "string"
-							}
-						}
-					}
-				}
-			},
-			"description": "200 response"
-		}
-	}
-}

backend/schema/swagger.json

@@ -293,11 +293,6 @@
 				"$ref": "./paths/tokens/post.json"
 			}
 		},
-		"/tokens/2fa": {
-			"post": {
-				"$ref": "./paths/tokens/2fa/post.json"
-			}
-		},
 		"/version/check": {
 			"get": {
 				"$ref": "./paths/version/check/get.json"
@@ -322,27 +317,6 @@
 				"$ref": "./paths/users/userID/delete.json"
 			}
 		},
-		"/users/{userID}/2fa": {
-			"post": {
-				"$ref": "./paths/users/userID/2fa/post.json"
-			},
-			"get": {
-				"$ref": "./paths/users/userID/2fa/get.json"
-			},
-			"delete": {
-				"$ref": "./paths/users/userID/2fa/delete.json"
-			}
-		},
-		"/users/{userID}/2fa/enable": {
-			"post": {
-				"$ref": "./paths/users/userID/2fa/enable/post.json"
-			}
-		},
-		"/users/{userID}/2fa/backup-codes": {
-			"post": {
-				"$ref": "./paths/users/userID/2fa/backup-codes/post.json"
-			}
-		},
 		"/users/{userID}/auth": {
 			"put": {
 				"$ref": "./paths/users/userID/auth/put.json"

backend/templates/stream.conf

@@ -12,9 +12,6 @@ server {
 
   proxy_pass {{ forwarding_host }}:{{ forwarding_port }};
 
-  access_log /data/logs/stream-{{ id }}_access.log stream;
-  error_log /data/logs/stream-{{ id }}_error.log warn;
-
   # Custom
   include /data/nginx/custom/server_stream[.]conf;
   include /data/nginx/custom/server_stream_tcp[.]conf;
@@ -28,9 +25,6 @@ server {
 
   proxy_pass {{ forwarding_host }}:{{ forwarding_port }};
 
-  access_log /data/logs/stream-{{ id }}_access.log stream;
-  error_log /data/logs/stream-{{ id }}_error.log warn;
-
   # Custom
   include /data/nginx/custom/server_stream[.]conf;
   include /data/nginx/custom/server_stream_udp[.]conf;

docker/docker-compose.ci.yml

@@ -109,7 +109,7 @@ services:
       - "cypress_logs:/test/results"
       - "./dev/resolv.conf:/etc/resolv.conf:ro"
       - "/etc/localtime:/etc/localtime:ro"
-    command: cypress run --browser chrome --config-file=cypress/config/ci.mjs
+    command: cypress run --browser chrome --config-file=cypress/config/ci.js
     networks:
       - fulltest
 

docker/docker-compose.dev.yml

@@ -192,7 +192,7 @@ services:
       - "../test/results:/results"
       - "./dev/resolv.conf:/etc/resolv.conf:ro"
       - "/etc/localtime:/etc/localtime:ro"
-    command: cypress run --browser chrome --config-file=cypress/config/ci.mjs
+    command: cypress run --browser chrome --config-file=cypress/config/ci.js
     networks:
       - nginx_proxy_manager
 

docker/rootfs/etc/nginx/conf.d/default.conf

@@ -8,8 +8,8 @@ server {
 	set $port "80";
 
 	server_name localhost-nginx-proxy-manager;
-	access_log /data/logs/fallback_http_access.log standard;
-	error_log /data/logs/fallback_http_error.log warn;
+	access_log /data/logs/fallback_access.log standard;
+	error_log /data/logs/fallback_error.log warn;
 	include conf.d/include/assets.conf;
 	include conf.d/include/block-exploits.conf;
 	include conf.d/include/letsencrypt-acme-challenge.conf;
@@ -30,7 +30,7 @@ server {
 	set $port "443";
 
 	server_name localhost;
-	access_log /data/logs/fallback_http_access.log standard;
+	access_log /data/logs/fallback_access.log standard;
 	error_log /dev/null crit;
 	include conf.d/include/ssl-ciphers.conf;
 	ssl_reject_handshake on;

docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf

@@ -5,9 +5,6 @@ if ($scheme = "http") {
 if ($request_uri = /.well-known/acme-challenge/test-challenge) {
 	set $test "${test}T";
 }
-if ($http_x_forwarded_proto = "https") {
-	set $test "${test}S";
-}
 if ($test = H) {
 	return 301 https://$host$request_uri;
 }

docker/rootfs/etc/nginx/conf.d/include/log-stream.conf

@@ -1,3 +0,0 @@
-log_format stream '[$time_local] [Client $remote_addr:$remote_port] $protocol $status $bytes_sent $bytes_received $session_time [Sent-to $upstream_addr] [Sent $upstream_bytes_sent] [Received $upstream_bytes_received] [Time $upstream_connect_time] $ssl_protocol $ssl_cipher';
-
-access_log /data/logs/fallback_stream_access.log stream;

docker/rootfs/etc/nginx/conf.d/include/log.conf

@@ -1,4 +1,4 @@
 log_format proxy '[$time_local] $upstream_cache_status $upstream_status $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] [Sent-to $server] "$http_user_agent" "$http_referer"';
 log_format standard '[$time_local] $status - $request_method $scheme $host "$request_uri" [Client $remote_addr] [Length $body_bytes_sent] [Gzip $gzip_ratio] "$http_user_agent" "$http_referer"';
 
-access_log /data/logs/fallback_http_access.log proxy;
+access_log /data/logs/fallback_access.log proxy;

docker/rootfs/etc/nginx/nginx.conf

@@ -47,7 +47,7 @@ http {
 	proxy_cache_path              /var/lib/nginx/cache/private levels=1:2 keys_zone=private-cache:5m max_size=1024m;
 
 	# Log format and fallback log file
-	include /etc/nginx/conf.d/include/log-proxy.conf;
+	include /etc/nginx/conf.d/include/log.conf;
 
 	# Dynamically generated resolvers file
 	include /etc/nginx/conf.d/include/resolvers.conf;
@@ -85,9 +85,6 @@ http {
 }
 
 stream {
-	# Log format and fallback log file
-	include /etc/nginx/conf.d/include/log-stream.conf;
-
 	# Files generated by NPM
 	include /data/nginx/stream/*.conf;
 

frontend/biome.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.3.14/schema.json",
+    "$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
     "vcs": {
         "enabled": true,
         "clientKind": "git",

frontend/check-locales.cjs

@@ -7,27 +7,24 @@
 // - Also checks the error messages returned by the backend
 
 const allLocales = [
-  ["en", "en-US"],
-  ["de", "de-DE"],
-  ["pt", "pt-PT"],
-  ["es", "es-ES"],
-  ["fr", "fr-FR"],
-  ["it", "it-IT"],
-  ["ja", "ja-JP"],
-  ["nl", "nl-NL"],
-  ["pl", "pl-PL"],
-  ["ru", "ru-RU"],
-  ["sk", "sk-SK"],
-  ["vi", "vi-VN"],
-  ["zh", "zh-CN"],
-  ["ko", "ko-KR"],
-  ["bg", "bg-BG"],
-  ["id", "id-ID"],
-  ["tr", "tr-TR"],
-  ["hu", "hu-HU"],
+	["en", "en-US"],
+	["de", "de-DE"],
+	["es", "es-ES"],
+	["it", "it-IT"],
+	["ja", "ja-JP"],
+	["nl", "nl-NL"],
+	["pl", "pl-PL"],
+	["ru", "ru-RU"],
+	["sk", "sk-SK"],
+	["vi", "vi-VN"],
+	["zh", "zh-CN"],
+	["ko", "ko-KR"],
+	["bg", "bg-BG"],
 ];
 
-const ignoreUnused = [/^.*$/];
+const ignoreUnused = [
+	/^.*$/,
+];
 
 const { spawnSync } = require("child_process");
 const fs = require("fs");
@@ -68,95 +65,105 @@ const allWarnings = [];
 const allKeys = [];
 
 const checkLangList = (fullCode) => {
-  const key = "locale-" + fullCode;
-  if (typeof langList[key] === "undefined") {
-    allErrors.push("ERROR: `" + key + "` language does not exist in lang-list.json");
-  }
+	const key = "locale-" + fullCode;
+	if (typeof langList[key] === "undefined") {
+		allErrors.push(
+			"ERROR: `" + key + "` language does not exist in lang-list.json",
+		);
+	}
 };
 
 const compareLocale = (locale) => {
-  const projectLocaleKeys = Object.keys(allLocalesInProject);
-  // Check that locale contains the items used in the codebase
-  projectLocaleKeys.map((key) => {
-    if (typeof locale.data[key] === "undefined") {
-      allErrors.push("ERROR: `" + locale[0] + "` does not contain item: `" + key + "`");
-    }
-    return null;
-  });
-  // Check that locale contains all error.* items
-  BACKEND_ERRORS.forEach((key) => {
-    if (typeof locale.data[key] === "undefined") {
-      allErrors.push("ERROR: `" + locale[0] + "` does not contain item: `" + key + "`");
-    }
-    return null;
-  });
+	const projectLocaleKeys = Object.keys(allLocalesInProject);
+	// Check that locale contains the items used in the codebase
+	projectLocaleKeys.map((key) => {
+		if (typeof locale.data[key] === "undefined") {
+			allErrors.push(
+				"ERROR: `" + locale[0] + "` does not contain item: `" + key + "`",
+			);
+		}
+		return null;
+	});
+	// Check that locale contains all error.* items
+	BACKEND_ERRORS.forEach((key) => {
+		if (typeof locale.data[key] === "undefined") {
+			allErrors.push(
+				"ERROR: `" + locale[0] + "` does not contain item: `" + key + "`",
+			);
+		}
+		return null;
+	});
 
-  // Check that locale does not contain items not used in the codebase
-  const localeKeys = Object.keys(locale.data);
-  localeKeys.map((key) => {
-    let ignored = false;
-    ignoreUnused.map((regex) => {
-      if (key.match(regex)) {
-        ignored = true;
-      }
-      return null;
-    });
+	// Check that locale does not contain items not used in the codebase
+	const localeKeys = Object.keys(locale.data);
+	localeKeys.map((key) => {
+		let ignored = false;
+		ignoreUnused.map((regex) => {
+			if (key.match(regex)) {
+				ignored = true;
+			}
+			return null;
+		});
 
-    if (!ignored && typeof allLocalesInProject[key] === "undefined") {
-      // ensure this key doesn't exist in the backend errors either
-      if (!BACKEND_ERRORS.includes(key)) {
-        allErrors.push("ERROR: `" + locale[0] + "` contains unused item: `" + key + "`");
-      }
-    }
+		if (!ignored && typeof allLocalesInProject[key] === "undefined") {
+			// ensure this key doesn't exist in the backend errors either
+			if (!BACKEND_ERRORS.includes(key)) {
+				allErrors.push(
+					"ERROR: `" + locale[0] + "` contains unused item: `" + key + "`",
+				);
+			}
+		}
 
-    // Add this key to allKeys
-    if (allKeys.indexOf(key) === -1) {
-      allKeys.push(key);
-    }
-    return null;
-  });
+		// Add this key to allKeys
+		if (allKeys.indexOf(key) === -1) {
+			allKeys.push(key);
+		}
+		return null;
+	});
 };
 
 // Checks for any keys missing from this locale, that
 // have been defined in any other locales
 const checkForMissing = (locale) => {
-  allKeys.forEach((key) => {
-    if (typeof locale.data[key] === "undefined") {
-      allWarnings.push("WARN: `" + locale[0] + "` does not contain item: `" + key + "`");
-    }
-    return null;
-  });
+	allKeys.forEach((key) => {
+		if (typeof locale.data[key] === "undefined") {
+			allWarnings.push(
+				"WARN: `" + locale[0] + "` does not contain item: `" + key + "`",
+			);
+		}
+		return null;
+	});
 };
 
 // Local all locale data
 allLocales.map((locale, idx) => {
-  checkLangList(locale[1]);
-  allLocales[idx].data = require("./src/locale/src/" + locale[0] + ".json");
-  return null;
+	checkLangList(locale[1]);
+	allLocales[idx].data = require("./src/locale/src/" + locale[0] + ".json");
+	return null;
 });
 
 // Verify all locale data
 allLocales.map((locale) => {
-  compareLocale(locale);
-  checkForMissing(locale);
-  return null;
+	compareLocale(locale);
+	checkForMissing(locale);
+	return null;
 });
 
 if (allErrors.length) {
-  allErrors.map((err) => {
-    console.log("\x1b[31m%s\x1b[0m", err);
-    return null;
-  });
+	allErrors.map((err) => {
+		console.log("\x1b[31m%s\x1b[0m", err);
+		return null;
+	});
 }
 if (allWarnings.length) {
-  allWarnings.map((err) => {
-    console.log("\x1b[33m%s\x1b[0m", err);
-    return null;
-  });
+	allWarnings.map((err) => {
+		console.log("\x1b[33m%s\x1b[0m", err);
+		return null;
+	});
 }
 
 if (allErrors.length) {
-  process.exit(1);
+	process.exit(1);
 }
 
 console.log("\x1b[32m%s\x1b[0m", "Locale check passed");

frontend/package.json

@@ -17,50 +17,50 @@
 	},
 	"dependencies": {
 		"@tabler/core": "^1.4.0",
-		"@tabler/icons-react": "^3.36.1",
-		"@tanstack/react-query": "^5.90.20",
+		"@tabler/icons-react": "^3.35.0",
+		"@tanstack/react-query": "^5.90.6",
 		"@tanstack/react-table": "^8.21.3",
 		"@uiw/react-textarea-code-editor": "^3.1.1",
 		"classnames": "^2.5.1",
-		"country-flag-icons": "^1.6.12",
+		"country-flag-icons": "^1.5.21",
 		"date-fns": "^4.1.0",
 		"ez-modal-react": "^1.0.5",
-		"formik": "^2.4.9",
+		"formik": "^2.4.6",
 		"generate-password-browser": "^1.1.0",
 		"humps": "^2.0.1",
 		"query-string": "^9.3.1",
-		"react": "^19.2.4",
+		"react": "^19.2.0",
 		"react-bootstrap": "^2.10.10",
-		"react-dom": "^19.2.4",
-		"react-intl": "^8.1.3",
+		"react-dom": "^19.2.0",
+		"react-intl": "^7.1.14",
 		"react-markdown": "^10.1.0",
-		"react-router-dom": "^7.13.0",
+		"react-router-dom": "^7.9.5",
 		"react-select": "^5.10.2",
 		"react-toastify": "^11.0.5",
-		"rooks": "^9.5.0"
+		"rooks": "^9.3.0"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.14",
-		"@formatjs/cli": "^6.12.2",
-		"@tanstack/react-query-devtools": "^5.91.3",
+		"@biomejs/biome": "^2.3.2",
+		"@formatjs/cli": "^6.7.4",
+		"@tanstack/react-query-devtools": "^5.90.2",
 		"@testing-library/dom": "^10.4.1",
 		"@testing-library/jest-dom": "^6.9.1",
-		"@testing-library/react": "^16.3.2",
+		"@testing-library/react": "^16.3.0",
 		"@types/country-flag-icons": "^1.2.2",
 		"@types/humps": "^2.0.6",
-		"@types/react": "^19.2.10",
-		"@types/react-dom": "^19.2.3",
+		"@types/react": "^19.2.2",
+		"@types/react-dom": "^19.2.2",
 		"@types/react-table": "^7.7.20",
-		"@vitejs/plugin-react": "^5.1.3",
-		"happy-dom": "^20.5.0",
+		"@vitejs/plugin-react": "^5.1.0",
+		"happy-dom": "^20.0.10",
 		"postcss": "^8.5.6",
 		"postcss-simple-vars": "^7.0.1",
-		"sass": "^1.97.3",
+		"sass": "^1.93.3",
 		"tmp": "^0.2.5",
 		"typescript": "5.9.3",
-		"vite": "^7.3.1",
-		"vite-plugin-checker": "^0.12.0",
-		"vite-tsconfig-paths": "^6.0.5",
-		"vitest": "^4.0.18"
+		"vite": "^7.1.12",
+		"vite-plugin-checker": "^0.11.0",
+		"vite-tsconfig-paths": "^5.1.4",
+		"vitest": "^4.0.6"
 	}
 }

frontend/src/api/backend/base.ts

@@ -156,6 +156,7 @@ export async function del({ url, params }: DeleteArgs, abortController?: AbortCo
 	const method = "DELETE";
 	const headers = {
 		...buildAuthHeader(),
+		[contentTypeHeader]: "application/json",
 	};
 	const signal = abortController?.signal;
 	const response = await fetch(apiUrl, { method, headers, signal });

frontend/src/api/backend/getToken.ts

@@ -1,22 +1,9 @@
 import * as api from "./base";
-import type { TokenResponse, TwoFactorChallengeResponse } from "./responseTypes";
+import type { TokenResponse } from "./responseTypes";
 
-export type LoginResponse = TokenResponse | TwoFactorChallengeResponse;
-
-export function isTwoFactorChallenge(response: LoginResponse): response is TwoFactorChallengeResponse {
-	return "requires2fa" in response && response.requires2fa === true;
-}
-
-export async function getToken(identity: string, secret: string): Promise<LoginResponse> {
+export async function getToken(identity: string, secret: string): Promise<TokenResponse> {
 	return await api.post({
 		url: "/tokens",
 		data: { identity, secret },
 	});
 }
-
-export async function verify2FA(challengeToken: string, code: string): Promise<TokenResponse> {
-	return await api.post({
-		url: "/tokens/2fa",
-		data: { challengeToken, code },
-	});
-}

frontend/src/api/backend/index.ts

@@ -60,4 +60,3 @@ export * from "./updateStream";
 export * from "./updateUser";
 export * from "./uploadCertificate";
 export * from "./validateCertificate";
-export * from "./twoFactor";

frontend/src/api/backend/responseTypes.ts

@@ -25,22 +25,3 @@ export interface VersionCheckResponse {
 	latest: string | null;
 	updateAvailable: boolean;
 }
-
-export interface TwoFactorChallengeResponse {
-	requires2fa: boolean;
-	challengeToken: string;
-}
-
-export interface TwoFactorStatusResponse {
-	enabled: boolean;
-	backupCodesRemaining: number;
-}
-
-export interface TwoFactorSetupResponse {
-	secret: string;
-	otpauthUrl: string;
-}
-
-export interface TwoFactorEnableResponse {
-	backupCodes: string[];
-}

frontend/src/api/backend/twoFactor.ts

@@ -1,37 +0,0 @@
-import * as api from "./base";
-import type { TwoFactorEnableResponse, TwoFactorSetupResponse, TwoFactorStatusResponse } from "./responseTypes";
-
-export async function get2FAStatus(userId: number | "me"): Promise<TwoFactorStatusResponse> {
-	return await api.get({
-		url: `/users/${userId}/2fa`,
-	});
-}
-
-export async function start2FASetup(userId: number | "me"): Promise<TwoFactorSetupResponse> {
-	return await api.post({
-		url: `/users/${userId}/2fa`,
-	});
-}
-
-export async function enable2FA(userId: number | "me", code: string): Promise<TwoFactorEnableResponse> {
-	return await api.post({
-		url: `/users/${userId}/2fa/enable`,
-		data: { code },
-	});
-}
-
-export async function disable2FA(userId: number | "me", code: string): Promise<boolean> {
-	return await api.del({
-		url: `/users/${userId}/2fa`,
-		params: {
-			code,
-		},
-	});
-}
-
-export async function regenerateBackupCodes(userId: number | "me", code: string): Promise<TwoFactorEnableResponse> {
-	return await api.post({
-		url: `/users/${userId}/2fa/backup-codes`,
-		data: { code },
-	});
-}

frontend/src/components/Form/AccessField.tsx

@@ -3,7 +3,6 @@ import { Field, useFormikContext } from "formik";
 import type { ReactNode } from "react";
 import Select, { type ActionMeta, components, type OptionProps } from "react-select";
 import type { AccessList } from "src/api/backend";
-import { useLocaleState } from "src/context";
 import { useAccessLists } from "src/hooks";
 import { formatDateTime, intl, T } from "src/locale";
 
@@ -33,7 +32,6 @@ interface Props {
 	label?: string;
 }
 export function AccessField({ name = "accessListId", label = "access-list", id = "accessListId" }: Props) {
-	const { locale } = useLocaleState();
 	const { isLoading, isError, error, data } = useAccessLists(["owner", "items", "clients"]);
 	const { setFieldValue } = useFormikContext();
 
@@ -50,7 +48,7 @@ export function AccessField({ name = "accessListId", label = "access-list", id =
 				{
 					users: item?.items?.length,
 					rules: item?.clients?.length,
-					date: item?.createdOn ? formatDateTime(item?.createdOn, locale) : "N/A",
+					date: item?.createdOn ? formatDateTime(item?.createdOn) : "N/A",
 				},
 			),
 			icon: <IconLock size={14} className="text-lime" />,

frontend/src/components/Form/SSLCertificateField.tsx

@@ -2,7 +2,6 @@ import { IconShield } from "@tabler/icons-react";
 import { Field, useFormikContext } from "formik";
 import Select, { type ActionMeta, components, type OptionProps } from "react-select";
 import type { Certificate } from "src/api/backend";
-import { useLocaleState } from "src/context";
 import { useCertificates } from "src/hooks";
 import { formatDateTime, intl, T } from "src/locale";
 
@@ -42,7 +41,6 @@ export function SSLCertificateField({
 	allowNew,
 	forHttp = true,
 }: Props) {
-	const { locale } = useLocaleState();
 	const { isLoading, isError, error, data } = useCertificates();
 	const { values, setFieldValue } = useFormikContext();
 	const v: any = values || {};
@@ -77,7 +75,7 @@ export function SSLCertificateField({
 		data?.map((cert: Certificate) => ({
 			value: cert.id,
 			label: cert.niceName,
-			subLabel: `${cert.provider === "letsencrypt" ? intl.formatMessage({ id: "lets-encrypt" }) : cert.provider} — ${intl.formatMessage({ id: "expires.on" }, { date: cert.expiresOn ? formatDateTime(cert.expiresOn, locale) : "N/A" })}`,
+			subLabel: `${cert.provider === "letsencrypt" ? intl.formatMessage({ id: "lets-encrypt" }) : cert.provider} — ${intl.formatMessage({ id: "expires.on" }, { date: cert.expiresOn ? formatDateTime(cert.expiresOn) : "N/A" })}`,
 			icon: <IconShield size={14} className="text-pink" />,
 		})) || [];
 

frontend/src/components/SiteHeader.tsx

@@ -1,9 +1,9 @@
-import { IconLock, IconLogout, IconShieldLock, IconUser } from "@tabler/icons-react";
+import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
 import { LocalePicker, NavLink, ThemeSwitcher } from "src/components";
 import { useAuthState } from "src/context";
 import { useUser } from "src/hooks";
 import { T } from "src/locale";
-import { showChangePasswordModal, showTwoFactorModal, showUserModal } from "src/modals";
+import { showChangePasswordModal, showUserModal } from "src/modals";
 import styles from "./SiteHeader.module.css";
 
 export function SiteHeader() {
@@ -108,17 +108,6 @@ export function SiteHeader() {
 									<IconLock width={18} />
 									<T id="user.change-password" />
 								</a>
-								<a
-									href="?"
-									className="dropdown-item"
-									onClick={(e) => {
-										e.preventDefault();
-										showTwoFactorModal("me");
-									}}
-								>
-									<IconShieldLock width={18} />
-									<T id="user.two-factor" />
-								</a>
 								<div className="dropdown-divider" />
 								<a
 									href="?"

frontend/src/components/Table/Formatter/DateFormatter.tsx

@@ -1,6 +1,5 @@
 import cn from "classnames";
 import { differenceInDays, isPast } from "date-fns";
-import { useLocaleState } from "src/context";
 import { formatDateTime, parseDate } from "src/locale";
 
 interface Props {
@@ -9,7 +8,6 @@ interface Props {
 	highlistNearlyExpired?: boolean;
 }
 export function DateFormatter({ value, highlightPast, highlistNearlyExpired }: Props) {
-	const { locale } = useLocaleState();
 	const d = parseDate(value);
 	const dateIsPast = d ? isPast(d) : false;
 	const days = d ? differenceInDays(d, new Date()) : 0;
@@ -17,5 +15,5 @@ export function DateFormatter({ value, highlightPast, highlistNearlyExpired }: P
 		"text-danger": highlightPast && dateIsPast,
 		"text-warning": highlistNearlyExpired && !dateIsPast && days <= 30 && days >= 0,
 	});
-	return <span className={cl}>{formatDateTime(value, locale)}</span>;
+	return <span className={cl}>{formatDateTime(value)}</span>;
 }

frontend/src/components/Table/Formatter/DomainsFormatter.tsx

@@ -1,6 +1,5 @@
 import cn from "classnames";
 import type { ReactNode } from "react";
-import { useLocaleState } from "src/context";
 import { formatDateTime, T } from "src/locale";
 
 interface Props {
@@ -38,9 +37,7 @@ const DomainLink = ({ domain, color }: { domain?: string; color?: string }) => {
 };
 
 export function DomainsFormatter({ domains, createdOn, niceName, provider, color }: Props) {
-	const { locale } = useLocaleState();
 	const elms: ReactNode[] = [];
-
 	if ((!domains || domains.length === 0) && !niceName) {
 		elms.push(
 			<span key="nice-name" className="badge bg-danger-lt me-2">
@@ -65,7 +62,7 @@ export function DomainsFormatter({ domains, createdOn, niceName, provider, color
 			<div className="font-weight-medium">{...elms}</div>
 			{createdOn ? (
 				<div className="text-secondary mt-1">
-					<T id="created-on" data={{ date: formatDateTime(createdOn, locale) }} />
+					<T id="created-on" data={{ date: formatDateTime(createdOn) }} />
 				</div>
 			) : null}
 		</div>

frontend/src/components/Table/Formatter/EventFormatter.tsx

@@ -1,7 +1,6 @@
 import { IconArrowsCross, IconBolt, IconBoltOff, IconDisc, IconLock, IconShield, IconUser } from "@tabler/icons-react";
 import cn from "classnames";
 import type { AuditLog } from "src/api/backend";
-import { useLocaleState } from "src/context";
 import { formatDateTime, T } from "src/locale";
 
 const getEventValue = (event: AuditLog) => {
@@ -67,7 +66,6 @@ interface Props {
 	row: AuditLog;
 }
 export function EventFormatter({ row }: Props) {
-	const { locale } = useLocaleState();
 	return (
 		<div className="flex-fill">
 			<div className="font-weight-medium">
@@ -75,7 +73,7 @@ export function EventFormatter({ row }: Props) {
 				<T id={`object.event.${row.action}`} tData={{ object: row.objectType }} />
 				&nbsp; &mdash; <span className="badge">{getEventValue(row)}</span>
 			</div>
-			<div className="text-secondary mt-1">{formatDateTime(row.createdOn, locale)}</div>
+			<div className="text-secondary mt-1">{formatDateTime(row.createdOn)}</div>
 		</div>
 	);
 }

frontend/src/components/Table/Formatter/ValueWithDateFormatter.tsx

@@ -1,4 +1,3 @@
-import { useLocaleState } from "src/context";
 import { formatDateTime, T } from "src/locale";
 
 interface Props {
@@ -7,7 +6,6 @@ interface Props {
 	disabled?: boolean;
 }
 export function ValueWithDateFormatter({ value, createdOn, disabled }: Props) {
-	const { locale } = useLocaleState();
 	return (
 		<div className="flex-fill">
 			<div className="font-weight-medium">
@@ -15,7 +13,7 @@ export function ValueWithDateFormatter({ value, createdOn, disabled }: Props) {
 			</div>
 			{createdOn ? (
 				<div className={`text-secondary mt-1 ${disabled ? "text-red" : ""}`}>
-					<T id={disabled ? "disabled" : "created-on"} data={{ date: formatDateTime(createdOn, locale) }} />
+					<T id={disabled ? "disabled" : "created-on"} data={{ date: formatDateTime(createdOn) }} />
 				</div>
 			) : null}
 		</div>

frontend/src/context/AuthContext.tsx

@@ -1,28 +1,13 @@
 import { useQueryClient } from "@tanstack/react-query";
 import { createContext, type ReactNode, useContext, useState } from "react";
 import { useIntervalWhen } from "rooks";
-import {
-	getToken,
-	isTwoFactorChallenge,
-	loginAsUser,
-	refreshToken,
-	verify2FA,
-	type TokenResponse,
-} from "src/api/backend";
+import { getToken, loginAsUser, refreshToken, type TokenResponse } from "src/api/backend";
 import AuthStore from "src/modules/AuthStore";
 
-// 2FA challenge state
-export interface TwoFactorChallenge {
-	challengeToken: string;
-}
-
 // Context
 export interface AuthContextType {
 	authenticated: boolean;
-	twoFactorChallenge: TwoFactorChallenge | null;
 	login: (username: string, password: string) => Promise<void>;
-	verifyTwoFactor: (code: string) => Promise<void>;
-	cancelTwoFactor: () => void;
 	loginAs: (id: number) => Promise<void>;
 	logout: () => void;
 	token?: string;
@@ -39,35 +24,17 @@ interface Props {
 function AuthProvider({ children, tokenRefreshInterval = 5 * 60 * 1000 }: Props) {
 	const queryClient = useQueryClient();
 	const [authenticated, setAuthenticated] = useState(AuthStore.hasActiveToken());
-	const [twoFactorChallenge, setTwoFactorChallenge] = useState<TwoFactorChallenge | null>(null);
 
 	const handleTokenUpdate = (response: TokenResponse) => {
 		AuthStore.set(response);
 		setAuthenticated(true);
-		setTwoFactorChallenge(null);
 	};
 
 	const login = async (identity: string, secret: string) => {
 		const response = await getToken(identity, secret);
-		if (isTwoFactorChallenge(response)) {
-			setTwoFactorChallenge({ challengeToken: response.challengeToken });
-			return;
-		}
 		handleTokenUpdate(response);
 	};
 
-	const verifyTwoFactor = async (code: string) => {
-		if (!twoFactorChallenge) {
-			throw new Error("No 2FA challenge pending");
-		}
-		const response = await verify2FA(twoFactorChallenge.challengeToken, code);
-		handleTokenUpdate(response);
-	};
-
-	const cancelTwoFactor = () => {
-		setTwoFactorChallenge(null);
-	};
-
 	const loginAs = async (id: number) => {
 		const response = await loginAsUser(id);
 		AuthStore.add(response);
@@ -102,15 +69,7 @@ function AuthProvider({ children, tokenRefreshInterval = 5 * 60 * 1000 }: Props)
 		true,
 	);
 
-	const value = {
-		authenticated,
-		twoFactorChallenge,
-		login,
-		verifyTwoFactor,
-		cancelTwoFactor,
-		loginAs,
-		logout,
-	};
+	const value = { authenticated, login, logout, loginAs };
 
 	return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
 }

frontend/src/locale/IntlProvider.tsx

@@ -1,91 +1,79 @@
 import { createIntl, createIntlCache } from "react-intl";
-import langBg from "./lang/bg.json";
 import langDe from "./lang/de.json";
-import langPt from "./lang/pt.json";
 import langEn from "./lang/en.json";
 import langEs from "./lang/es.json";
-import langFr from "./lang/fr.json";
-import langGa from "./lang/ga.json";
-import langId from "./lang/id.json";
 import langIt from "./lang/it.json";
 import langJa from "./lang/ja.json";
-import langKo from "./lang/ko.json";
+import langList from "./lang/lang-list.json";
 import langNl from "./lang/nl.json";
 import langPl from "./lang/pl.json";
 import langRu from "./lang/ru.json";
 import langSk from "./lang/sk.json";
 import langVi from "./lang/vi.json";
 import langZh from "./lang/zh.json";
-import langTr from "./lang/tr.json";
-import langHu from "./lang/hu.json";
-import langList from "./lang/lang-list.json";
+import langKo from "./lang/ko.json";
+import langBg from "./lang/bg.json";
 
 // first item of each array should be the language code,
 // not the country code
 // Remember when adding to this list, also update check-locales.js script
 const localeOptions = [
-  ["en", "en-US", langEn],
-  ["de", "de-DE", langDe],
-  ["es", "es-ES", langEs],
-  ["pt", "pt-PT", langPt],
-  ["fr", "fr-FR", langFr],
-  ["ga", "ga-IE", langGa],
-  ["ja", "ja-JP", langJa],
-  ["it", "it-IT", langIt],
-  ["nl", "nl-NL", langNl],
-  ["pl", "pl-PL", langPl],
-  ["ru", "ru-RU", langRu],
-  ["sk", "sk-SK", langSk],
-  ["vi", "vi-VN", langVi],
-  ["zh", "zh-CN", langZh],
-  ["ko", "ko-KR", langKo],
-  ["bg", "bg-BG", langBg],
-  ["id", "id-ID", langId],
-  ["tr", "tr-TR", langTr],
-  ["hu", "hu-HU", langHu],
+	["en", "en-US", langEn],
+	["de", "de-DE", langDe],
+	["es", "es-ES", langEs],
+	["ja", "ja-JP", langJa],
+	["it", "it-IT", langIt],
+	["nl", "nl-NL", langNl],
+	["pl", "pl-PL", langPl],
+	["ru", "ru-RU", langRu],
+	["sk", "sk-SK", langSk],
+	["vi", "vi-VN", langVi],
+	["zh", "zh-CN", langZh],
+	["ko", "ko-KR", langKo],
+	["bg", "bg-BG", langBg],
 ];
 
 const loadMessages = (locale?: string): typeof langList & typeof langEn => {
-  const thisLocale = (locale || "en").slice(0, 2);
+	const thisLocale = (locale || "en").slice(0, 2);
 
-  // ensure this lang exists in localeOptions above, otherwise fallback to en
-  if (thisLocale === "en" || !localeOptions.some(([code]) => code === thisLocale)) {
-    return Object.assign({}, langList, langEn);
-  }
+	// ensure this lang exists in localeOptions above, otherwise fallback to en
+	if (thisLocale === "en" || !localeOptions.some(([code]) => code === thisLocale)) {
+		return Object.assign({}, langList, langEn);
+	}
 
-  return Object.assign({}, langList, langEn, localeOptions.find(([code]) => code === thisLocale)?.[2]);
+	return Object.assign({}, langList, langEn, localeOptions.find(([code]) => code === thisLocale)?.[2]);
 };
 
 const getFlagCodeForLocale = (locale?: string) => {
-  const thisLocale = (locale || "en").slice(0, 2);
+	const thisLocale = (locale || "en").slice(0, 2);
 
-  // only add to this if your flag is different from the locale code
-  const specialCases: Record<string, string> = {
-    ja: "jp", // Japan
-    zh: "cn", // China
-    vi: "vn", // Vietnam
-    ko: "kr", // Korea
-  };
+	// only add to this if your flag is different from the locale code
+	const specialCases: Record<string, string> = {
+		ja: "jp", // Japan
+		zh: "cn", // China
+		vi: "vn", // Vietnam
+		ko: "kr", // Korea
+	};
 
-  if (specialCases[thisLocale]) {
-    return specialCases[thisLocale].toUpperCase();
-  }
-  return thisLocale.toUpperCase();
+	if (specialCases[thisLocale]) {
+		return specialCases[thisLocale].toUpperCase();
+	}
+	return thisLocale.toUpperCase();
 };
 
 const getLocale = (short = false) => {
-  let loc = window.localStorage.getItem("locale");
-  if (!loc) {
-    loc = document.documentElement.lang;
-  }
-  if (short) {
-    return loc.slice(0, 2);
-  }
-  // finally, fallback
-  if (!loc) {
-    loc = "en";
-  }
-  return loc;
+	let loc = window.localStorage.getItem("locale");
+	if (!loc) {
+		loc = document.documentElement.lang;
+	}
+	if (short) {
+		return loc.slice(0, 2);
+	}
+	// finally, fallback
+	if (!loc) {
+		loc = "en";
+	}
+	return loc;
 };
 
 const cache = createIntlCache();
@@ -94,43 +82,43 @@ const initialMessages = loadMessages(getLocale());
 let intl = createIntl({ locale: getLocale(), messages: initialMessages }, cache);
 
 const changeLocale = (locale: string): void => {
-  const messages = loadMessages(locale);
-  intl = createIntl({ locale, messages }, cache);
-  window.localStorage.setItem("locale", locale);
-  document.documentElement.lang = locale;
+	const messages = loadMessages(locale);
+	intl = createIntl({ locale, messages }, cache);
+	window.localStorage.setItem("locale", locale);
+	document.documentElement.lang = locale;
 };
 
 // This is a translation component that wraps the translation in a span with a data
 // attribute so devs can inspect the element to see the translation ID
 const T = ({
-  id,
-  data,
-  tData,
+	id,
+	data,
+	tData,
 }: {
-  id: string;
-  data?: Record<string, string | number | undefined>;
-  tData?: Record<string, string>;
+	id: string;
+	data?: Record<string, string | number | undefined>;
+	tData?: Record<string, string>;
 }) => {
-  const translatedData: Record<string, string> = {};
-  if (tData) {
-    // iterate over tData and translate each value
-    Object.entries(tData).forEach(([key, value]) => {
-      translatedData[key] = intl.formatMessage({ id: value });
-    });
-  }
-  return (
-    <span data-translation-id={id}>
-      {intl.formatMessage(
-        { id },
-        {
-          ...data,
-          ...translatedData,
-        },
-      )}
-    </span>
-  );
+	const translatedData: Record<string, string> = {};
+	if (tData) {
+		// iterate over tData and translate each value
+		Object.entries(tData).forEach(([key, value]) => {
+			translatedData[key] = intl.formatMessage({ id: value });
+		});
+	}
+	return (
+		<span data-translation-id={id}>
+			{intl.formatMessage(
+				{ id },
+				{
+					...data,
+					...translatedData,
+				},
+			)}
+		</span>
+	);
 };
 
-//console.log("L:", localeOptions);
+console.log("L:", localeOptions);
 
 export { localeOptions, getFlagCodeForLocale, getLocale, createIntl, changeLocale, intl, T };

frontend/src/locale/Utils.test.tsx

@@ -39,19 +39,19 @@ describe("DateFormatter", () => {
 	it("format date from iso date", () => {
 		const value = "2024-01-01T00:00:00.000Z";
 		const text = formatDateTime(value);
-		expect(text).toBe("1 Jan 2024, 12:00:00 am");
+		expect(text).toBe("Monday, 01/01/2024, 12:00:00 am");
 	});
 
 	it("format date from unix timestamp number", () => {
 		const value = 1762476112;
 		const text = formatDateTime(value);
-		expect(text).toBe("7 Nov 2025, 12:41:52 am");
+		expect(text).toBe("Friday, 07/11/2025, 12:41:52 am");
 	});
 
 	it("format date from unix timestamp string", () => {
 		const value = "1762476112";
 		const text = formatDateTime(value);
-		expect(text).toBe("7 Nov 2025, 12:41:52 am");
+		expect(text).toBe("Friday, 07/11/2025, 12:41:52 am");
 	});
 
 	it("catch bad format from string", () => {

frontend/src/locale/Utils.ts

@@ -1,9 +1,4 @@
-import {
-	fromUnixTime,
-	type IntlFormatFormatOptions,
-	intlFormat,
-	parseISO,
-} from "date-fns";
+import { fromUnixTime, intlFormat, parseISO } from "date-fns";
 
 const isUnixTimestamp = (value: unknown): boolean => {
 	if (typeof value !== "number" && typeof value !== "string") return false;
@@ -25,19 +20,20 @@ const parseDate = (value: string | number): Date | null => {
 	}
 };
 
-const formatDateTime = (value: string | number, locale = "en-US"): string => {
+const formatDateTime = (value: string | number): string => {
 	const d = parseDate(value);
 	if (!d) return `${value}`;
 	try {
-		return intlFormat(
-			d,
-			{
-				dateStyle: "medium",
-				timeStyle: "medium",
-				hourCycle: "h12",
-			} as IntlFormatFormatOptions,
-			{ locale },
-		);
+		return intlFormat(d, {
+			weekday: "long",
+			year: "numeric",
+			month: "numeric",
+			day: "numeric",
+			hour: "numeric",
+			minute: "numeric",
+			second: "numeric",
+			hour12: true,
+		});
 	} catch {
 		return `${value}`;
 	}

frontend/src/locale/scripts/locale-sort.cjs

@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require("fs");
-const path = require("path");
-
-const DIR = path.resolve(__dirname, "../src");
-
-// Function to sort object keys recursively
-function sortKeys(obj) {
-	if (obj === null || typeof obj !== "object" || obj instanceof Array) {
-		return obj;
-	}
-
-	const sorted = {};
-	const keys = Object.keys(obj).sort();
-	for (const key of keys) {
-		const value = obj[key];
-		if (typeof value === "object" && value !== null && !(value instanceof Array)) {
-			sorted[key] = sortKeys(value);
-		} else {
-			sorted[key] = value;
-		}
-	}
-	return sorted;
-}
-
-// Get all JSON files in the directory
-const files = fs.readdirSync(DIR).filter((file) => {
-	return file.endsWith(".json") && file !== "lang-list.json";
-});
-
-files.forEach((file) => {
-	const filePath = path.join(DIR, file);
-	const stats = fs.statSync(filePath);
-
-	if (!stats.isFile()) {
-		return;
-	}
-
-	if (stats.size === 0) {
-		console.log(`Skipping empty file ${file}`);
-		return;
-	}
-
-	try {
-		// Read original content
-		const originalContent = fs.readFileSync(filePath, "utf8");
-		const originalJson = JSON.parse(originalContent);
-
-		// Sort keys
-		const sortedJson = sortKeys(originalJson);
-
-		// Convert back to string with tabs
-		const sortedContent = JSON.stringify(sortedJson, null, "\t") + "\n";
-
-		// Compare (normalize whitespace)
-		if (originalContent.trim() === sortedContent.trim()) {
-			console.log(`${file} is already sorted`);
-			return;
-		}
-
-		// Write sorted content
-		fs.writeFileSync(filePath, sortedContent, "utf8");
-		console.log(`Sorted ${file}`);
-	} catch (error) {
-		console.error(`Error processing ${file}:`, error.message);
-	}
-});
-

frontend/src/locale/scripts/locale-sort.sh

@@ -31,6 +31,6 @@ for file in *.json; do
 		fi
 
 		echo "Sorting $file"
-		tmp=$(mktemp) && jq --tab --sort-keys . "$file" > "$tmp" && mv "$tmp" "$file"
+		jq --tab --sort-keys . "$file" | sponge "$file"
 	fi
 done

frontend/src/locale/src/HelpDoc/fr/AccessLists.md

@@ -1,7 +0,0 @@
-## Qu'est-ce qu'une liste d'accès ?
-
-Les listes d'accès permettent de définir une liste noire ou une liste blanche d'adresses IP clientes spécifiques, ainsi que l'authentification des Hôtes Proxy via l'authentification HTTP de base.
-
-Vous pouvez configurer plusieurs règles client, noms d'utilisateur et mots de passe pour une même liste d'accès, puis l'appliquer à un ou plusieurs Hôtes Proxy.
-
-Ceci est particulièrement utile pour les services web redirigés qui ne disposent pas de mécanismes d'authentification intégrés ou lorsque vous souhaitez vous protéger contre les clients inconnus.

frontend/src/locale/src/HelpDoc/fr/Certificates.md

@@ -1,23 +0,0 @@
-## Aide concernant les certificats
-
-### Certificat HTTP
-
-Un certificat HTTP validé signifie que les serveurs de Let's Encrypt testeront d'accéder à vos domaines via HTTP (et non HTTPS !). En cas de succès, ils émettront votre certificat.
-
-Pour cette méthode, vous devrez créer un Hôte Proxy pour votre ou vos domaines. Cet Hôte Proxy devra être accessible via HTTP et pointer vers cette installation Nginx. Une fois le certificat émis, vous pourrez modifier l'Hôte Proxy pour qu'il utilise également ce certificat pour les connexions HTTPS. Cependant, l'Hôte Proxy devra toujours être configuré pour l'accès HTTP afin que le certificat puisse être renouvelé.
-
-Ce processus ne prend pas en charge les domaines génériques.
-
-### Certificat DNS
-
-Un certificat DNS validé nécessite l'utilisation du plugin Fournisseur DNS. Fournisseur DNS créera des enregistrements temporaires sur votre domaine. Let's Encrypt interrogera ensuite ces enregistrements pour vérifier que vous en êtes bien le propriétaire. En cas de succès, votre certificat sera émis.
-
-Il n'est pas nécessaire de créer un Hôte Proxy avant de demander ce type de certificat.
-
-Il n'est pas non plus nécessaire de configurer votre Hôte Proxy pour l'accès HTTP.
-
-Ce processus prend en charge les domaines génériques.
-
-## Certificat personnalisé
-
-Utilisez cette option pour importer votre propre certificat SSL, fourni par votre autorité de certification.

frontend/src/locale/src/HelpDoc/fr/DeadHosts.md

@@ -1,7 +0,0 @@
-## Qu'est-ce qu'un serveur 404 ?
-
-Un Hôte 404 est simplement un hôte configuré pour afficher une page 404.
-
-Cela peut s'avérer utile lorsque votre domaine est indexé par les moteurs de recherche et que vous souhaitez fournir une page d'erreur plus conviviale ou, plus précisément, indiquer aux moteurs de recherche que les pages du domaine n'existent plus.
-
-Un autre avantage de cet hôte est la possibilité de suivre les journaux et de consulter les sites référenceurs.

frontend/src/locale/src/HelpDoc/fr/ProxyHosts.md

@@ -1,7 +0,0 @@
-## Qu'est-ce qu'un hôte proxy ?
-
-Un Hôte Proxy est le point de terminaison entrant d'un service web que vous souhaitez rediriger.
-
-Il assure la terminaison SSL optionnelle pour votre service qui ne prend pas en charge SSL nativement.
-
-Les Hôtes Proxy constituent l'utilisation la plus courante du Nginx Proxy Manager.

frontend/src/locale/src/HelpDoc/fr/RedirectionHosts.md

@@ -1,5 +0,0 @@
-## Qu'est-ce qu'un serveur de redirection ?
-
-Un Hôte de Redirection redirige les requêtes provenant du domaine entrant vers un autre domaine.
-
-On utilise généralement ce type d'hôte lorsque votre site web change de domaine, mais que des liens provenant des moteurs de recherche ou des sites référenceurs pointent toujours vers l'ancien domaine.

frontend/src/locale/src/HelpDoc/fr/Streams.md

@@ -1,5 +0,0 @@
-## Qu'est-ce qu'un Stream ?
-
-Fonctionnalité relativement récente de Nginx, un Stream permet de rediriger le trafic TCP/UDP directement vers un autre ordinateur du réseau.
-
-Si vous gérez des serveurs de jeux, FTP ou SSH, cela peut s'avérer très utile.

frontend/src/locale/src/HelpDoc/fr/index.ts

@@ -1,6 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";

frontend/src/locale/src/HelpDoc/ga/AccessLists.md

@@ -1,7 +0,0 @@
-## Cad is Liosta Rochtana ann?
-
-Soláthraíonn Liostaí Rochtana liosta dubh nó liosta bán de sheoltaí IP cliant ar leith mar aon le fíordheimhniú do na hÓstaigh Seachfhreastalaí trí Fhíordheimhniú Bunúsach HTTP.
-
-Is féidir leat rialacha cliant, ainmneacha úsáideora agus pasfhocail iolracha a chumrú le haghaidh Liosta Rochtana aonair agus ansin iad sin a chur i bhfeidhm ar _Óstach Seachfhreastalaí_ amháin nó níos mó.
-
-Tá sé seo an-úsáideach i gcás seirbhísí gréasáin atreoraithe nach bhfuil meicníochtaí fíordheimhnithe ionsuite iontu nó nuair is mian leat cosaint a dhéanamh ar chliaint anaithnide.

frontend/src/locale/src/HelpDoc/ga/Certificates.md

@@ -1,21 +0,0 @@
-## Cabhair le Deimhnithe
-
-### Teastas HTTP
-
-Ciallaíonn deimhniú bailíochtaithe HTTP go ndéanfaidh freastalaithe Let's Encrypt iarracht teacht ar do fhearainn thar HTTP (ní HTTPS!) agus má éiríonn leo, eiseoidh siad do theastas.
-
-Chun an modh seo a dhéanamh, beidh ort _Óstach Proxy_ a chruthú do do fhearainn(eanna) atá inrochtana le HTTP agus ag pointeáil chuig an suiteáil Nginx seo. Tar éis deimhniú a thabhairt, is féidir leat an _Óstach Proxy_ a mhodhnú chun an deimhniú seo a úsáid le haghaidh naisc HTTPS freisin. Mar sin féin, beidh ort an _Óstach Proxy_ a chumrú fós le haghaidh rochtain HTTP chun go ndéanfar an deimhniú a athnuachan.
-
-_Ní thacaíonn_ an próiseas seo le fearainn fiáine.
-
-### Teastas DNS
-
-Éilíonn deimhniú bailíochtaithe DNS ort breiseán Soláthraí DNS a úsáid. Úsáidfear an Soláthraí DNS seo chun taifid shealadacha a chruthú ar do fhearann agus ansin déanfaidh Let's Encrypt fiosrúchán ar na taifid sin lena chinntiú gurb tusa an t-úinéir agus má éiríonn leo, eiseoidh siad do theastas.	
-
-Ní gá duit _Óstach Proxy_ a chruthú sula n-iarrann tú an cineál seo teastais. Ní gá duit do _Óstach Proxy_ a chumrú le haghaidh rochtana HTTP ach an oiread.
-
-_Tacaíonn_ an próiseas seo le fearainn fiáine.
-
-### Teastas Saincheaptha
-
-Úsáid an rogha seo chun do Theastas SSL féin a uaslódáil, mar a sholáthraíonn d'Údarás Deimhnithe féin é.

frontend/src/locale/src/HelpDoc/ga/DeadHosts.md

@@ -1,7 +0,0 @@
-## Cad is Óstach 404 ann?
-
-Is socrú óstach a thaispeánann leathanach 404 é Óstach 404.
-
-Is féidir leis seo a bheith úsáideach nuair a bhíonn do fhearann liostaithe in innill chuardaigh agus más mian leat leathanach earráide níos deise a sholáthar nó a chur in iúl do na hinnéacsóirí cuardaigh go sonrach nach bhfuil na leathanaigh fearainn ann a thuilleadh.
-
-Buntáiste eile a bhaineann leis an óstach seo a bheith agat ná go bhfeictear na logaí le haghaidh amas agus go bhfeictear na tagairtí.

frontend/src/locale/src/HelpDoc/ga/ProxyHosts.md

@@ -1,7 +0,0 @@
-## Cad is Óstach Seachfhreastalaí ann?
-
-Is é Óstach Seachfhreastalaí an críochphointe isteach do sheirbhís ghréasáin ar mhaith leat a atreorú.
-
-Soláthraíonn sé foirceannadh SSL roghnach do do sheirbhís nach bhfuil tacaíocht SSL ionsuite inti b'fhéidir.
-
-Is iad Óstaigh Seachfhreastalaí an úsáid is coitianta a bhaintear as Bainisteoir Seachfhreastalaí Nginx.

frontend/src/locale/src/HelpDoc/ga/RedirectionHosts.md

@@ -1,5 +0,0 @@
-## Cad is Óstach Athsheolta ann?
-
-Déanfaidh Óstach Athsheolta iarratais a atreorú ón bhfearann ag teacht isteach agus an breathnóir a bhrú chuig fearann eile.
-
-Is é an chúis is coitianta le húsáid a bhaint as an gcineál seo óstála ná nuair a athraíonn do shuíomh Gréasáin fearainn ach go bhfuil naisc innill chuardaigh nó atreoraithe agat fós ag tagairt don seanfhearann.

frontend/src/locale/src/HelpDoc/ga/Streams.md

@@ -1,5 +0,0 @@
-## Cad is Sruth ann?
-
-Gné réasúnta nua do Nginx is ea Sruth a sheolfaidh trácht TCP/UDP go díreach chuig ríomhaire eile ar an líonra.
-
-Más freastalaithe cluichí, freastalaithe FTP nó SSH atá á rith agat, d’fhéadfadh sé seo a bheith úsáideach.

frontend/src/locale/src/HelpDoc/ga/index.ts

@@ -1,6 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";

frontend/src/locale/src/HelpDoc/hu/AccessLists.md

@@ -1,7 +0,0 @@
-## Mi az a hozzáférési lista?
-
-A hozzáférési listák feketelistát vagy fehérlistát biztosítanak meghatározott kliens IP-címekhez, valamint alap HTTP-hitelesítést (Basic HTTP Authentication) a proxy kiszolgálókhoz.
-
-Egyetlen hozzáférési listához több kliensszabályt, felhasználónevet és jelszót is beállíthatsz, majd ezt alkalmazhatod egy vagy több _Proxy Kiszolgáló_-ra.
-
-Ez különösen hasznos olyan továbbított webszolgáltatásoknál, amelyekben nincs beépített hitelesítési mechanizmus, vagy amikor ismeretlen kliensektől szeretnél védeni.

frontend/src/locale/src/HelpDoc/hu/Certificates.md

@@ -1,21 +0,0 @@
-## Tanúsítványok súgó
-
-### HTTP tanúsítvány
-
-A HTTP érvényes tanúsítvány azt jelenti, hogy a Let's Encrypt szerverek megpróbálják elérni a domaineket HTTP-n keresztül (nem HTTPS-en!), és ha sikerül, kiállítják a tanúsítványt.
-
-Ehhez a módszerhez létre kell hoznod egy _Proxy Kiszolgáló_-t a domain(ek)hez, amely HTTP-n keresztül elérhető és erre az Nginx telepítésre mutat. Miután a tanúsítvány megérkezett, módosíthatod a _Proxy Kiszolgáló_-t, hogy ezt a tanúsítványt használja a HTTPS kapcsolatokhoz is. Azonban a _Proxy Kiszolgáló_-nak továbbra is konfigurálva kell lennie HTTP hozzáféréshez, hogy a tanúsítvány megújulhasson.
-
-Ez a folyamat _nem_ támogatja a helyettesítő karakteres domaineket.
-
-### DNS tanúsítvány
-
-A DNS érvényes tanúsítvány megköveteli, hogy DNS szolgáltató plugint használj. Ez a DNS szolgáltató ideiglenes rekordokat hoz létre a domainen, majd a Let's Encrypt lekérdezi ezeket a rekordokat, hogy megbizonyosodjon a tulajdonjogról, és ha sikeres, kiállítják a tanúsítványt.
-
-Nem szükséges előzetesen _Proxy Kiszolgáló_-t létrehozni az ilyen típusú tanúsítvány igényléséhez. Nem is kell a _Proxy Kiszolgáló_-t HTTP hozzáférésre konfigurálni.
-
-Ez a folyamat _támogatja_ a helyettesítő karakteres domaineket.
-
-### Egyéni tanúsítvány
-
-Ezt az opciót használd a saját SSL tanúsítvány feltöltéséhez, amelyet a saját tanúsítványkibocsátód biztosított.

frontend/src/locale/src/HelpDoc/hu/DeadHosts.md

@@ -1,7 +0,0 @@
-## Mi az a 404-es Kiszolgáló?
-
-A 404-es Kiszolgáló egyszerűen egy olyan kiszolgáló beállítás, amely egy 404-es oldalt jelenít meg.
-
-Ez akkor lehet hasznos, ha a domained szerepel a keresőmotorokban, és egy szebb hibaoldalt szeretnél nyújtani, vagy kifejezetten jelezni akarod a keresőrobotoknak, hogy a domain oldalai már nem léteznek.
-
-Ennek a kiszolgálónak egy további előnye, hogy nyomon követheted a rá érkező találatokat a naplókban, és megtekintheted a hivatkozó oldalakat.

frontend/src/locale/src/HelpDoc/hu/ProxyHosts.md

@@ -1,7 +0,0 @@
-## Mi az a Proxy Kiszolgáló?
-
-A Proxy Kiszolgáló egy bejövő végpont egy olyan webszolgáltatáshoz, amelyet továbbítani szeretnél.
-
-Opcionális SSL lezárást biztosít a szolgáltatásodhoz, amelyben esetleg nincs beépített SSL támogatás.
-
-A Proxy Kiszolgálók az Nginx Proxy Manager leggyakoribb felhasználási módjai.

frontend/src/locale/src/HelpDoc/hu/RedirectionHosts.md

@@ -1,5 +0,0 @@
-## Mi az az Átirányító Kiszolgáló?
-
-Az Átirányító Kiszolgáló a bejövő domainre érkező kéréseket átirányítja, és a látogatót egy másik domainre küldi.
-
-Ennek a kiszolgálótípusnak a leggyakoribb használati oka az, amikor a weboldalad domaint vált, de a keresőkben vagy a hivatkozó oldalakon még mindig a régi domainre mutató linkek vannak.

frontend/src/locale/src/HelpDoc/hu/Streams.md

@@ -1,5 +0,0 @@
-## Mi az a Stream?
-
-Az Nginx egy viszonylag új funkciója, a Stream arra szolgál, hogy a TCP/UDP forgalmat közvetlenül továbbítsa a hálózat egy másik számítógépére.
-
-Ha játékszervereket, FTP vagy SSH szervereket futtatsz, ez hasznos lehet.

frontend/src/locale/src/HelpDoc/hu/index.ts

@@ -1,6 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";

frontend/src/locale/src/HelpDoc/id/AccessLists.md

@@ -1,7 +0,0 @@
-## Apa itu Daftar Akses?
-
-Daftar Akses menyediakan daftar hitam atau daftar putih alamat IP klien tertentu beserta autentikasi untuk Host Proxy melalui Autentikasi HTTP Basic.
-
-Anda dapat mengonfigurasi beberapa aturan klien, nama pengguna, dan kata sandi untuk satu Daftar Akses lalu menerapkannya ke satu atau lebih _Host Proxy_.
-
-Ini paling berguna untuk layanan web yang diteruskan yang tidak memiliki mekanisme autentikasi bawaan atau ketika Anda ingin melindungi dari klien yang tidak dikenal.

frontend/src/locale/src/HelpDoc/id/Certificates.md

@@ -1,32 +0,0 @@
-## Bantuan Sertifikat
-
-### Sertifikat HTTP
-
-Sertifikat yang divalidasi HTTP berarti server Let's Encrypt akan
-mencoba menjangkau domain Anda melalui HTTP (bukan HTTPS!) dan jika berhasil, mereka
-akan menerbitkan sertifikat Anda.
-
-Untuk metode ini, Anda harus membuat _Host Proxy_ untuk domain Anda yang
-dapat diakses dengan HTTP dan mengarah ke instalasi Nginx ini. Setelah sertifikat
-diberikan, Anda dapat mengubah _Host Proxy_ agar juga menggunakan sertifikat ini untuk HTTPS
-koneksi. Namun, _Host Proxy_ tetap perlu dikonfigurasi untuk akses HTTP
-agar sertifikat dapat diperpanjang.
-
-Proses ini _tidak_ mendukung domain wildcard.
-
-### Sertifikat DNS
-
-Sertifikat yang divalidasi DNS mengharuskan Anda menggunakan plugin Penyedia DNS. Penyedia DNS ini
-akan digunakan untuk membuat record sementara pada domain Anda dan kemudian Let's
-Encrypt akan menanyakan record tersebut untuk memastikan Anda pemiliknya dan jika berhasil, mereka
-akan menerbitkan sertifikat Anda.
-
-Anda tidak perlu membuat _Host Proxy_ sebelum meminta jenis sertifikat ini.
-Anda juga tidak perlu mengonfigurasi _Host Proxy_ untuk akses HTTP.
-
-Proses ini _mendukung_ domain wildcard.
-
-### Sertifikat Kustom
-
-Gunakan opsi ini untuk mengunggah Sertifikat SSL Anda sendiri, sebagaimana disediakan oleh
-Certificate Authority Anda.

frontend/src/locale/src/HelpDoc/id/DeadHosts.md

@@ -1,10 +0,0 @@
-## Apa itu Host 404?
-
-Host 404 adalah konfigurasi host yang menampilkan halaman 404.
-
-Ini dapat berguna ketika domain Anda terindeks di mesin pencari dan Anda ingin
-menyediakan halaman error yang lebih baik atau secara khusus memberi tahu pengindeks pencarian bahwa
-halaman domain tersebut sudah tidak ada.
-
-Manfaat lain memiliki host ini adalah melacak log untuk akses ke host tersebut dan
-melihat perujuk.

frontend/src/locale/src/HelpDoc/id/ProxyHosts.md

@@ -1,7 +0,0 @@
-## Apa itu Host Proxy?
-
-Host Proxy adalah endpoint masuk untuk layanan web yang ingin Anda teruskan.
-
-Host ini menyediakan terminasi SSL opsional untuk layanan Anda yang mungkin tidak memiliki dukungan SSL bawaan.
-
-Host Proxy adalah penggunaan paling umum untuk Nginx Proxy Manager.

frontend/src/locale/src/HelpDoc/id/RedirectionHosts.md

@@ -1,5 +0,0 @@
-## Apa itu Host Pengalihan?
-
-Host Pengalihan akan mengalihkan permintaan dari domain masuk dan mengarahkan pengunjung ke domain lain.
-
-Alasan paling umum menggunakan jenis host ini adalah ketika situs Anda berpindah domain tetapi masih ada tautan mesin pencari atau perujuk yang mengarah ke domain lama.

frontend/src/locale/src/HelpDoc/id/Streams.md

@@ -1,6 +0,0 @@
-## Apa itu Stream?
-
-Fitur yang relatif baru untuk Nginx, Stream berfungsi untuk meneruskan trafik TCP/UDP
-langsung ke komputer lain di jaringan.
-
-Jika Anda menjalankan server game, FTP, atau SSH, ini bisa sangat membantu.

frontend/src/locale/src/HelpDoc/id/index.ts

@@ -1,6 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";

frontend/src/locale/src/HelpDoc/index.ts

@@ -1,37 +1,35 @@
-import * as bg from "./bg/index";
 import * as de from "./de/index";
-import * as pt from "./pt/index";
 import * as en from "./en/index";
-import * as es from "./es/index";
-import * as fr from "./fr/index";
-import * as ga from "./ga/index";
-import * as id from "./id/index";
 import * as it from "./it/index";
 import * as ja from "./ja/index";
-import * as ko from "./ko/index";
 import * as nl from "./nl/index";
 import * as pl from "./pl/index";
 import * as ru from "./ru/index";
 import * as sk from "./sk/index";
 import * as vi from "./vi/index";
 import * as zh from "./zh/index";
-import * as tr from "./tr/index";
-import * as hu from "./hu/index";
-
-const items: any = { en, de, pt, es, ja, sk, zh, pl, ru, it, vi, nl, bg, ko, ga, id, fr, tr, hu };
+import * as ko from "./ko/index";
+import * as bg from "./bg/index";
 
+const items: any = { en, de, ja, sk, zh, pl, ru, it, vi, nl, bg, ko };
 
 const fallbackLang = "en";
 
 export const getHelpFile = (lang: string, section: string): string => {
-  if (typeof items[lang] !== "undefined" && typeof items[lang][section] !== "undefined") {
-    return items[lang][section].default;
-  }
-  // Fallback to English
-  if (typeof items[fallbackLang] !== "undefined" && typeof items[fallbackLang][section] !== "undefined") {
-    return items[fallbackLang][section].default;
-  }
-  throw new Error(`Cannot load help doc for ${lang}-${section}`);
+	if (
+		typeof items[lang] !== "undefined" &&
+		typeof items[lang][section] !== "undefined"
+	) {
+		return items[lang][section].default;
+	}
+	// Fallback to English
+	if (
+		typeof items[fallbackLang] !== "undefined" &&
+		typeof items[fallbackLang][section] !== "undefined"
+	) {
+		return items[fallbackLang][section].default;
+	}
+	throw new Error(`Cannot load help doc for ${lang}-${section}`);
 };
 
 export default items;

frontend/src/locale/src/HelpDoc/pt/AccessLists.md

@@ -1,11 +0,0 @@
-## O que é uma Access List?
-
-As *Access Lists* fornecem uma lista de permissões (whitelist) ou bloqueios (blacklist)
-de endereços IP específicos de clientes, juntamente com autenticação para os *Proxy Hosts*
-via Autenticação HTTP Básica (*Basic Auth*).
-
-Podes configurar múltiplas regras de cliente, nomes de utilizador e palavras-passe
-para uma única *Access List*, e depois aplicá-la a um ou mais *Proxy Hosts*.
-
-Isto é especialmente útil para serviços web encaminhados que não têm mecanismos
-de autenticação integrados ou quando pretendes proteger o acesso contra clientes desconhecidos.

frontend/src/locale/src/HelpDoc/pt/Certificates.md

@@ -1,31 +0,0 @@
-## Ajuda de Certificados
-
-### Certificado HTTP
-
-Um certificado validado por HTTP significa que os servidores do Let's Encrypt irão
-tentar aceder aos teus domínios via HTTP (não HTTPS!) e, se a ligação for bem-sucedida,
-emitirão o certificado.
-
-Para este método, é necessário ter um *Proxy Host* criado para o(s) teu(s) domínio(s),
-acessível via HTTP e a apontar para esta instalação do Nginx. Depois de o certificado ser
-emitido, podes modificar o *Proxy Host* para também utilizar esse certificado em ligações HTTPS.
-No entanto, o *Proxy Host* deve continuar configurado para acesso HTTP para que a renovação
-funcione corretamente.
-
-Este processo **não** suporta domínios wildcard.
-
-### Certificado DNS
-
-Um certificado validado por DNS requer que uses um plugin de fornecedor DNS (*DNS Provider*).
-Este fornecedor será usado para criar registos temporários no teu domínio, que serão consultados
-pelo Let's Encrypt para confirmar que és o proprietário. Se tudo correr bem, o certificado será emitido.
-
-Não é necessário ter um *Proxy Host* criado antes de pedir este tipo de certificado.
-Também não é necessário que o *Proxy Host* tenha acesso HTTP configurado.
-
-Este processo **suporta** domínios wildcard.
-
-### Certificado Personalizado
-
-Usa esta opção para carregar o teu próprio Certificado SSL, fornecido pela
-tua Autoridade Certificadora.

frontend/src/locale/src/HelpDoc/pt/DeadHosts.md

@@ -1,9 +0,0 @@
-## O que é um 404 Host?
-
-Um *404 Host* é simplesmente um host configurado para apresentar uma página 404.
-
-Isto pode ser útil quando o teu domínio aparece em motores de busca e queres fornecer
-uma página de erro mais agradável ou indicar especificamente aos indexadores de pesquisa
-que as páginas desse domínio já não existem.
-
-Outra vantagem é permitir consultar os registos de acessos a este host e ver os referenciadores.

frontend/src/locale/src/HelpDoc/pt/ProxyHosts.md

@@ -1,7 +0,0 @@
-## O que é um Proxy Host?
-
-Um *Proxy Host* é o ponto de entrada para um serviço web que pretendes encaminhar.
-
-Permite, opcionalmente, fazer terminação SSL para um serviço que possa não ter suporte SSL nativo.
-
-Os *Proxy Hosts* são a utilização mais comum do Nginx Proxy Manager.

frontend/src/locale/src/HelpDoc/pt/RedirectionHosts.md

@@ -1,7 +0,0 @@
-## O que é um Redirection Host?
-
-Um *Redirection Host* redireciona pedidos recebidos no domínio de entrada e envia
-o utilizador para outro domínio.
-
-A razão mais comum para usar este tipo de host é quando o teu site muda de domínio
-mas ainda tens motores de busca ou links de referência a apontar para o domínio antigo.

frontend/src/locale/src/HelpDoc/pt/Streams.md

@@ -1,6 +0,0 @@
-## O que é um Stream?
-
-Uma funcionalidade relativamente recente no Nginx, um *Stream* serve para encaminhar
-tráfego TCP/UDP diretamente para outro computador na rede.
-
-Se estiveres a executar servidores de jogos, FTP ou SSH, isto pode ser bastante útil.

frontend/src/locale/src/HelpDoc/pt/index.ts

@@ -1,6 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";

frontend/src/locale/src/HelpDoc/tr/AccessLists.md

@@ -1,8 +0,0 @@
-## Erişim Listesi Nedir?
-
-Erişim Listeleri, Temel HTTP Kimlik Doğrulama aracılığıyla Proxy Host'lar için belirli istemci IP adreslerinin kara listesi veya beyaz listesini ve kimlik doğrulamasını sağlar.
-
-Tek bir Erişim Listesi için birden fazla istemci kuralı, kullanıcı adı ve şifre yapılandırabilir ve bunu bir veya daha fazla _Proxy Host_'a uygulayabilirsiniz.
-
-Bu, yerleşik kimlik doğrulama mekanizmaları olmayan veya bilinmeyen istemcilerden korunmak istediğinizde iletilen web hizmetleri için en kullanışlıdır.
-

frontend/src/locale/src/HelpDoc/tr/Certificates.md

@@ -1,29 +0,0 @@
-## Sertifika Yardımı
-
-### HTTP Sertifikası
-
-Bir HTTP doğrulanmış sertifika, Let's Encrypt sunucularının
-alan adlarınıza HTTP (HTTPS değil!) üzerinden ulaşmaya çalışacağı ve başarılı olursa,
-sertifikanızı verecekleri anlamına gelir.
-
-Bu yöntem için, alan adlarınız için HTTP ile erişilebilir ve bu Nginx kurulumuna işaret eden bir _Proxy Host_ oluşturulmuş olmalıdır. Bir sertifika
-verildikten sonra, _Proxy Host_'u HTTPS
-bağlantıları için de bu sertifikayı kullanacak şekilde değiştirebilirsiniz. Ancak, sertifikanın yenilenmesi için _Proxy Host_'un hala HTTP erişimi için yapılandırılmış olması gerekecektir.
-
-Bu işlem joker karakter alan adlarını _desteklemez_.
-
-### DNS Sertifikası
-
-Bir DNS doğrulanmış sertifika, bir DNS Sağlayıcı eklentisi kullanmanızı gerektirir. Bu DNS
-Sağlayıcı, alan adınızda geçici kayıtlar oluşturmak için kullanılacak ve ardından Let's
-Encrypt bu kayıtları sorgulayarak sahibi olduğunuzdan emin olacak ve başarılı olursa,
-sertifikanızı verecektir.
-
-Bu tür bir sertifika talep etmeden önce bir _Proxy Host_ oluşturulmasına gerek yoktur. Ayrıca _Proxy Host_'unuzun HTTP erişimi için yapılandırılmasına da gerek yoktur.
-
-Bu işlem joker karakter alan adlarını _destekler_.
-
-### Özel Sertifika
-
-Kendi Sertifika Otoriteniz tarafından sağlanan kendi SSL Sertifikanızı yüklemek için bu seçeneği kullanın.
-

frontend/src/locale/src/HelpDoc/tr/DeadHosts.md

@@ -1,10 +0,0 @@
-## 404 Host Nedir?
-
-404 Host, basitçe bir 404 sayfası gösteren bir host kurulumudur.
-
-Bu, alan adınız arama motorlarında listelendiğinde ve daha güzel bir hata sayfası sağlamak veya özellikle arama dizinleyicilerine
-alan adı sayfalarının artık mevcut olmadığını söylemek istediğinizde yararlı olabilir.
-
-Bu host'un bir başka faydası da, ona yapılan isteklerin loglarını takip etmek ve
-referansları görüntülemektir.
-

frontend/src/locale/src/HelpDoc/tr/ProxyHosts.md

@@ -1,8 +0,0 @@
-## Proxy Host Nedir?
-
-Proxy Host, iletilmek istediğiniz bir web hizmeti için gelen uç noktadır.
-
-SSL desteği yerleşik olmayan hizmetiniz için isteğe bağlı SSL sonlandırma sağlar.
-
-Proxy Host'lar, Nginx Proxy Manager'ın en yaygın kullanımıdır.
-

frontend/src/locale/src/HelpDoc/tr/RedirectionHosts.md

@@ -1,8 +0,0 @@
-## Yönlendirme Host'u Nedir?
-
-Yönlendirme Host'u, gelen alan adından gelen istekleri yönlendirir ve
-görüntüleyiciyi başka bir alan adına yönlendirir.
-
-Bu tür bir host kullanmanın en yaygın nedeni, web sitenizin alan adı değiştiğinde
-ancak hala eski alan adına işaret eden arama motoru veya referans bağlantılarınız olduğunda ortaya çıkar.
-

frontend/src/locale/src/HelpDoc/tr/Streams.md

@@ -1,7 +0,0 @@
-## Akış Nedir?
-
-Nginx için nispeten yeni bir özellik olan Akış, TCP/UDP
-trafiğini doğrudan ağdaki başka bir bilgisayara iletmek için hizmet edecektir.
-
-Oyun sunucuları, FTP veya SSH sunucuları çalıştırıyorsanız bu işinize yarayabilir.
-

frontend/src/locale/src/HelpDoc/tr/index.ts

@@ -1,7 +0,0 @@
-export * as AccessLists from "./AccessLists.md";
-export * as Certificates from "./Certificates.md";
-export * as DeadHosts from "./DeadHosts.md";
-export * as ProxyHosts from "./ProxyHosts.md";
-export * as RedirectionHosts from "./RedirectionHosts.md";
-export * as Streams from "./Streams.md";
-

frontend/src/locale/src/bg.json

@@ -170,18 +170,6 @@
 	"certificates.http.warning": {
 		"defaultMessage": "Тези домейни трябва вече да сочат към тази инсталация."
 	},
-	"certificates.key-type": {
-		"defaultMessage": "Тип ключ"
-	},
-	"certificates.key-type-description": {
-		"defaultMessage": "RSA е широко съвместим, ECDSA е по-бърз и по-сигурен, но може да не се поддържа от по-стари системи"
-	},
-	"certificates.key-type-ecdsa": {
-		"defaultMessage": "ECDSA 256"
-	},
-	"certificates.key-type-rsa": {
-		"defaultMessage": "RSA 2048"
-	},
 	"certificates.request.subtitle": {
 		"defaultMessage": "с Let's Encrypt"
 	},

frontend/src/locale/src/de.json

@@ -30,13 +30,13 @@
 		"defaultMessage": "{users} {users, plural, one {User} other {Users}}, {rules} {rules, plural, one {Regel} other {Regeln}} - Erstellt: {date}"
 	},
 	"access-lists": {
-		"defaultMessage": "Zugriffslisten"
+		"defaultMessage": "Zugrifflisten"
 	},
 	"action.add": {
 		"defaultMessage": "Hinzufügen"
 	},
 	"action.add-location": {
-		"defaultMessage": "Pfad hinzufügen"
+		"defaultMessage": "Pfad Hinzufügen"
 	},
 	"action.close": {
 		"defaultMessage": "Schließen"
@@ -60,13 +60,13 @@
 		"defaultMessage": "Berechtigungen"
 	},
 	"action.renew": {
-		"defaultMessage": "Erneuern"
+		"defaultMessage": "Erneuert"
 	},
 	"action.view-details": {
-		"defaultMessage": "Details anzeigen"
+		"defaultMessage": "Details"
 	},
 	"auditlogs": {
-		"defaultMessage": "Protokolle"
+		"defaultMessage": "Protokoll"
 	},
 	"cancel": {
 		"defaultMessage": "Abbrechen"
@@ -81,7 +81,7 @@
 		"defaultMessage": "Privater Schlüssel"
 	},
 	"certificate.custom-intermediate": {
-		"defaultMessage": "Zwischenzertifikat"
+		"defaultMessage": "Zwischen Zertifikat"
 	},
 	"certificate.in-use": {
 		"defaultMessage": "In Benutzung"
@@ -120,7 +120,7 @@
 		"defaultMessage": "Diese Daten werden als Klartext in der Datenbank und in einer Datei gespeichert!"
 	},
 	"certificates.dns.propagation-seconds": {
-		"defaultMessage": "Wartezeit in Sekunden"
+		"defaultMessage": "Wartzeit in Sekunden"
 	},
 	"certificates.dns.propagation-seconds-note": {
 		"defaultMessage": "Leer lassen um die Standardwartezeit des Plugins zu nutzen"
@@ -150,23 +150,11 @@
 		"defaultMessage": "Unter dieser Domain wurde ein Server gefunden, der jedoch unerwartete Daten zurückgegeben hat. Handelt es sich um den NPM-Server? Bitte stellen Sie sicher, dass Ihre Domain auf die IP-Adresse verweist, unter der Ihre NPM-Instanz ausgeführt wird."
 	},
 	"certificates.http.test-results": {
-		"defaultMessage": "Testergebnisse"
+		"defaultMessage": "Test Ergeniss"
 	},
 	"certificates.http.warning": {
 		"defaultMessage": "Diese Domänen müssen bereits so konfiguriert sein, dass sie auf diese Installation verweisen."
 	},
-	"certificates.key-type": {
-		"defaultMessage": "Schlüsseltyp"
-	},
-	"certificates.key-type-description": {
-		"defaultMessage": "RSA ist weit verbreitet, ECDSA ist schneller und sicherer, wird aber möglicherweise von älteren Systemen nicht unterstützt"
-	},
-	"certificates.key-type-ecdsa": {
-		"defaultMessage": "ECDSA 256"
-	},
-	"certificates.key-type-rsa": {
-		"defaultMessage": "RSA 2048"
-	},
 	"certificates.request.subtitle": {
 		"defaultMessage": "Über Let's Encrypt"
 	},
@@ -183,7 +171,7 @@
 		"defaultMessage": "Genehmigungen"
 	},
 	"column.custom-locations": {
-		"defaultMessage": "Benutzerdefinierte Pfade"
+		"defaultMessage": "Benutzerdefinierte Pfad"
 	},
 	"column.destination": {
 		"defaultMessage": "Ziel"
@@ -192,7 +180,7 @@
 		"defaultMessage": "Details"
 	},
 	"column.email": {
-		"defaultMessage": "E-Mail"
+		"defaultMessage": "Email"
 	},
 	"column.event": {
 		"defaultMessage": "Ereignis"
@@ -291,7 +279,7 @@
 		"defaultMessage": "Nutze DNS Challenge"
 	},
 	"email-address": {
-		"defaultMessage": "E-Mail-Adresse"
+		"defaultMessage": "Email Addresse"
 	},
 	"empty-search": {
 		"defaultMessage": "Keine Ergebnisse gefunden"
@@ -384,7 +372,7 @@
 		"defaultMessage": "Laden…"
 	},
 	"login.title": {
-		"defaultMessage": "Anmelden"
+		"defaultMessage": "Account Login"
 	},
 	"nginx-config.label": {
 		"defaultMessage": "Benutzerdefinierte Nginx Konfiguration"
@@ -399,7 +387,7 @@
 		"defaultMessage": "Take me home"
 	},
 	"notfound.content": {
-		"defaultMessage": "Es tut uns leid, aber die gesuchte Seite wurde nicht gefunden"
+		"defaultMessage": "We are sorry but the page you are looking for was not found"
 	},
 	"notfound.title": {
 		"defaultMessage": "Oops… You just found an error page"
@@ -495,7 +483,7 @@
 		"defaultMessage": "Alle Elemente"
 	},
 	"permissions.visibility.title": {
-		"defaultMessage": "Objektsichtbarkeit"
+		"defaultMessage": "Objekt Sichtbarkeit"
 	},
 	"permissions.visibility.user": {
 		"defaultMessage": "Nur erstellte Elemente"
@@ -534,7 +522,7 @@
 		"defaultMessage": "Administrator"
 	},
 	"role.standard-user": {
-		"defaultMessage": "Standardbenutzer"
+		"defaultMessage": "Standard User"
 	},
 	"save": {
 		"defaultMessage": "Speichern"
@@ -546,7 +534,7 @@
 		"defaultMessage": "Einstellungen"
 	},
 	"settings.default-site": {
-		"defaultMessage": "Standardseite"
+		"defaultMessage": "Standard Seite"
 	},
 	"settings.default-site.404": {
 		"defaultMessage": "404 Page"
@@ -579,7 +567,7 @@
 		"defaultMessage": "Login"
 	},
 	"ssl-certificate": {
-		"defaultMessage": "SSL-Zertifikate"
+		"defaultMessage": "SSL Zertifikate"
 	},
 	"stream": {
 		"defaultMessage": "Stream"
@@ -645,7 +633,7 @@
 		"defaultMessage": "Zum Dark Mode wechseln"
 	},
 	"user.switch-light": {
-		"defaultMessage": "Zum Light Mode wechseln"
+		"defaultMessage": "Zum Light Mode wechslen"
 	},
 	"username": {
 		"defaultMessage": "Benutzername"