finish for init core

fuware/routes/__init__.py

@@ -0,0 +1,7 @@
+from fastapi import APIRouter
+
+from . import (auth)
+
+router = APIRouter(prefix='/api')
+
+router.include_router(auth.router)

fuware/routes/_base/routers.py

@@ -0,0 +1,9 @@
+from enum import Enum
+from fastapi import APIRouter, Depends
+
+from fuware.core.dependencies import get_auth_user
+
+
+class PrivateAPIRouter(APIRouter):
+  def __init__(self, tags: list[str | Enum] | None = None, prefix: str = "", **kwargs):
+    super().__init__(tags=tags, prefix=prefix, dependencies=[Depends(get_auth_user)], **kwargs)

fuware/routes/auth/__init__.py

@@ -0,0 +1,7 @@
+
+from fastapi import APIRouter
+from . import auth
+
+router = APIRouter(prefix='/auth')
+
+router.include_router(auth.public_router)

fuware/routes/auth/auth.py

@@ -0,0 +1,35 @@
+from typing import Any
+from fastapi import APIRouter, Depends, HTTPException, Response
+
+from fastapi.encoders import jsonable_encoder
+from sqlalchemy.orm import Session
+from fuware.db.db_setup import generate_session
+from fuware.schemas import ReturnValue, PrivateUser, UserRequest
+from fuware.schemas.user.user import UserCreate
+from fuware.services import UserService
+
+
+public_router = APIRouter(tags=["Users: Authentication"])
+
+user_service = UserService()
+
+@public_router.put('/register')
+def register_user(user: UserCreate, db: Session = Depends(generate_session)) -> ReturnValue[Any]:
+  db_user = user_service.get_by_username(username=user.username)
+  if db_user:
+    raise HTTPException(status_code=400, detail="Username already registered!")
+  user_return = user_service.create(db=db, user=user)
+  return ReturnValue(status=200, data=jsonable_encoder(user_return))
+
+# @public_router.post('/login', response_model=ReturnValue[PrivateUser])
+# def user_login(user: UserRequest, response: Response) -> ReturnValue[Any]:
+#   db_user = UserService.get_by_username(user.username)
+#   if not db_user:
+#     raise HTTPException(status_code=401, detail="Your username or password input is wrong!")
+  # if not verify_password(user.password, db_user.password):
+    # raise HTTPException(status_code=401, detail="Your username or password input is wrong!")
+  # if db_user.is_lock is True:
+    # raise HTTPException(status_code=401, detail="Your Account is banned")
+  # cookieEncode = encryptString(user.username + ',' + user.password)
+  # response.set_cookie(key=COOKIE_KEY, value=cookieEncode.decode('utf-8'))
+  # return ReturnValue(status=200, data=jsonable_encoder(db_user))

fuware/routes/authR.py

@@ -1,50 +0,0 @@
-from typing import Any
-from fastapi import APIRouter, HTTPException, Response, Request, Depends
-from fastapi.encoders import jsonable_encoder
-from schemas import ReturnValue, User, UserCreate, UserRequest
-from ultis import root_api_path_build, encryptString, decryptString, verify_password
-from const import COOKIE_KEY
-from sqlalchemy.orm import Session
-from db.controller import get_user_by_username, create_user
-from db import get_db
-
-authRouter=APIRouter(prefix=root_api_path_build('/auth'))
-
-@authRouter.put('/register')
-def register_user(user: UserCreate, db: Session = Depends(get_db)) -> ReturnValue[Any]:
-  db_user = get_user_by_username(db=db, usn=user.username)
-  if db_user:
-    raise HTTPException(status_code=400, detail="Username already registered!")
-  user_return = create_user(db=db, user=user)
-  return ReturnValue(status=200, data=jsonable_encoder(user_return))
-
-@authRouter.post('/login', response_model=ReturnValue[User])
-def user_login(user: UserRequest, response: Response, db: Session = Depends(get_db)) -> ReturnValue[Any]:
-  db_user = get_user_by_username(db, user.username)
-  if not db_user:
-    raise HTTPException(status_code=401, detail="Your username or password input is wrong!")
-  if not verify_password(user.password, db_user.password):
-    raise HTTPException(status_code=401, detail="Your username or password input is wrong!")
-  if db_user.is_lock is True:
-    raise HTTPException(status_code=401, detail="Your Account is banned")
-  cookieEncode = encryptString(user.username + ',' + user.password)
-  response.set_cookie(key=COOKIE_KEY, value=cookieEncode.decode('utf-8'))
-  return ReturnValue(status=200, data=jsonable_encoder(db_user))
-
-@authRouter.get('/logout')
-def user_logout(response: Response) -> ReturnValue[Any]:
-  response.delete_cookie(key=COOKIE_KEY)
-  return ReturnValue(status=200, data='Logged out')
-
-def get_auth_user(request: Request, db: Session = Depends(get_db)):
-  """verify that user has a valid session"""
-  session_id = request.cookies.get(COOKIE_KEY)
-  if not session_id:
-    raise HTTPException(status_code=401, detail="Unauthorized")
-  decrypt_user = decryptString(session_id).split(',')
-  db_user = get_user_by_username(db, decrypt_user[0])
-  if not db_user:
-    raise HTTPException(status_code=403)
-  if not verify_password(decrypt_user[1], db_user.password):
-    raise HTTPException(status_code=401, detail="Your username or password input is wrong!")
-  return True

fuware/routes/userR.py

@@ -1,11 +0,0 @@
-from typing import Any
-from fastapi import APIRouter, Depends
-from schemas import ReturnValue
-from ultis import root_api_path_build
-from routes import authR
-
-userRouter=APIRouter(prefix=root_api_path_build('/user'))
-
-@userRouter.get('/get-data/', dependencies=[Depends(authR.get_auth_user)])
-def get_data(url: str = '') -> ReturnValue[Any]:
-  return ReturnValue(status=200, data=url)