fix(cert): update revoke logic #1179

Author: 0xJacky

.github/workflows/build.yml

@@ -291,6 +291,7 @@ jobs:
         with:
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
           apiToken: ${{ secrets.CF_R2_API_TOKEN }}
+          wranglerVersion: "4.21.1"
           command: |
             r2 object put nginx-ui-dev-build/${{ env.DIST }}.tar.gz --file ./${{ env.DIST }}.tar.gz
             r2 object put nginx-ui-dev-build/${{ env.DIST }}.tar.gz.digest --file ./${{ env.DIST }}.tar.gz.digest

api/certificate/revoke.go

@@ -85,8 +85,9 @@ func RevokeCert(c *gin.Context) {
 	logChan := make(chan string, 1)
 	errChan := make(chan error, 1)
 
-	certLogger := &cert.Logger{}
+	certLogger := cert.NewLogger()
 	certLogger.SetWebSocket(ws)
+	defer certLogger.Close()
 
 	go cert.RevokeCert(payload, certLogger, logChan, errChan)
 
@@ -105,7 +106,6 @@ func RevokeCert(c *gin.Context) {
 			logger.Error(err)
 			return
 		}
-		return
 	}
 
 	// Update certificate status in database

app/src/views/certificate/CertificateList/Certificate.vue

@@ -50,6 +50,7 @@ const { processingStatus } = storeToRefs(globalStore)
       <template #afterActions="{ record }">
         <RemoveCert
           :id="record.id"
+          :disabled="processingStatus.auto_cert_processing"
           @removed="() => refTable.refresh()"
         />
       </template>

app/src/views/certificate/components/RemoveCert.vue

@@ -5,6 +5,7 @@ import websocket from '@/lib/websocket'
 
 const props = defineProps<{
   id: number
+  disabled?: boolean
 }>()
 
 const emit = defineEmits(['removed'])
@@ -83,6 +84,7 @@ function handleCancel() {
       type="link"
       size="small"
       danger
+      :disabled
       @click="handleDelete"
     >
       {{ $gettext('Delete') }}