From 5c943a04f09975ccd27a85ed21a90e2c2fe52c3c Mon Sep 17 00:00:00 2001 From: ytqh Date: Fri, 28 Feb 2025 20:52:52 +0800 Subject: [PATCH] Revert "add TODO" This reverts commit 2b9d590f5f0a6ec399de7a891a76b20942bafa24. --- api/controllers/console/auth/login.py | 1 - api/controllers/service_api/app/completion.py | 1 - api/controllers/service_api/wraps.py | 1 - api/extensions/ext_login.py | 5 +---- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py index c2b3c06b50..41362e9fa2 100644 --- a/api/controllers/console/auth/login.py +++ b/api/controllers/console/auth/login.py @@ -34,7 +34,6 @@ from services.errors.workspace import WorkSpaceNotAllowedCreateError from services.feature_service import FeatureService -# TODO: copy as a separate auth service api class LoginApi(Resource): """Resource for user login.""" diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py index b9f7832c85..647efc8149 100644 --- a/api/controllers/service_api/app/completion.py +++ b/api/controllers/service_api/app/completion.py @@ -1,6 +1,5 @@ import logging -from libs.login import login_required from flask_restful import Resource, reqparse # type: ignore from werkzeug.exceptions import InternalServerError, NotFound diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py index 198157c524..c746944be1 100644 --- a/api/controllers/service_api/wraps.py +++ b/api/controllers/service_api/wraps.py @@ -34,7 +34,6 @@ class FetchUserArg(BaseModel): required: bool = False -# TODO: add auth jwt token check def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optional[FetchUserArg] = None): def decorator(view_func): @wraps(view_func) diff --git a/api/extensions/ext_login.py b/api/extensions/ext_login.py index c308fe11e8..10fb89eb73 100644 --- a/api/extensions/ext_login.py +++ b/api/extensions/ext_login.py @@ -17,11 +17,8 @@ login_manager = flask_login.LoginManager() @login_manager.request_loader def load_user_from_request(request_from_flask_login): """Load user based on the request.""" - # TODO: if in the service_api, then we need to check the jwt token - - if request.blueprint not in {"console", "inner_api", "service_api", "admin_api"}: + if request.blueprint not in {"console", "inner_api"}: return None - # Check if the user_id contains a dot, indicating the old format auth_header = request.headers.get("Authorization", "") if not auth_header: