From fdaeec7f7d4bbe76fea73be7bb71bb1d6bddf8de Mon Sep 17 00:00:00 2001
From: Maries <xh001x@hotmail.com>
Date: Wed, 24 Dec 2025 20:23:52 +0800
Subject: [PATCH] fix: trigger subscription delete not working for
 non-auto-created credentials (#30122)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../trigger/trigger_provider_service.py       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/api/services/trigger/trigger_provider_service.py b/api/services/trigger/trigger_provider_service.py
index 71f35dada6..57de9b3cee 100644
--- a/api/services/trigger/trigger_provider_service.py
+++ b/api/services/trigger/trigger_provider_service.py
@@ -359,10 +359,6 @@ class TriggerProviderService:
             raise ValueError(f"Trigger provider subscription {subscription_id} not found")
 
         credential_type: CredentialType = CredentialType.of(subscription.credential_type)
-        is_auto_created: bool = credential_type in [CredentialType.OAUTH2, CredentialType.API_KEY]
-        if not is_auto_created:
-            return None
-
         provider_id = TriggerProviderID(subscription.provider_id)
         provider_controller: PluginTriggerProviderController = TriggerManager.get_trigger_provider(
             tenant_id=tenant_id, provider_id=provider_id
@@ -372,17 +368,20 @@ class TriggerProviderService:
             controller=provider_controller,
             subscription=subscription,
         )
-        try:
-            TriggerManager.unsubscribe_trigger(
-                tenant_id=tenant_id,
-                user_id=subscription.user_id,
-                provider_id=provider_id,
-                subscription=subscription.to_entity(),
-                credentials=encrypter.decrypt(subscription.credentials),
-                credential_type=credential_type,
-            )
-        except Exception as e:
-            logger.exception("Error unsubscribing trigger", exc_info=e)
+
+        is_auto_created: bool = credential_type in [CredentialType.OAUTH2, CredentialType.API_KEY]
+        if is_auto_created:
+            try:
+                TriggerManager.unsubscribe_trigger(
+                    tenant_id=tenant_id,
+                    user_id=subscription.user_id,
+                    provider_id=provider_id,
+                    subscription=subscription.to_entity(),
+                    credentials=encrypter.decrypt(subscription.credentials),
+                    credential_type=credential_type,
+                )
+            except Exception as e:
+                logger.exception("Error unsubscribing trigger", exc_info=e)
 
         session.delete(subscription)
         # Clear cache