From f3355eda4fa471d7718eaed9b0e6e1b6aecd8c89 Mon Sep 17 00:00:00 2001
From: Jacky <me@jackyu.cn>
Date: Mon, 16 Sep 2024 23:56:37 +0800
Subject: [PATCH] fix(modify-cert): renewing a cert with dns01 challenge cannot
 find solver

---
 app/components.d.ts                                 | 1 +
 app/src/components/{2FA => TwoFA}/Authorization.vue | 0
 app/src/components/{2FA => TwoFA}/use2FAModal.ts    | 2 +-
 app/src/lib/http/index.ts                           | 2 +-
 app/src/views/certificate/CertificateEditor.vue     | 2 ++
 app/src/views/config/components/Mkdir.vue           | 2 +-
 app/src/views/config/components/Rename.vue          | 2 +-
 app/src/views/other/Login.vue                       | 2 +-
 app/src/views/preference/Preference.vue             | 2 +-
 app/src/views/pty/Terminal.vue                      | 2 +-
 10 files changed, 10 insertions(+), 7 deletions(-)
 rename app/src/components/{2FA => TwoFA}/Authorization.vue (100%)
 rename app/src/components/{2FA => TwoFA}/use2FAModal.ts (97%)

diff --git a/app/components.d.ts b/app/components.d.ts
index f6e12d60..29ea04d3 100644
--- a/app/components.d.ts
+++ b/app/components.d.ts
@@ -100,6 +100,7 @@ declare module 'vue' {
     SwitchAppearanceIconsVPIconMoon: typeof import('./src/components/SwitchAppearance/icons/VPIconMoon.vue')['default']
     SwitchAppearanceIconsVPIconSun: typeof import('./src/components/SwitchAppearance/icons/VPIconSun.vue')['default']
     SwitchAppearanceSwitchAppearance: typeof import('./src/components/SwitchAppearance/SwitchAppearance.vue')['default']
+    TwoFAAuthorization: typeof import('./src/components/TwoFA/Authorization.vue')['default']
     VPSwitchVPSwitch: typeof import('./src/components/VPSwitch/VPSwitch.vue')['default']
   }
 }
diff --git a/app/src/components/2FA/Authorization.vue b/app/src/components/TwoFA/Authorization.vue
similarity index 100%
rename from app/src/components/2FA/Authorization.vue
rename to app/src/components/TwoFA/Authorization.vue
diff --git a/app/src/components/2FA/use2FAModal.ts b/app/src/components/TwoFA/use2FAModal.ts
similarity index 97%
rename from app/src/components/2FA/use2FAModal.ts
rename to app/src/components/TwoFA/use2FAModal.ts
index c75dd867..c6be576e 100644
--- a/app/src/components/2FA/use2FAModal.ts
+++ b/app/src/components/TwoFA/use2FAModal.ts
@@ -1,7 +1,7 @@
 import { createVNode, render } from 'vue'
 import { Modal, message } from 'ant-design-vue'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import Authorization from '@/components/2FA/Authorization.vue'
+import Authorization from '@/components/TwoFA/Authorization.vue'
 import twoFA from '@/api/2fa'
 import { useUserStore } from '@/pinia'
 
diff --git a/app/src/lib/http/index.ts b/app/src/lib/http/index.ts
index ce4c67a5..3543319c 100644
--- a/app/src/lib/http/index.ts
+++ b/app/src/lib/http/index.ts
@@ -7,7 +7,7 @@ import { useSettingsStore, useUserStore } from '@/pinia'
 import 'nprogress/nprogress.css'
 
 import router from '@/routes'
-import use2FAModal from '@/components/2FA/use2FAModal'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
 
 const user = useUserStore()
 const settings = useSettingsStore()
diff --git a/app/src/views/certificate/CertificateEditor.vue b/app/src/views/certificate/CertificateEditor.vue
index 09fdd2ec..bdb7e190 100644
--- a/app/src/views/certificate/CertificateEditor.vue
+++ b/app/src/views/certificate/CertificateEditor.vue
@@ -133,6 +133,8 @@ const isManaged = computed(() => {
               name: data.name,
               domains: data.domains,
               key_type: data.key_type,
+              challenge_method: data.challenge_method,
+              dns_credential_id: data.dns_credential_id,
             }"
             @renewed="init"
           />
diff --git a/app/src/views/config/components/Mkdir.vue b/app/src/views/config/components/Mkdir.vue
index bb8ce374..42158b32 100644
--- a/app/src/views/config/components/Mkdir.vue
+++ b/app/src/views/config/components/Mkdir.vue
@@ -2,7 +2,7 @@
 
 import { message } from 'ant-design-vue'
 import config from '@/api/config'
-import use2FAModal from '@/components/2FA/use2FAModal'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
 
 const emit = defineEmits(['created'])
 const visible = ref(false)
diff --git a/app/src/views/config/components/Rename.vue b/app/src/views/config/components/Rename.vue
index 6946a140..6a47eff1 100644
--- a/app/src/views/config/components/Rename.vue
+++ b/app/src/views/config/components/Rename.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { message } from 'ant-design-vue'
 import config from '@/api/config'
-import use2FAModal from '@/components/2FA/use2FAModal'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
 import NodeSelector from '@/components/NodeSelector/NodeSelector.vue'
 
 const emit = defineEmits(['renamed'])
diff --git a/app/src/views/other/Login.vue b/app/src/views/other/Login.vue
index e5b64df5..e1619b39 100644
--- a/app/src/views/other/Login.vue
+++ b/app/src/views/other/Login.vue
@@ -8,7 +8,7 @@ import auth from '@/api/auth'
 import install from '@/api/install'
 import SetLanguage from '@/components/SetLanguage/SetLanguage.vue'
 import SwitchAppearance from '@/components/SwitchAppearance/SwitchAppearance.vue'
-import Authorization from '@/components/2FA/Authorization.vue'
+import Authorization from '@/components/TwoFA/Authorization.vue'
 import gettext from '@/gettext'
 import passkey from '@/api/passkey'
 
diff --git a/app/src/views/preference/Preference.vue b/app/src/views/preference/Preference.vue
index bdecce9e..3d7df56d 100644
--- a/app/src/views/preference/Preference.vue
+++ b/app/src/views/preference/Preference.vue
@@ -11,7 +11,7 @@ import type { Settings } from '@/views/preference/typedef'
 import LogrotateSettings from '@/views/preference/LogrotateSettings.vue'
 import { useSettingsStore } from '@/pinia'
 import AuthSettings from '@/views/preference/AuthSettings.vue'
-import use2FAModal from '@/components/2FA/use2FAModal'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
 
 const data = ref<Settings>({
   server: {
diff --git a/app/src/views/pty/Terminal.vue b/app/src/views/pty/Terminal.vue
index 8d02e082..db19e77a 100644
--- a/app/src/views/pty/Terminal.vue
+++ b/app/src/views/pty/Terminal.vue
@@ -4,7 +4,7 @@ import { Terminal } from '@xterm/xterm'
 import { FitAddon } from '@xterm/addon-fit'
 import _ from 'lodash'
 import ws from '@/lib/websocket'
-import use2FAModal from '@/components/2FA/use2FAModal'
+import use2FAModal from '@/components/TwoFA/use2FAModal'
 import twoFA from '@/api/2fa'
 
 let term: Terminal | null