From 01006058c4fed120e6cef263c65ac6b0b50ae08a Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 7 Feb 2025 18:42:47 +0000 Subject: [PATCH] simpler `genKeys` --- .../frontend/src/pages/admin/settings.vue | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue index ed8b75f9e8..0e9c0a7d38 100644 --- a/packages/frontend/src/pages/admin/settings.vue +++ b/packages/frontend/src/pages/admin/settings.vue @@ -438,19 +438,14 @@ function chooseProxyAccount() { async function genKeys() { if (serviceWorkerForm.savedState.swPrivateKey) { - os.confirm({ type: 'warning', title: i18n.ts._genKeysDialog.title, text: i18n.ts._genKeysDialog.text }).then(result => { - if (result.canceled) return; - os.apiWithDialog('admin/gen-vapid-keys', {}).then(res => { - serviceWorkerForm.state.swPublicKey = res.public; - serviceWorkerForm.state.swPrivateKey = res.private; - }); - }); - } else { - os.apiWithDialog('admin/gen-vapid-keys', {}).then(res => { - serviceWorkerForm.state.swPublicKey = res.public; - serviceWorkerForm.state.swPrivateKey = res.private; - }); + const result = await os.confirm({ type: 'warning', title: i18n.ts._genKeysDialog.title, text: i18n.ts._genKeysDialog.text }); + if (result.canceled) return; } + + const keys = await os.apiWithDialog('admin/gen-vapid-keys', {}); + + serviceWorkerForm.state.swPublicKey = keys.public; + serviceWorkerForm.state.swPrivateKey = keys.private; } const headerTabs = computed(() => []);