back/schema.py

@@ -15,13 +15,10 @@ class TokenData(BaseModel):
 
 
 class User(BaseModel):
-    id: int
-    phone: Union[int, None] = None
-    email: str
-    name: Union[str, None] = None
-    surname: Union[str, None] = None
+    email: Union[str, None] = None
+    full_name: Union[str, None] = None
+    disabled: Union[bool, None] = None
 
 
 class UserInDB(User):
-    password: str
     hashed_password: str

back/utils.py

@@ -42,10 +42,10 @@ def get_password_hash(password):
 
 
 # проблема здесь
-def get_user(db: SessionLocal, email: str, response_model=User):
+def get_user(db: SessionLocal, email: str):
     user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).one()
     if user_with_required_email:
-        return UserInDB(user_with_required_email)
+        return user_with_required_email
     return None
     
 
@@ -69,7 +69,7 @@ def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None
     return encoded_jwt
 
 
-async def get_current_user(db: SessionLocal, token: Annotated[str, Depends(oauth2_scheme)], response_model=User):
+async def get_current_user(db: SessionLocal, token: Annotated[str, Depends(oauth2_scheme)]):
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
         detail="Could not validate credentials",