docker build 构建修改

api/apps/tenant_app.py

@@ -14,9 +14,10 @@
 #  limitations under the License.
 #
 
-from flask import request
-from flask_login import login_required, current_user
+from fastapi import APIRouter, Depends, Path
 
+from api.apps.models.auth_dependencies import get_current_user
+from api.apps.models.tenant_models import InviteUserRequest
 from api import settings
 from api.apps import smtp_mail_server
 from api.db import UserTenantRole, StatusEnum
@@ -24,13 +25,19 @@ from api.db.db_models import UserTenant
 from api.db.services.user_service import UserTenantService, UserService
 
 from api.utils import get_uuid, delta_seconds
-from api.utils.api_utils import get_json_result, validate_request, server_error_response, get_data_error_result
+from api.utils.api_utils import get_json_result, server_error_response, get_data_error_result
 from api.utils.web_utils import send_invite_email
 
+# 创建路由器
+router = APIRouter()
 
-@manager.route("/<tenant_id>/user/list", methods=["GET"])  # noqa: F821
-@login_required
-def user_list(tenant_id):
+
+@router.get("/{tenant_id}/user/list")
+async def user_list(
+    tenant_id: str = Path(..., description="租户ID"),
+    current_user = Depends(get_current_user)
+):
+    """获取租户用户列表"""
     if current_user.id != tenant_id:
         return get_json_result(
             data=False,
@@ -46,18 +53,20 @@ def user_list(tenant_id):
         return server_error_response(e)
 
 
-@manager.route('/<tenant_id>/user', methods=['POST'])  # noqa: F821
-@login_required
-@validate_request("email")
-def create(tenant_id):
+@router.post('/{tenant_id}/user')
+async def create(
+    tenant_id: str,
+    request: InviteUserRequest,
+    current_user = Depends(get_current_user)
+):
+    """邀请用户加入租户"""
     if current_user.id != tenant_id:
         return get_json_result(
             data=False,
             message='No authorization.',
             code=settings.RetCode.AUTHENTICATION_ERROR)
 
-    req = request.json
-    invite_user_email = req["email"]
+    invite_user_email = request.email
     invite_users = UserService.query(email=invite_user_email)
     if not invite_users:
         return get_data_error_result(message="User not found.")
@@ -101,9 +110,13 @@ def create(tenant_id):
     return get_json_result(data=usr)
 
 
-@manager.route('/<tenant_id>/user/<user_id>', methods=['DELETE'])  # noqa: F821
-@login_required
-def rm(tenant_id, user_id):
+@router.delete('/{tenant_id}/user/{user_id}')
+async def rm(
+    tenant_id: str = Path(..., description="租户ID"),
+    user_id: str = Path(..., description="用户ID"),
+    current_user = Depends(get_current_user)
+):
+    """从租户中删除用户"""
     if current_user.id != tenant_id and current_user.id != user_id:
         return get_json_result(
             data=False,
@@ -117,9 +130,11 @@ def rm(tenant_id, user_id):
         return server_error_response(e)
 
 
-@manager.route("/list", methods=["GET"])  # noqa: F821
-@login_required
-def tenant_list():
+@router.get("/list")
+async def tenant_list(
+    current_user = Depends(get_current_user)
+):
+    """获取租户列表"""
     try:
         users = UserTenantService.get_tenants_by_user_id(current_user.id)
         for u in users:
@@ -129,9 +144,12 @@ def tenant_list():
         return server_error_response(e)
 
 
-@manager.route("/agree/<tenant_id>", methods=["PUT"])  # noqa: F821
-@login_required
-def agree(tenant_id):
+@router.put("/agree/{tenant_id}")
+async def agree(
+    tenant_id: str = Path(..., description="租户ID"),
+    current_user = Depends(get_current_user)
+):
+    """同意加入租户邀请"""
     try:
         UserTenantService.filter_update([UserTenant.tenant_id == tenant_id, UserTenant.user_id == current_user.id],
                                         {"role": UserTenantRole.NORMAL})