Merge remote-tracking branch 'origin/2fa' into mfa

This commit is contained in:
Tuan Dang
2023-02-11 16:08:13 +07:00
9 changed files with 184 additions and 8 deletions
+3
View File
@@ -54,6 +54,9 @@ export default function Login() {
* This function check if the user entered the correct credentials and should be allowed to log in.
*/
const loginCheck = async () => {
// #TODO: IF 2FA IS ENABLED REDIRECT TO <2FASTEP /> AND 'return;'
if (!email || !password) {
return;
}
@@ -14,6 +14,7 @@ import passwordCheck from '@app/components/utilities/checks/PasswordCheck';
import changePassword from '@app/components/utilities/cryptography/changePassword';
import issueBackupKey from '@app/components/utilities/cryptography/issueBackupKey';
import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps';
import { SecuritySection } from '@app/views/Settings/PersonalSettingsPage/SecuritySection/SecuritySection';
import AddApiKeyDialog from '../../../components/basic/dialog/AddApiKeyDialog';
import getAPIKeys from '../../api/apiKey/getAPIKeys';
@@ -100,6 +101,10 @@ export default function PersonalSettings() {
/>
</div>
</div>
<SecuritySection
isTwoFAEnabled
onIsTwoFAEnabledChange={(value: boolean) => console.log(value)}
/>
<div className="bg-white/5 rounded-md px-6 flex flex-col items-start w-full mt-2 mb-8 pt-2">
<div className="flex flex-row justify-between w-full">
<div className="flex flex-col w-full">