fix: error

zephyr-y · Jan 7, 2023 · 3011c99 · 3011c99
1 parent bf2ae49
commit 3011c99
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/src/api/cert.ts b/src/api/cert.ts
@@ -3,13 +3,12 @@ import { objectToCamelCase, objectToHungarian } from '@/utils/case'
 import { APIResponse } from '.'
 
 
-export type CertificateAuthority = 'digicert' | 'google' | 'lets_encrypt' | 'sectigo'
+export type CertificateAuthority = 'digicert' | 'google' | 'lets_encrypt'
 
 export const CertificateAuthorityDisplay : Record<CertificateAuthority, string> = {
     digicert: 'DigiCert',
     google: 'Google',
     lets_encrypt: 'Let\'s Encrypt',
-    sectigo: 'Sectigo'
 }
 
 export type CloudflareCertInfo = {
@@ -19,24 +18,32 @@ export type CloudflareCertInfo = {
 export async function getCertInfo(zoneId: string): Promise<APIResponse<CloudflareCertInfo>> {
     const axios = useAxios()
 
-    const response = await axios.request<any>({
-        url: `/zones/${zoneId}/ssl/universal/settings`,
-        method: 'get',
-    })
+    try {
+        const response = await axios.request<any>({
+            url: `/zones/${zoneId}/ssl/universal/settings`,
+            method: 'get',
+        })
 
-    return (objectToCamelCase(response.data) as any)
+        return (objectToCamelCase(response.data) as any)
+    } catch (err) {
+        return (objectToCamelCase(err.response.data) as any)
+    }
 }
 
 export async function patchCertAuthority(zoneId: string, authority: CertificateAuthority): Promise<APIResponse<any>> {
     const axios = useAxios()
-
-    const response = await axios.request<any>({
-        url: `/zones/${zoneId}/ssl/universal/settings`,
-        method: 'patch',
-        data: objectToHungarian({
-            certificateAuthority: authority,
+    try {
+
+        const response = await axios.request<any>({
+            url: `/zones/${zoneId}/ssl/universal/settings`,
+            method: 'patch',
+            data: objectToHungarian({
+                certificateAuthority: authority,
+            })
         })
-    })
 
-    return (objectToCamelCase(response.data) as any)
+        return (objectToCamelCase(response.data) as any)
+    } catch (err) {
+        return (objectToCamelCase(err.response.data) as any)
+    }
 }
diff --git a/src/route/zone/CertInfo.vue b/src/route/zone/CertInfo.vue
@@ -36,12 +36,12 @@ const newCertOwner = ref<CertificateAuthority>('lets_encrypt')
 async function loadInfo() {
     isLoading.value = true
 
-    try {
-        const info = await getCertInfo(props.zoneId)
+    const info = await getCertInfo(props.zoneId)
 
+    if (info.success) {
         certOwner.value = info.result!.certificateAuthority
         newCertOwner.value = info.result!.certificateAuthority
-    } catch (err) {
+    } else {
         mainStyle.value = {
             display: 'hidden'
         }