diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d646835 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +__pycache__/ diff --git a/app/api/user.py b/app/api/user.py index daf2476..41d948d 100644 --- a/app/api/user.py +++ b/app/api/user.py @@ -62,6 +62,5 @@ async def create_token( @router.get("/user/", response_model=List[schemas.User]) -def get_users(db: Session = Depends(get_db), token = Depends(depes.get_current_user)): +def get_users(db: Session = Depends(get_db), token=Depends(depes.get_current_user)): return crud.crud_user.get_users(db) - diff --git a/app/models/user.py b/app/models/user.py index 201f836..ac09ad6 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -5,6 +5,7 @@ from app.database import Base from sqlalchemy import Column, Integer, String, Boolean, DateTime, ForeignKey + def gen_uuid(): return str(uuid.uuid4()) @@ -19,4 +20,3 @@ class User(Base): email = Column(String(50), unique=True, index=True) hashed_password = Column(String(64)) deleted = Column(Integer, default=0) - diff --git a/app/utils/depes.py b/app/utils/depes.py index 1f804a0..775727a 100644 --- a/app/utils/depes.py +++ b/app/utils/depes.py @@ -18,6 +18,7 @@ def get_db(): finally: db.close() + def get_current_user( db: Session = Depends(get_db), token: str = Depends(oauth2_scheme) ) -> models.User: