updated

wpcodevo · wpcodevo · commit 52f1e05f1895 · 2022-07-09T16:10:45.000Z
diff --git a/app/models.py b/app/models.py
@@ -1,5 +1,3 @@
-from unicodedata import category
-from uuid import UUID
 from .database import Base
 from sqlalchemy import TIMESTAMP, Column, ForeignKey, String, Boolean, text
 from sqlalchemy.dialects.postgresql import UUID
diff --git a/app/oauth2.py b/app/oauth2.py
@@ -1,9 +1,30 @@
+import base64
+from typing import List
 from fastapi import Depends, HTTPException, status
 from fastapi_jwt_auth import AuthJWT
+from pydantic import BaseModel
 
 from . import models
 from .database import get_db
 from sqlalchemy.orm import Session
+from .config import settings
+
+
+class Settings(BaseModel):
+    authjwt_algorithm: str = settings.JWT_ALGORITHM
+    authjwt_decode_algorithms: List[str] = [settings.JWT_ALGORITHM]
+    authjwt_token_location: set = {'cookies', 'headers'}
+    authjwt_access_cookie_key: str = 'access_token'
+    authjwt_refresh_cookie_key: str = 'refresh_token'
+    authjwt_public_key: str = base64.b64decode(
+        settings.JWT_PUBLIC_KEY).decode('utf-8')
+    authjwt_private_key: str = base64.b64decode(
+        settings.JWT_PRIVATE_KEY).decode('utf-8')
+
+
+@AuthJWT.load_config
+def get_config():
+    return Settings()
 
 
 class NotVerified(Exception):
diff --git a/app/routers/auth.py b/app/routers/auth.py
@@ -1,9 +1,6 @@
-import base64
 from datetime import timedelta
-from typing import List
-from urllib import response
 from fastapi import APIRouter, Request, Response, status, Depends, HTTPException
-from pydantic import BaseModel, EmailStr
+from pydantic import EmailStr
 
 from app import oauth2
 from .. import schemas, models, utils
@@ -13,23 +10,6 @@
 from ..config import settings
 
 
-class Settings(BaseModel):
-    authjwt_algorithm: str = settings.JWT_ALGORITHM
-    authjwt_decode_algorithms: List[str] = [settings.JWT_ALGORITHM]
-    authjwt_token_location: set = {'cookies', 'headers'}
-    authjwt_access_cookie_key: str = 'access_token'
-    authjwt_refresh_cookie_key: str = 'refresh_token'
-    authjwt_public_key: str = base64.b64decode(
-        settings.JWT_PUBLIC_KEY).decode('utf-8')
-    authjwt_private_key: str = base64.b64decode(
-        settings.JWT_PRIVATE_KEY).decode('utf-8')
-
-
-@AuthJWT.load_config
-def get_config():
-    return Settings()
-
-
 router = APIRouter()
 ACCESS_TOKEN_EXPIRES_IN = settings.ACCESS_TOKEN_EXPIRES_IN
 REFRESH_TOKEN_EXPIRES_IN = settings.REFRESH_TOKEN_EXPIRES_IN
@@ -48,7 +28,7 @@ async def create_user(payload: schemas.CreateUserSchema, db: Session = Depends(g
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST, detail='Passwords do not match')
     #  Hash the password
-    payload.password = utils.hash(payload.password)
+    payload.password = utils.hash_password(payload.password)
     del payload.passwordConfirm
     payload.role = 'user'
     payload.verified = True
diff --git a/app/utils.py b/app/utils.py
@@ -3,7 +3,7 @@
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 
-def hash(password: str):
+def hash_password(password: str):
     return pwd_context.hash(password)
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from unicodedata import category`
`2`		`-from uuid import UUID`
`3`	`1`	`from .database import Base`
`4`	`2`	`from sqlalchemy import TIMESTAMP, Column, ForeignKey, String, Boolean, text`
`5`	`3`	`from sqlalchemy.dialects.postgresql import UUID`