From afd6bf4268da9ce8be446a0014960a8766168ed1 Mon Sep 17 00:00:00 2001
From: Jacky <me@jackyu.cn>
Date: Tue, 23 Jul 2024 22:22:11 +0800
Subject: [PATCH] fix: do not popup otp modal if user not enable 2fa

---
 app/src/components/OTP/useOTPModal.ts     | 9 ++++++++-
 app/src/views/preference/AuthSettings.vue | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/components/OTP/useOTPModal.ts b/app/src/components/OTP/useOTPModal.ts
index 4f2bd466..9e6e8cf3 100644
--- a/app/src/components/OTP/useOTPModal.ts
+++ b/app/src/components/OTP/useOTPModal.ts
@@ -24,7 +24,14 @@ const useOTPModal = () => {
     document.head.appendChild(style)
   }
 
-  const open = ({ onOk, onCancel }: OTPModalProps) => {
+  const open = async ({ onOk, onCancel }: OTPModalProps) => {
+    const { status } = await otp.status()
+    if (!status) {
+      onOk?.('')
+
+      return
+    }
+
     const cookies = useCookies(['nginx-ui-2fa'])
     const ssid = cookies.get('secure_session_id')
     if (ssid) {
diff --git a/app/src/views/preference/AuthSettings.vue b/app/src/views/preference/AuthSettings.vue
index d6751a85..befe0980 100644
--- a/app/src/views/preference/AuthSettings.vue
+++ b/app/src/views/preference/AuthSettings.vue
@@ -55,6 +55,8 @@ function removeBannedIP(ip: string) {
 <template>
   <div class="flex justify-center">
     <div>
+      <TOTP class="mb-4" />
+
       <AAlert
         class="mb-4"
         :message="$gettext('Tips')"
@@ -106,8 +108,6 @@ function removeBannedIP(ip: string) {
           </template>
         </ATable>
       </div>
-
-      <TOTP />
     </div>
   </div>
 </template>