From a7719d5f517a00b8b6e9b95a60d13814cb205f78 Mon Sep 17 00:00:00 2001
From: StepanovPlaton <mail2platon@yandex.ru>
Date: Sat, 18 May 2024 20:30:41 +0400
Subject: [PATCH] Small fixes

---
 database/schemas/users.py | 5 ++++-
 routes/auth.py            | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/database/schemas/users.py b/database/schemas/users.py
index e39aa08..163fe9a 100644
--- a/database/schemas/users.py
+++ b/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)
diff --git a/routes/auth.py b/routes/auth.py
index d750e29..393542a 100644
--- a/routes/auth.py
+++ b/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