updated

wpcodevo · wpcodevo · commit 3e7a63aa8fe8 · 2022-07-09T20:12:17.000Z
diff --git a/app/models.py b/app/models.py
@@ -1,12 +1,13 @@
+import uuid
 from .database import Base
 from sqlalchemy import TIMESTAMP, Column, String, Boolean, text
 from sqlalchemy.dialects.postgresql import UUID
 
 
 class User(Base):
     __tablename__ = 'users'
-    id = Column(UUID, primary_key=True, nullable=False,
-                server_default=text("uuid_generate_v4()"))
+    id = Column(UUID(as_uuid=True), primary_key=True, nullable=False,
+                default=uuid.uuid4)
     name = Column(String,  nullable=False)
     email = Column(String, unique=True, nullable=False)
     password = Column(String, nullable=False)
diff --git a/app/oauth2.py b/app/oauth2.py
@@ -16,6 +16,7 @@ class Settings(BaseModel):
     authjwt_token_location: set = {'cookies', 'headers'}
     authjwt_access_cookie_key: str = 'access_token'
     authjwt_refresh_cookie_key: str = 'refresh_token'
+    authjwt_cookie_csrf_protect: bool = False
     authjwt_public_key: str = base64.b64decode(
         settings.JWT_PUBLIC_KEY).decode('utf-8')
     authjwt_private_key: str = base64.b64decode(
diff --git a/app/routers/auth.py b/app/routers/auth.py
@@ -61,11 +61,11 @@ def login(payload: schemas.LoginUserSchema, response: Response, db: Session = De
 
     # Create access token
     access_token = Authorize.create_access_token(
-        subject=user.id, expires_time=timedelta(minutes=ACCESS_TOKEN_EXPIRES_IN))
+        subject=str(user.id), expires_time=timedelta(minutes=ACCESS_TOKEN_EXPIRES_IN))
 
     # Create refresh token
     refresh_token = Authorize.create_refresh_token(
-        subject=user.id, expires_time=timedelta(minutes=REFRESH_TOKEN_EXPIRES_IN))
+        subject=str(user.id), expires_time=timedelta(minutes=REFRESH_TOKEN_EXPIRES_IN))
 
     # Store refresh and access tokens in cookie
     response.set_cookie('access_token', access_token, ACCESS_TOKEN_EXPIRES_IN * 60,
@@ -94,7 +94,7 @@ def refresh_token(response: Response, request: Request, Authorize: AuthJWT = Dep
             raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED,
                                 detail='The user belonging to this token no logger exist')
         access_token = Authorize.create_access_token(
-            subject=user_id, expires_time=timedelta(minutes=ACCESS_TOKEN_EXPIRES_IN))
+            subject=str(user.id), expires_time=timedelta(minutes=ACCESS_TOKEN_EXPIRES_IN))
     except Exception as e:
         error = e.__class__.__name__
         if error == 'MissingTokenError':
diff --git a/app/schemas.py b/app/schemas.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+import uuid
 from pydantic import BaseModel, EmailStr, constr
 
 
@@ -24,6 +25,6 @@ class LoginUserSchema(BaseModel):
 
 
 class UserResponse(UserBaseSchema):
-    id: str
+    id: uuid.UUID
     created_at: datetime
     updated_at: datetime
