opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-13 08:57:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: mypy error

Browse Source
This commit is contained in:
Junyan Qin 2025-08-20 20:20:18 +08:00
parent 2c3859f39a
commit bdf70cc45a
No known key found for this signature in database
GPG Key ID: 22FE3AFADC710CEB
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
api/controllers/console/auth/oauth_server.py
View File

@ -21,8 +21,8 @@ def oauth_server_client_id_required(view):
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument("client_id", type=str, required=True, location="json") parser.add_argument("client_id", type=str, required=True, location="json")
args = parser.parse_args() parsed_args = parser.parse_args()
client_id = args.get("client_id") client_id = parsed_args.get("client_id")
if not client_id: if not client_id:
raise BadRequest("client_id is required") raise BadRequest("client_id is required")
@ -40,18 +40,26 @@ def oauth_server_client_id_required(view):
def oauth_server_access_token_required(view): def oauth_server_access_token_required(view):
@wraps(view) @wraps(view)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
oauth_provider_app: OAuthProviderApp = kwargs.get("oauth_provider_app") oauth_provider_app = kwargs.get("oauth_provider_app")
if not oauth_provider_app or not isinstance(oauth_provider_app, OAuthProviderApp):
raise BadRequest("Invalid oauth_provider_app")
if not request.headers.get("Authorization"): if not request.headers.get("Authorization"):
raise BadRequest("Authorization is required") raise BadRequest("Authorization is required")
token_type = request.headers.get("Authorization") authorization_header = request.headers.get("Authorization")
if not token_type: if not authorization_header:
raise BadRequest("token_type is required") raise BadRequest("Authorization header is required")
token_type = token_type.split(" ")[0]
parts = authorization_header.split(" ")
if len(parts) != 2:
raise BadRequest("Invalid Authorization header format")
token_type = parts[0]
if token_type != "Bearer": if token_type != "Bearer":
raise BadRequest("token_type is invalid") raise BadRequest("token_type is invalid")
access_token = request.headers.get("Authorization").split(" ")[1]
access_token = parts[1]
if not access_token: if not access_token:
raise BadRequest("access_token is required") raise BadRequest("access_token is required")
@ -72,8 +80,8 @@ class OAuthServerAppApi(Resource):
def post(self, oauth_provider_app: OAuthProviderApp): def post(self, oauth_provider_app: OAuthProviderApp):
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument("redirect_uri", type=str, required=True, location="json") parser.add_argument("redirect_uri", type=str, required=True, location="json")
args = parser.parse_args() parsed_args = parser.parse_args()
redirect_uri = args.get("redirect_uri") redirect_uri = parsed_args.get("redirect_uri")
# check if redirect_uri is valid # check if redirect_uri is valid
if redirect_uri not in oauth_provider_app.redirect_uris: if redirect_uri not in oauth_provider_app.redirect_uris:
@ -115,22 +123,22 @@ class OAuthServerUserTokenApi(Resource):
parser.add_argument("client_secret", type=str, required=False, location="json") parser.add_argument("client_secret", type=str, required=False, location="json")
parser.add_argument("redirect_uri", type=str, required=False, location="json") parser.add_argument("redirect_uri", type=str, required=False, location="json")
parser.add_argument("refresh_token", type=str, required=False, location="json") parser.add_argument("refresh_token", type=str, required=False, location="json")
args = parser.parse_args() parsed_args = parser.parse_args()
grant_type = OAuthGrantType(args["grant_type"]) grant_type = OAuthGrantType(parsed_args["grant_type"])
if grant_type == OAuthGrantType.AUTHORIZATION_CODE: if grant_type == OAuthGrantType.AUTHORIZATION_CODE:
if not args["code"]: if not parsed_args["code"]:
raise BadRequest("code is required") raise BadRequest("code is required")
if args["client_secret"] != oauth_provider_app.client_secret: if parsed_args["client_secret"] != oauth_provider_app.client_secret:
raise BadRequest("client_secret is invalid") raise BadRequest("client_secret is invalid")
if args["redirect_uri"] not in oauth_provider_app.redirect_uris: if parsed_args["redirect_uri"] not in oauth_provider_app.redirect_uris:
raise BadRequest("redirect_uri is invalid") raise BadRequest("redirect_uri is invalid")
access_token, refresh_token = OAuthServerService.sign_oauth_access_token( access_token, refresh_token = OAuthServerService.sign_oauth_access_token(
grant_type, code=args["code"], client_id=oauth_provider_app.client_id grant_type, code=parsed_args["code"], client_id=oauth_provider_app.client_id
) )
return jsonable_encoder( return jsonable_encoder(
{ {
@ -141,11 +149,11 @@ class OAuthServerUserTokenApi(Resource):
} }
) )
elif grant_type == OAuthGrantType.REFRESH_TOKEN: elif grant_type == OAuthGrantType.REFRESH_TOKEN:
if not args["refresh_token"]: if not parsed_args["refresh_token"]:
raise BadRequest("refresh_token is required") raise BadRequest("refresh_token is required")
access_token, refresh_token = OAuthServerService.sign_oauth_access_token( access_token, refresh_token = OAuthServerService.sign_oauth_access_token(
grant_type, refresh_token=args["refresh_token"], client_id=oauth_provider_app.client_id grant_type, refresh_token=parsed_args["refresh_token"], client_id=oauth_provider_app.client_id
) )
return jsonable_encoder( return jsonable_encoder(
{ {