diff --git a/api/controllers/console/__init__.py b/api/controllers/console/__init__.py index facdcac6db..88841fa57e 100644 --- a/api/controllers/console/__init__.py +++ b/api/controllers/console/__init__.py @@ -181,5 +181,6 @@ from .workspace import ( models, plugin, tool_providers, + trigger_providers, workspace, ) diff --git a/api/controllers/console/workspace/trigger_providers.py b/api/controllers/console/workspace/trigger_providers.py index 781e0bc0f6..53096ff867 100644 --- a/api/controllers/console/workspace/trigger_providers.py +++ b/api/controllers/console/workspace/trigger_providers.py @@ -32,7 +32,7 @@ class TriggerProviderListApi(Resource): return jsonable_encoder(TriggerProviderService.list_trigger_providers(user.current_tenant_id)) -class TriggerProviderSubscriptionListApi(Resource): +class TriggerSubscriptionListApi(Resource): @setup_required @login_required @account_initialization_required @@ -144,7 +144,7 @@ class TriggerSubscriptionBuilderBuildApi(Resource): raise -class TriggerSubscriptionsDeleteApi(Resource): +class TriggerSubscriptionDeleteApi(Resource): @setup_required @login_required @account_initialization_required @@ -297,32 +297,6 @@ class TriggerOAuthCallbackApi(Resource): return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback?subscription_id={subscription_builder.id}") -class TriggerOAuthRefreshTokenApi(Resource): - @setup_required - @login_required - @account_initialization_required - def post(self, subscription_id): - """Refresh OAuth token for a trigger provider subscription""" - user = current_user - assert isinstance(user, Account) - assert user.current_tenant_id is not None - if not user.is_admin_or_owner: - raise Forbidden() - - try: - result = TriggerProviderService.refresh_oauth_token( - tenant_id=user.current_tenant_id, - subscription_id=subscription_id, - ) - return result - - except ValueError as e: - raise BadRequest(str(e)) - except Exception as e: - logger.exception("Error refreshing OAuth token", exc_info=e) - raise - - class TriggerOAuthClientManageApi(Resource): @setup_required @login_required @@ -423,33 +397,32 @@ class TriggerOAuthClientManageApi(Resource): raise -# Trigger provider endpoints +# Trigger Subscription api.add_resource(TriggerProviderListApi, "/workspaces/current/trigger-providers") -api.add_resource(TriggerProviderSubscriptionListApi, "/workspaces/current/trigger-provider//list") +api.add_resource(TriggerSubscriptionListApi, "/workspaces/current/trigger-provider//subscriptions/list") +api.add_resource( + TriggerSubscriptionDeleteApi, + "/workspaces/current/trigger-provider//subscriptions/delete", +) + +# Trigger Subscription Builder api.add_resource( TriggerSubscriptionBuilderCreateApi, - "/workspaces/current/trigger-provider/subscriptions//create-builder", + "/workspaces/current/trigger-provider//subscriptions/builder/create", ) api.add_resource( TriggerSubscriptionBuilderVerifyApi, - "/workspaces/current/trigger-provider/subscriptions//verify/", + "/workspaces/current/trigger-provider//subscriptions/builder/verify/", ) api.add_resource( TriggerSubscriptionBuilderBuildApi, - "/workspaces/current/trigger-provider/subscriptions//build/", -) -api.add_resource( - TriggerSubscriptionsDeleteApi, - "/workspaces/current/trigger-provider/subscriptions//delete", + "/workspaces/current/trigger-provider//subscriptions/builder/build/", ) + # OAuth api.add_resource( - TriggerOAuthAuthorizeApi, "/workspaces/current/trigger-provider/subscriptions//oauth/authorize" + TriggerOAuthAuthorizeApi, "/workspaces/current/trigger-provider//subscriptions/oauth/authorize" ) api.add_resource(TriggerOAuthCallbackApi, "/oauth/plugin//trigger/callback") -api.add_resource( - TriggerOAuthRefreshTokenApi, - "/workspaces/current/trigger-provider/subscriptions//oauth/refresh", -) api.add_resource(TriggerOAuthClientManageApi, "/workspaces/current/trigger-provider//oauth/client") diff --git a/api/core/plugin/utils/http_parser.py b/api/core/plugin/utils/http_parser.py index b4d59a58a2..9ec781360d 100644 --- a/api/core/plugin/utils/http_parser.py +++ b/api/core/plugin/utils/http_parser.py @@ -150,9 +150,7 @@ def deserialize_response(raw_data: bytes) -> Response: if len(parts) < 2: raise ValueError(f"Invalid status line: {status_line}") - protocol = parts[0] status_code = int(parts[1]) - status_text = parts[2] if len(parts) > 2 else "OK" # Parse headers headers: dict[str, Any] = {}