Рефакторинг

Author: ProFastCode

app/api/depends.py

@@ -5,8 +5,8 @@
 from fastapi import Depends, HTTPException, status, Header
 
 from app.core import security
+from app.core.structures import Role
 from app.database import Database, new_session, models
-from app.database.structures import Role
 
 
 async def get_db() -> Database:
@@ -33,7 +33,7 @@ async def get_current_user(
 async def admins_access(
     user: models.User = Depends(get_current_user),
 ) -> None:
-    if not user.role >= Role.ADMIN.value:
+    if not user.role >= Role.ADMIN:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="You do not have access to this section",

app/api/endpoints/tokens/auth.py

@@ -1,7 +1,8 @@
 from fastapi import APIRouter, Depends, Request
 
-from app.api import depends, exps
-from app.core.security import tkn_manager, pswd_manager
+from app.api import depends
+from app.core import exps
+from app.core.security import tkn_manager, pwd_manager
 from app.database import Database
 from app.schemas.tokens import AuthToken
 from app.schemas.users import AuthUser
@@ -22,7 +23,7 @@ async def new_auth_token(
     if not (user := await db.user.get_by_email(data.email)):
         raise exps.USER_NOT_REGISTERED
 
-    if not pswd_manager.verify_password(data.password, user.password):
+    if not pwd_manager.verify_password(data.password, user.password):
         raise exps.USER_INCORRECT_PASSWORD
 
     auth_token = tkn_manager.create_auth_token({"id": user.id})

app/api/endpoints/tokens/pair.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Depends, Request
 
-from app.api import depends, exps
+from app.api import depends
+from app.core import exps
 from app.core.security import tkn_manager
 from app.database import Database
 from app.schemas.tokens import PairTokens, AuthToken

app/api/endpoints/tokens/refresh.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Depends, Request
 
-from app.api import depends, exps
+from app.api import depends
+from app.core import exps
 from app.core.security import tkn_manager
 from app.database import Database
 from app.schemas.tokens import LongToken, ShortToken

app/api/endpoints/users/new.py

@@ -4,8 +4,9 @@
 
 from fastapi import APIRouter, Depends
 
-from app.api import depends, exps
-from app.core.security import pswd_manager
+from app.api import depends
+from app.core import exps
+from app.core.security import pwd_manager
 from app.database import Database
 from app.schemas.users import GetUser, NewUser
 
@@ -25,7 +26,7 @@ async def new(data: NewUser, db: Database = Depends(depends.get_db)):
     if await db.user.get_by_email(data.email):
         raise exps.USER_EXISTS
 
-    hash_password = pswd_manager.hash_password(data.password)
+    hash_password = pwd_manager.hash_password(data.password)
     user = await db.user.new(data.email, hash_password)
     await db.session.commit()
     return user

app/api/exps.py renamed to app/core/exps.py

@@ -1,5 +1,6 @@
 from fastapi import HTTPException, status
 
+# Users
 USER_EXISTS = HTTPException(status.HTTP_409_CONFLICT, "User is already taken.")
 USER_NOT_FOUND = HTTPException(status.HTTP_404_NOT_FOUND, "User not found.")
 USER_NOT_REGISTERED = HTTPException(
@@ -8,3 +9,8 @@
 USER_INCORRECT_PASSWORD = HTTPException(
     status.HTTP_401_UNAUTHORIZED, "Incorrect password"
 )
+
+# Tokens
+TOKEN_INVALID = HTTPException(status.HTTP_401_UNAUTHORIZED, "Invalid token")
+TOKEN_EXPIRED = HTTPException(status.HTTP_401_UNAUTHORIZED, "Token expired")
+TOKEN_INVALID_TYPE = HTTPException(status.HTTP_401_UNAUTHORIZED, "Invalid token type")

app/core/security/__init__.py

@@ -1,5 +1,5 @@
 from . import password_manager, token_manager
-from .password_manager import pswd_manager
+from .password_manager import pwd_manager
 from .token_manager import tkn_manager
 
-__all__ = ["password_manager", "token_manager", "pswd_manager", "tkn_manager"]
+__all__ = ["password_manager", "token_manager", "pwd_manager", "tkn_manager"]

app/core/security/password_manager/__init__.py

@@ -1,5 +1,5 @@
 from .password_manager import PasswordManager
 
-pswd_manager = PasswordManager()
+pwd_manager = PasswordManager()
 
-__all__ = ["PasswordManager", "pswd_manager"]
+__all__ = ["PasswordManager", "pwd_manager"]

app/core/security/token_manager/__init__.py

@@ -1,7 +1,5 @@
-from . import exceptions as exp
-from .structures import TokenType
 from .token_manager import TokenManager
 
 tkn_manager = TokenManager()
 
-__all__ = ["TokenManager", "TokenType", "exp", "tkn_manager"]
+__all__ = ["TokenManager", "tkn_manager"]