auth and is_admin

auth.py

@@ -2,29 +2,39 @@ from fastapi import Depends, HTTPException, status
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 from global_state import get
 from db.tbs_db import TbsDb
+from db_model.user import UserModel
 
 # 创建一个 HTTPBearer 实例
 security = HTTPBearer()
 
-def get_current_user_id(credentials: HTTPAuthorizationCredentials = Depends(security)):
+def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(security)):
     token = credentials.credentials
     token = credentials.credentials
-    # 假设你有一个函数来验证Token并返回用户ID
-    user_id = validate_token(token)
-    if user_id is None:
+    # 假设你有一个函数来验证Token并返回用户
+    user = validate_token(token)
+    print(f"\n\n\n\n{user}")
+    if user is None:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Invalid authentication credentials",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    return user_id
+    if user.is_admin == 0:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Have no permission",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    return user
 
 def validate_token(token: str):
     db_module_filename = f"{get('project_root')}/db/cloudflare.py"
     query = f"SELECT * FROM users where api_key='{token}'"
     response = TbsDb(db_module_filename, "Cloudflare").get_item(query)
+    print(f"\n\n\n\n{response}")
     result = response['result'][0]['results']
     if len(result) == 0:
         return None
-    user_id = result[0]['id']
-    return user_id
+    result = result[0]
+    result=UserModel(**result)
+    return result

db_model/user.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+
+class UserModel(BaseModel):
+    id: int = 0
+    username: str
+    password: str
+    email: str
+    nikename: str = None
+    is_admin: int = 0

routers/users_v1.py

@@ -4,26 +4,33 @@ import uuid
 
 from global_state import get
 from db.tbs_db import TbsDb
-from auth import get_current_user_id
+from auth import get_current_user
+from db_model.user import UserModel
 
 router = APIRouter()
 
 db_module_filename = f"{get('project_root')}/db/cloudflare.py"
 
-@router.get("/users")
-async def read_users(current_user_id: int = Depends(get_current_user_id)):
-    query = "SELECT * FROM users"
-    response = TbsDb(db_module_filename, "Cloudflare").get_list(query)
-    return response
-
 class User(BaseModel):
+    id: int = 0
     username: str
     password: str
     email: str
     nikename: str = None
+    is_admin: int = 0
+
+@router.get("/users")
+# async def read_users(current_user_id: int = Depends(get_current_user_id)):
+#     query = "SELECT * FROM users"
+#     response = TbsDb(db_module_filename, "Cloudflare").get_list(query)
+#     return response
+async def read_user(current_user: UserModel = Depends(get_current_user)):
+    query = "SELECT * FROM users"
+    response = TbsDb(db_module_filename, "Cloudflare").get_list(query)
+    return response
 
 @router.post("/users")
-async def create_user(user: User, current_user_id: int = Depends(get_current_user_id)): 
+async def create_user(user: UserModel): 
     username = user.username
     password = user.password
     email = user.email
@@ -34,10 +41,12 @@ async def create_user(user: User, current_user_id: int = Depends(get_current_use
     api_key = f'airs-{uuid.uuid4()}'
     query = f"INSERT INTO users (username, password, email, nikename, api_key) VALUES ('{username}', '{password}', '{email}', '{nikename}', '{api_key}')"
     response = TbsDb(db_module_filename, "Cloudflare").add_item(query)
+    if response['success']==True:
+        response['api_key'] = api_key
     return response
 
 @router.get("/users/{id}")
-async def read_user(id:int, current_user_id: int = Depends(get_current_user_id)):
+async def read_user(id:int, current_user: UserModel = Depends(get_current_user)):
     query = f"SELECT * FROM users where id={id}"
     response = TbsDb(db_module_filename, "Cloudflare").get_item(query)
     return response