From 9c83347162879b3eb7b6020989f843186bfa1fb1 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Sat, 18 May 2024 08:42:59 -0700 Subject: [PATCH] fix lint warnings --- net/web/src/access/login/Login.jsx | 4 ++-- net/web/src/access/login/useLogin.hook.js | 5 +++-- .../account/profile/accountAccess/AccountAccess.jsx | 12 +++++------- .../profile/accountAccess/useAccountAccess.hook.js | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/net/web/src/access/login/Login.jsx b/net/web/src/access/login/Login.jsx index 0d80f446..9780cc01 100644 --- a/net/web/src/access/login/Login.jsx +++ b/net/web/src/access/login/Login.jsx @@ -81,10 +81,10 @@ console.log(state.mfaError);
{state.strings.mfaEnter}
- { state.mfaError == 'Error: 403' && ( + { state.mfaError === '403' && ( {state.strings.mfaError} )} - { state.mfaError == 'Error: 429' && ( + { state.mfaError === '429' && ( {state.strings.mfaDisabled} )}
diff --git a/net/web/src/access/login/useLogin.hook.js b/net/web/src/access/login/useLogin.hook.js index c6457b08..55b9364f 100644 --- a/net/web/src/access/login/useLogin.hook.js +++ b/net/web/src/access/login/useLogin.hook.js @@ -52,8 +52,9 @@ export function useLogin() { await app.actions.login(state.username, state.password, state.mfaCode) } catch (err) { - if (err == 'Error: 405' || err == 'Error: 403' || err == 'Error: 429') { - updateState({ busy: false, mfaModal: true, mfaError: err.toString() }); + const msg = err?.message; + if (msg === '405' || msg === '403' || msg === '429') { + updateState({ busy: false, mfaModal: true, mfaError: msg }); } else { console.log(err); diff --git a/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx b/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx index 44be05eb..8eb1e6a7 100644 --- a/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx +++ b/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx @@ -1,9 +1,7 @@ import { AccountAccessWrapper, LoginModal, MFAModal, SealModal, LogoutContent } from './AccountAccess.styled'; import { useAccountAccess } from './useAccountAccess.hook'; -import { Button, Modal, Switch, Input, Radio, Select, Flex, Typography } from 'antd'; -import type { GetProp } from 'antd'; -import type { OTPProps } from 'antd/es/input/OTP'; -import { LogoutOutlined, SettingOutlined, UserOutlined, LockOutlined, ExclamationCircleOutlined, KeyOutlined } from '@ant-design/icons'; +import { Button, Modal, Switch, Input, Radio, Select } from 'antd'; +import { LogoutOutlined, SettingOutlined, UserOutlined, LockOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; import { CopyButton } from '../../../../copyButton/CopyButton'; import { useRef } from 'react'; @@ -110,7 +108,7 @@ export function AccountAccess() {
enableMFA(enable)} />
-
Multi-Factor Authentication
+
{state.strings.mfaTitle}
@@ -277,10 +275,10 @@ export function AccountAccess() {
- { state.mfaError && state.mfaErrorCode == 'Error: 401' && ( + { state.mfaError && state.mfaErrorCode === '401' && ( {state.strings.mfaError} )} - { state.mfaError && state.mfaErrorCode == 'Error: 429' && ( + { state.mfaError && state.mfaErrorCode === '429' && ( {state.strings.mfaDisabled} )}
diff --git a/net/web/src/session/account/profile/accountAccess/useAccountAccess.hook.js b/net/web/src/session/account/profile/accountAccess/useAccountAccess.hook.js index 7ecab194..35b03fa4 100644 --- a/net/web/src/session/account/profile/accountAccess/useAccountAccess.hook.js +++ b/net/web/src/session/account/profile/accountAccess/useAccountAccess.hook.js @@ -354,8 +354,8 @@ export function useAccountAccess() { updateState({ busy: false, mfaModal: false }); } catch (err) { - console.log("error code: ", err); - updateState({ busy: false, mfaError: true, mfaErrorCode: err }); + const msg = err?.message; + updateState({ busy: false, mfaError: true, mfaErrorCode: msg }); throw new Error('failed to confirm mfa'); } }