Merge branch 'dev' into feat/encrypt-request

This commit is contained in:
Jacky 2025-02-07 21:10:27 +08:00
commit c5bd8cc580
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D

View file

@ -13,7 +13,6 @@ const resetting = ref(false)
const qrCode = ref('') const qrCode = ref('')
const secret = ref('') const secret = ref('')
const passcode = ref('') const passcode = ref('')
const interval = shallowRef<undefined | ReturnType<typeof setTimeout>>()
const refOtp = useTemplateRef('refOtp') const refOtp = useTemplateRef('refOtp')
const recoveryCode = ref('') const recoveryCode = ref('')
const inputRecoveryCode = ref('') const inputRecoveryCode = ref('')
@ -21,18 +20,6 @@ const inputRecoveryCode = ref('')
function clickEnable2FA() { function clickEnable2FA() {
enrolling.value = true enrolling.value = true
generateSecret() generateSecret()
interval.value = setInterval(() => {
if (enrolling.value)
generateSecret()
else
clearGenerateSecretInterval()
}, 30 * 1000)
}
function clearGenerateSecretInterval() {
if (interval.value) {
clearInterval(interval.value)
}
} }
function generateSecret() { function generateSecret() {
@ -47,7 +34,6 @@ function enroll(code: string) {
otp.enroll_otp(secret.value, code).then(r => { otp.enroll_otp(secret.value, code).then(r => {
enrolling.value = false enrolling.value = false
recoveryCode.value = r.recovery_code recoveryCode.value = r.recovery_code
clearGenerateSecretInterval()
get2FAStatus() get2FAStatus()
message.success($gettext('Enable 2FA successfully')) message.success($gettext('Enable 2FA successfully'))
}).catch(() => { }).catch(() => {
@ -63,8 +49,6 @@ function get2FAStatus() {
get2FAStatus() get2FAStatus()
onUnmounted(clearGenerateSecretInterval)
function clickReset2FA() { function clickReset2FA() {
resetting.value = true resetting.value = true
inputRecoveryCode.value = '' inputRecoveryCode.value = ''