diff --git a/api/controllers/web/app.py b/api/controllers/web/app.py index d5d0b93d12..4d1abe4440 100644 --- a/api/controllers/web/app.py +++ b/api/controllers/web/app.py @@ -1,11 +1,11 @@ +from flask import request +from flask_restful import Resource, marshal_with, reqparse + from controllers.common import fields from controllers.web import api from controllers.web.error import AppUnavailableError from controllers.web.wraps import WebApiResource -from core.app.app_config.common.parameters_mapping import \ - get_parameters_from_feature_dict -from flask import request -from flask_restful import Resource, marshal_with, reqparse +from core.app.app_config.common.parameters_mapping import get_parameters_from_feature_dict from libs.passport import PassportService from models.model import App, AppMode from services.app_service import AppService diff --git a/api/controllers/web/login.py b/api/controllers/web/login.py index 3ad1baf2fc..f28ef9408f 100644 --- a/api/controllers/web/login.py +++ b/api/controllers/web/login.py @@ -34,7 +34,7 @@ class LoginApi(Resource): raise AccountNotFound() token = WebAppAuthService.login(account=account) - return {"result": "success", "token": token} + return {"result": "success", "access_token": token} # class LogoutApi(Resource): @@ -99,7 +99,7 @@ class EmailCodeLoginApi(Resource): token = WebAppAuthService.login(account=account) AccountService.reset_login_error_rate_limit(args["email"]) - return {"result": "success", "token": token} + return {"result": "success", "access_token": token} api.add_resource(LoginApi, "/login") diff --git a/api/controllers/web/passport.py b/api/controllers/web/passport.py index 7d865b2509..525d2278dc 100644 --- a/api/controllers/web/passport.py +++ b/api/controllers/web/passport.py @@ -1,17 +1,18 @@ import uuid from datetime import UTC, datetime, timedelta +from flask import request +from flask_restful import Resource +from werkzeug.exceptions import NotFound, Unauthorized + from configs import dify_config from controllers.web import api from controllers.web.error import WebAppAuthRequiredError from extensions.ext_database import db -from flask import request -from flask_restful import Resource from libs.passport import PassportService from models.model import App, EndUser, Site from services.enterprise.enterprise_service import EnterpriseService from services.feature_service import FeatureService -from werkzeug.exceptions import NotFound, Unauthorized class PassportResource(Resource): diff --git a/api/controllers/web/wraps.py b/api/controllers/web/wraps.py index f56bc4c398..36928f308f 100644 --- a/api/controllers/web/wraps.py +++ b/api/controllers/web/wraps.py @@ -1,17 +1,16 @@ from functools import wraps -from controllers.web.error import (WebAppAuthAccessDeniedError, - WebAppAuthRequiredError) -from extensions.ext_database import db from flask import request from flask_restful import Resource +from werkzeug.exceptions import BadRequest, NotFound, Unauthorized + +from controllers.web.error import WebAppAuthAccessDeniedError, WebAppAuthRequiredError +from extensions.ext_database import db from libs.passport import PassportService from models.model import App, EndUser, Site -from services.enterprise.enterprise_service import (EnterpriseService, - WebAppSettings) +from services.enterprise.enterprise_service import EnterpriseService, WebAppSettings from services.feature_service import FeatureService from services.webapp_auth_service import WebAppAuthService -from werkzeug.exceptions import BadRequest, NotFound, Unauthorized def validate_jwt_token(view=None): diff --git a/api/services/webapp_auth_service.py b/api/services/webapp_auth_service.py index aa053f0ee0..fe0a0d53eb 100644 --- a/api/services/webapp_auth_service.py +++ b/api/services/webapp_auth_service.py @@ -2,6 +2,8 @@ import random from datetime import UTC, datetime, timedelta from typing import Any, Optional, cast +from werkzeug.exceptions import NotFound, Unauthorized + from configs import dify_config from extensions.ext_database import db from libs.helper import TokenManager @@ -11,10 +13,8 @@ from models.account import Account, AccountStatus from models.model import App, EndUser, Site from services.app_service import AppService from services.enterprise.enterprise_service import EnterpriseService -from services.errors.account import (AccountLoginError, AccountNotFoundError, - AccountPasswordError) +from services.errors.account import AccountLoginError, AccountNotFoundError, AccountPasswordError from tasks.mail_email_code_login import send_email_code_login_mail_task -from werkzeug.exceptions import NotFound, Unauthorized class WebAppAuthService: @@ -118,7 +118,9 @@ class WebAppAuthService: return token @classmethod - def is_app_require_permission_check(cls, app_code: str = None, app_id: str = None, access_mode: str = None) -> bool: + def is_app_require_permission_check( + cls, app_code: Optional[str] = None, app_id: Optional[str] = None, access_mode: Optional[str] = None + ) -> bool: """ Check if the app requires permission check based on its access mode. """