Small fixes

database/schemas/users.py

@@ -12,8 +12,11 @@ class UserCreate(UserBase):
     password: str = Field(examples=["password"])
 
 
-class User(UserBase):
+class UserOpenData(UserBase):
     id: int = Field(examples=[1])
+
+
+class User(UserOpenData):
     hash_of_password: str = Field(examples=["hash_of_password"])
 
     model_config = ConfigDict(from_attributes=True)

routes/auth.py

@@ -58,7 +58,8 @@ def create_token(user: db.User):
         timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     expire = datetime.now(timezone.utc) + access_token_expires
     to_encode = {
-        "username": user.name,
+        "id": user.id,
+        "name": user.name,
         "email": user.email,
         "expire": str(expire)
     }
@@ -110,6 +111,6 @@ async def login_user(
     return create_token(user)
 
 
-@auth_router.get("/me", response_model=db.User)
+@auth_router.get("/me", response_model=db.UserOpenData)
 async def read_me(user: db.User = Depends(get_user)):
     return user