v0.21.1-fastapi

api/apps/tenant_app.py

@@ -14,9 +14,8 @@
 #  limitations under the License.
 #
 
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-from api.models.tenant_models import InviteUserRequest, UserTenantResponse
-from api.utils.api_utils import get_current_user
+from flask import request
+from flask_login import login_required, current_user
 
 from api import settings
 from api.apps import smtp_mail_server
@@ -25,18 +24,13 @@ 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, server_error_response, get_data_error_result
+from api.utils.api_utils import get_json_result, validate_request, server_error_response, get_data_error_result
 from api.utils.web_utils import send_invite_email
 
-# 创建 FastAPI 路由器
-router = APIRouter()
 
-
-@router.get("/{tenant_id}/user/list")
-async def user_list(
-    tenant_id: str,
-    current_user = Depends(get_current_user)
-):
+@manager.route("/<tenant_id>/user/list", methods=["GET"])  # noqa: F821
+@login_required
+def user_list(tenant_id):
     if current_user.id != tenant_id:
         return get_json_result(
             data=False,
@@ -52,19 +46,18 @@ async def user_list(
         return server_error_response(e)
 
 
-@router.post('/{tenant_id}/user')
-async def create(
-    tenant_id: str,
-    request: InviteUserRequest,
-    current_user = Depends(get_current_user)
-):
+@manager.route('/<tenant_id>/user', methods=['POST'])  # noqa: F821
+@login_required
+@validate_request("email")
+def create(tenant_id):
     if current_user.id != tenant_id:
         return get_json_result(
             data=False,
             message='No authorization.',
             code=settings.RetCode.AUTHENTICATION_ERROR)
 
-    invite_user_email = request.email
+    req = request.json
+    invite_user_email = req["email"]
     invite_users = UserService.query(email=invite_user_email)
     if not invite_users:
         return get_data_error_result(message="User not found.")
@@ -77,7 +70,8 @@ async def create(
             return get_data_error_result(message=f"{invite_user_email} is already in the team.")
         if user_tenant_role == UserTenantRole.OWNER:
             return get_data_error_result(message=f"{invite_user_email} is the owner of the team.")
-        return get_data_error_result(message=f"{invite_user_email} is in the team, but the role: {user_tenant_role} is invalid.")
+        return get_data_error_result(
+            message=f"{invite_user_email} is in the team, but the role: {user_tenant_role} is invalid.")
 
     UserTenantService.save(
         id=get_uuid(),
@@ -107,12 +101,9 @@ async def create(
     return get_json_result(data=usr)
 
 
-@router.delete('/{tenant_id}/user/{user_id}')
-async def rm(
-    tenant_id: str,
-    user_id: str,
-    current_user = Depends(get_current_user)
-):
+@manager.route('/<tenant_id>/user/<user_id>', methods=['DELETE'])  # noqa: F821
+@login_required
+def rm(tenant_id, user_id):
     if current_user.id != tenant_id and current_user.id != user_id:
         return get_json_result(
             data=False,
@@ -126,10 +117,9 @@ async def rm(
         return server_error_response(e)
 
 
-@router.get("/list")
-async def tenant_list(
-    current_user = Depends(get_current_user)
-):
+@manager.route("/list", methods=["GET"])  # noqa: F821
+@login_required
+def tenant_list():
     try:
         users = UserTenantService.get_tenants_by_user_id(current_user.id)
         for u in users:
@@ -139,13 +129,12 @@ async def tenant_list(
         return server_error_response(e)
 
 
-@router.put("/agree/{tenant_id}")
-async def agree(
-    tenant_id: str,
-    current_user = Depends(get_current_user)
-):
+@manager.route("/agree/<tenant_id>", methods=["PUT"])  # noqa: F821
+@login_required
+def agree(tenant_id):
     try:
-        UserTenantService.filter_update([UserTenant.tenant_id == tenant_id, UserTenant.user_id == current_user.id], {"role": UserTenantRole.NORMAL})
+        UserTenantService.filter_update([UserTenant.tenant_id == tenant_id, UserTenant.user_id == current_user.id],
+                                        {"role": UserTenantRole.NORMAL})
         return get_json_result(data=True)
     except Exception as e:
         return server_error_response(e)