Refactor code

src/ui/routes/AccountSettingsRoute.tsx

@@ -21,11 +21,8 @@ import {
 import { Delete } from "@material-ui/icons";
 import React from "react";
 import { useParams } from "react-router-dom";
-import {
-	AccountHelper,
-	AdminAccount,
-	AdminAccountKey,
-} from "../../helpers/AccountHelper";
+import { AccountHelper, AdminAccount } from "../../helpers/AccountHelper";
+import { AdminAccountKey, AdminKeyHelper } from "../../helpers/AdminKeyHelper";
 import { CopyToClipboard } from "../../utils/ClipboardUtils";
 import { AsyncWidget } from "../widgets/AsyncWidget";
 import {
@@ -199,7 +196,7 @@ export class KeySettingsSection extends React.Component<
 	}
 
 	async load() {
-		const keys = await AccountHelper.GetAdminKeys(this.props.admin.id);
+		const keys = await AdminKeyHelper.GetAdminKeys(this.props.admin.id);
 
 		this.setState({ keys: keys });
 	}
@@ -227,7 +224,8 @@ export class KeySettingsSection extends React.Component<
 
 	async registerNewKey() {
 		try {
-			const challenge = await AccountHelper.GetKeyRegistrationChallenge();
+			const challenge =
+				await AdminKeyHelper.GetKeyRegistrationChallenge();
 			const credential = await navigator.credentials.create(challenge);
 
 			if (credential == null) throw new Error("Operation aborted!");
@@ -238,7 +236,7 @@ export class KeySettingsSection extends React.Component<
 				minLength: 2,
 			});
 
-			await AccountHelper.RegisterKey(name, credential);
+			await AdminKeyHelper.RegisterKey(name, credential);
 
 			snackbar("Successfully enrolled a new key!");
 
@@ -258,7 +256,7 @@ export class KeySettingsSection extends React.Component<
 			)
 				return;
 
-			await AccountHelper.DeleteAuthKey(this.props.admin.id, key.id);
+			await AdminKeyHelper.DeleteAuthKey(this.props.admin.id, key.id);
 
 			snackbar("The key was successfully deleted!");
 			this.setState({ counter: this.state.counter + 1 });

src/ui/routes/LoginRoute.tsx

@@ -21,11 +21,8 @@ import {
 import { ErrorOutline, Lock, VpnKey } from "@material-ui/icons";
 import LockOutlinedIcon from "@material-ui/icons/LockOutlined";
 import React from "react";
-import {
-	AccountHelper,
-	AuthKey,
-	AuthOptions,
-} from "../../helpers/AccountHelper";
+import { AccountHelper, AuthOptions } from "../../helpers/AccountHelper";
+import { AdminKeyHelper, AuthKey } from "../../helpers/AdminKeyHelper";
 import { input, matAlert } from "../widgets/DialogsProvider";
 
 function ErrorGettingOptions(p: { message: string }) {
@@ -244,14 +241,14 @@ class AuthOptionsWidget extends React.Component<
 
 	async loginWithSecurityKey(key: AuthKey) {
 		try {
-			const challenge = await AccountHelper.GetAuthenticationChallenge(
+			const challenge = await AdminKeyHelper.GetAuthenticationChallenge(
 				this.props.email,
 				key
 			);
 
 			const result = await navigator.credentials.get(challenge);
 
-			await AccountHelper.AuthenticateWithKey(
+			await AdminKeyHelper.AuthenticateWithKey(
 				this.props.email,
 				key,
 				result
@@ -267,7 +264,7 @@ class AuthOptionsWidget extends React.Component<
 	render() {
 		// Check if no option is available
 		if (
-			this.props.options.keys.length == 0 &&
+			this.props.options.keys.length === 0 &&
 			!this.props.options.reset_token
 		)
 			return (

src/ui/routes/MainRoute.tsx

@@ -12,7 +12,6 @@ import {
 	ListItemIcon,
 	ListItemText,
 	makeStyles,
-	MenuItem,
 	Paper,
 	Toolbar,
 	Typography,