vova/porridger
1
0
Fork 0
forked from polka_billy/porridger
Code Pull Requests Activity

get current user(using email) completed

Browse Source
This commit is contained in:
DmitryGantimurov
2023-08-02 00:39:46 +03:00
parent 0145ed8f44
commit 26e42d874e
4 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
back/main.py
View File

@ -7,7 +7,7 @@ from fastapi.templating import Jinja2Templates
from fastapi.requests import Request
from pydantic import json
from typing import Any
from typing import Any, Annotated
from starlette.staticfiles import StaticFiles
import requests
@ -18,10 +18,9 @@ import pathlib
import shutil
import os
from .utils import *
from .db import Base, engine, SessionLocal, database
from .service import add_poems_to_db, generate_poem
from . import schemas, models
from . import schemas, models, utils
Base.metadata.create_all(bind=engine)
@ -154,34 +153,30 @@ def create_user(data = Body()):
async def login_for_access_token(
form_data: Annotated[OAuth2PasswordRequestForm, Depends()]
):
user = authenticate_user(database, form_data.username, form_data.password)
user = utils.authenticate_user(database, form_data.username, form_data.password)
if not user:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Incorrect username or password",
headers={"WWW-Authenticate": "Bearer"},
)
access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
access_token = create_access_token(
access_token_expires = utils.timedelta(minutes=utils.ACCESS_TOKEN_EXPIRE_MINUTES)
access_token = utils.create_access_token(
data={"user_id": user.id}, expires_delta=access_token_expires
)
return {"access_token":access_token}
# @app.get("/api/users/me/", response_model=schemas.User) #
# async def read_users_me(current_user: Annotated[schemas.User, Depends(get_current_active_user)]):
# return current_user #schemas.User(id=current_user.id, email=current_user.email, name=current_user.name, surname=current_user.surname, disabled=current_user.disabled, items=current_user.items)
@app.get("/api/users/me/", response_model=schemas.User) #
async def read_users_me(current_user: Annotated[schemas.User, Depends(get_current_active_user)]) -> Any:
return current_user #schemas.User(id=current_user.id, email=current_user.email, name=current_user.name, surname=current_user.surname, disabled=current_user.disabled, items=current_user.items)
async def read_users_me(current_user: Annotated[schemas.User, Depends(utils.get_current_active_user)]):
return current_user
# @app.get("/api/users/me/items/")
# async def read_own_items(
# current_user: Annotated[schemas.User, Depends(get_current_active_user)]
# ):
# return [{"Current user name": current_user.name, "Current user surname": current_user.surname}]
@app.get("/api/users/me/items/")
async def read_own_items(
current_user: Annotated[schemas.User, Depends(utils.get_current_active_user)]
):
return [{"Current user name": current_user.name, "Current user surname": current_user.surname}]
@app.get("/api/trashbox")