From 40f8a5e7553b4bddef3a494a38460b9ad61324eb Mon Sep 17 00:00:00 2001 From: Harry Date: Tue, 16 Dec 2025 18:10:49 +0800 Subject: [PATCH] refactor: enhance credential handling in TriggerProviderService - Renamed variable for clarity in the trigger provider encryption process. - Improved the decryption and masking of credentials, properties, and parameters for subscriptions, ensuring consistent handling across all fields. - Streamlined the creation of encrypters for both credentials and properties, enhancing code readability and maintainability. --- .../trigger/trigger_provider_service.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/api/services/trigger/trigger_provider_service.py b/api/services/trigger/trigger_provider_service.py index d2ad7b9251..791cd74129 100644 --- a/api/services/trigger/trigger_provider_service.py +++ b/api/services/trigger/trigger_provider_service.py @@ -94,16 +94,25 @@ class TriggerProviderService: provider_controller = TriggerManager.get_trigger_provider(tenant_id, provider_id) for subscription in subscriptions: - encrypter, _ = create_trigger_provider_encrypter_for_subscription( + credential_encrypter, _ = create_trigger_provider_encrypter_for_subscription( tenant_id=tenant_id, controller=provider_controller, subscription=subscription, ) subscription.credentials = dict( - encrypter.mask_credentials(dict(encrypter.decrypt(subscription.credentials))) + credential_encrypter.mask_credentials(dict(credential_encrypter.decrypt(subscription.credentials))) + ) + properties_encrypter, _ = create_trigger_provider_encrypter_for_properties( + tenant_id=tenant_id, + controller=provider_controller, + subscription=subscription, + ) + subscription.properties = dict( + properties_encrypter.mask_credentials(dict(properties_encrypter.decrypt(subscription.properties))) + ) + subscription.parameters = dict( + credential_encrypter.mask_credentials(dict(credential_encrypter.decrypt(subscription.parameters))) ) - subscription.properties = dict(encrypter.mask_credentials(dict(encrypter.decrypt(subscription.properties)))) - subscription.parameters = dict(encrypter.mask_credentials(dict(encrypter.decrypt(subscription.parameters)))) count = workflows_in_use_map.get(subscription.id) subscription.workflows_in_use = count if count is not None else 0