From 91c99e0fd88e44293a8d9f48839b671621595a05 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Tue, 18 Jul 2023 23:39:04 +0300 Subject: [PATCH 01/14] Imported modules corrected --- back/main.py | 229 +------------------------------------------------- back/utils.py | 2 +- 2 files changed, 2 insertions(+), 229 deletions(-) diff --git a/back/main.py b/back/main.py index e1dd6fb..0d9a438 100644 --- a/back/main.py +++ b/back/main.py @@ -1,7 +1,3 @@ -<<<<<<< HEAD -# <<<<<<< HEAD -======= ->>>>>>> de8a1abcbfea61d8d4898c18e133b8b0feaf87e8 #подключение библиотек from fastapi import FastAPI, Response, Path, Depends, Body, Form, Query, status, HTTPException, APIRouter, UploadFile, File from fastapi.responses import HTMLResponse, FileResponse, JSONResponse, RedirectResponse @@ -170,7 +166,7 @@ async def login_for_access_token( return access_token -@app.get("/api/users/me/", response_model=User) +@app.get("/api/users/me/", response_model=schema.User) async def read_users_me( current_user: Annotated[User, Depends(get_current_active_user)] ): @@ -220,226 +216,3 @@ def get_trashboxes(lat:float, lng:float):#крутая функция для р @app.get("/{rest_of_path:path}") async def react_app(req: Request, rest_of_path: str): return templates.TemplateResponse('index.html', { 'request': req }) -<<<<<<< HEAD -# ======= -# #подключение библиотек -# from fastapi import FastAPI, Response, Path, Depends, Body, Form, Query, status, HTTPException, APIRouter, UploadFile, File -# from fastapi.responses import HTMLResponse, FileResponse, JSONResponse, RedirectResponse -# from fastapi.staticfiles import StaticFiles -# from fastapi.security import OAuth2PasswordRequestForm, OAuth2PasswordBearer -# from fastapi.templating import Jinja2Templates -# from fastapi.requests import Request - -# from pydantic import json - -# from starlette.staticfiles import StaticFiles - -# import requests -# from uuid import uuid4 - -# import ast -# import pathlib -# import shutil -# import os - -# from .utils import * -# from .models import Announcement, Trashbox, UserDatabase, Base -# from .db import engine, SessionLocal - -# from . import schema - - -# Base.metadata.create_all(bind=engine) - -# db = SessionLocal() - - -# app = FastAPI() - -# templates = Jinja2Templates(directory="./front/dist") - -# app.mount("/static", StaticFiles(directory = "./front/dist")) -# app.mount("/uploads", StaticFiles(directory = "./uploads")) - -# @app.get("/api/announcements")#адрес объявлений -# def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = -1): -# # Считываем данные из Body и отображаем их на странице. -# # В последствии будем вставлять данные в html-форму - -# a = db.query(Announcement) -# b = db.query(Announcement) -# c = db.query(Announcement) -# d = db.query(Announcement) -# e = db.query(Announcement) - -# if user_id != None: -# b = a.filter(Announcement.user_id == user_id) - -# if metro != None: -# c = a.filter(Announcement.metro == metro) - -# if category != None: -# d = a.filter(Announcement.category == category) - -# if booked_by != -1: -# e = a.filter(Announcement.booked_by == booked_by) - -# if not any([category, user_id, metro]) and booked_by == -1: -# result = a.all() - -# else: -# result = b.intersect(c, d, e).all() - -# return {"Success" : True, "list_of_announcements": result} - - -# @app.get("/api/announcement")#адрес объявлений -# def single_annoncement(user_id:int): -# # Считываем данные из Body и отображаем их на странице. -# # В последствии будем вставлять данные в html-форму -# try: -# annoncement = db.get(Announcement, user_id) -# return {"id": annoncement.id, "user_id": annoncement.user_id, "name": annoncement.name, -# "category": annoncement.category, "best_by": annoncement.best_by, "address": annoncement.address, -# "description": annoncement.description, "metro": annoncement.metro, "latitude": annoncement.latitude, -# "longtitude":annoncement.longtitude, "trashId": annoncement.trashId, "src":annoncement.src, -# "booked_by":annoncement.booked_by} -# except: -# return {"Answer" : False} #если неуданый доступ, то сообщаем об этом - - -# # Занести объявление в базу -# @app.put("/api/announcement")#адрес объявлений -# def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], bestBy: Annotated[int, Form()], address: Annotated[str, Form()], longtitude: Annotated[float, Form()], latitude: Annotated[float, Form()], description: Annotated[str, Form()], src: Annotated[UploadFile | None, File()], metro: Annotated[str, Form()], trashId: Annotated[int | None, Form()] = -1): -# # try: -# userId = 1 # temporary - -# uploaded_name = "" - -# f = src.file -# f.seek(0, os.SEEK_END) -# if f.tell() > 0: -# f.seek(0) -# destination = pathlib.Path("./uploads/" + str(hash(src.file)) + pathlib.Path(src.filename).suffix.lower()) -# with destination.open('wb') as buffer: -# shutil.copyfileobj(src.file, buffer) - -# uploaded_name = "/uploads/"+destination.name - -# temp_ancmt = Announcement(user_id=userId, name=name, category=category, best_by=bestBy, address=address, longtitude=longtitude, latitude=latitude, description=description, src=uploaded_name, metro=metro, trashId=trashId, booked_by=-1) -# db.add(temp_ancmt) # добавляем в бд -# db.commit() # сохраняем изменения -# db.refresh(temp_ancmt) # обновляем состояние объекта -# return {"Answer" : True} -# # except: -# # return {"Answer" : False} - - -# # Удалить объявления из базы -# @app.delete("/api/announcement") #адрес объявления -# def delete_from_db(data = Body()):#функция удаления объекта из БД -# try: -# db.delete(user_id=data.user_id)#удаление из БД -# db.commit() # сохраняем изменения -# return {"Answer" : True} -# except: -# return {"Answer" : False} - - -# # Забронировать объявление -# @app.post("/api/book") -# def change_book_status(data: schema.Book): -# try: -# # Получаем id пользователя, который бронирует объявление -# temp_user_id = 1 -# # Находим объявление по данному id -# announcement_to_change = db.query(Announcement).filter(id == data.id).first() -# # Изменяем поле booked_status на полученный id -# announcement_to_change.booked_status = temp_user_id -# return {"Success": True} -# except: -# return {"Success": False} - - -# @app.post("/api/signup") -# def create_user(data = Body()): -# if db.query(UserDatabase).filter(User.email == data["email"]).first() == None: -# new_user = UserDatabase(id=data["id"], email=data["email"], password=data["password"], name=data["name"], surname=data["surname"]) -# db.add(new_user) -# db.commit() -# db.refresh(new_user) # обновляем состояние объекта -# return {"Success": True} -# return {"Success": False, "Message": "Пользователь с таким email уже зарегестрирован."} - - -# @app.post("/api/token", response_model=Token) -# async def login_for_access_token( -# form_data: Annotated[OAuth2PasswordRequestForm, Depends()] -# ): -# user = authenticate_user(db.query(UserDatabase).all(), 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( -# data={"user_id": user.id}, expires_delta=access_token_expires -# ) -# return {"access_token": access_token, "token_type": "bearer"} - - -# @app.get("/api/users/me/", response_model=User) -# async def read_users_me( -# current_user: Annotated[User, Depends(get_current_active_user)] -# ): -# return current_user - - -# @app.get("/api/users/me/items/") -# async def read_own_items( -# current_user: Annotated[User, Depends(get_current_active_user)] -# ): -# return [{"Current user name": current_user.name, "Current user surname": current_user.surname}] - - - -# @app.get("/api/trashbox") -# def get_trashboxes(lat:float, lng:float):#крутая функция для работы с api -# BASE_URL='https://geointelect2.gate.petersburg.ru'#адрес сайта и мой токин -# my_token='eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3Nzg2NTk4MjEsImlhdCI6MTY4Mzk2NTQyMSwianRpIjoiOTI2ZGMyNmEtMGYyZi00OTZiLWI0NTUtMWQyYWM5YmRlMTZkIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjE2MGU1ZGVkLWFmMjMtNDkyNS05OTc1LTRhMzM0ZjVmNTkyOSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIxNjBlNWRlZC1hZjIzLTQ5MjUtOTk3NS00YTMzNGY1ZjU5MjkiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.BRyUIyY-KKnZ9xqTNa9vIsfKF0UN2VoA9h4NN4y7IgBVLiiS-j43QbeE6qgjIQo0pV3J8jtCAIPvJbO-Ex-GNkw_flgMiGHhKEpsHPW3WK-YZ-XsZJzVQ_pOmLte-Kql4z97WJvolqiXT0nMo2dlX2BGvNs6JNbupvcuGwL4YYpekYAaFNYMQrxi8bSN-R7FIqxP-gzZDAuQSWRRSUqVBLvmgRhphTM-FAx1sX833oXL9tR7ze3eDR_obSV0y6cKVIr4eIlKxFd82qiMrN6A6CTUFDeFjeAGERqeBPnJVXU36MHu7Ut7eOVav9OUARARWRkrZRkqzTfZ1iqEBq5Tsg' -# head = {'Authorization': 'Bearer {}'.format(my_token)} - -# my_data={ -# 'x' : f"{lng}", -# 'y' : f"{lat}", -# 'limit' : '1' -# } - -# response = requests.post(f"{BASE_URL}/nearest_recycling/get", headers=head, data=my_data) -# infos = response.json() - -# trashboxes = [] -# for trashbox in infos["results"]: -# temp_dict = {} -# for obj in trashbox["Objects"]: -# coord_list = obj["geometry"] -# temp_dict["Lat"] = coord_list["coordinates"][1] -# temp_dict["Lng"] = coord_list["coordinates"][0] - -# properties = obj["properties"] -# temp_dict["Name"] = properties["title"] -# temp_dict["Address"] = properties["address"] -# temp_dict["Categories"] = properties["content_text"].split(',') -# trashboxes.append(temp_dict) - -# uniq_trashboxes = [ast.literal_eval(el1) for el1 in set([str(el2) for el2 in trashboxes])] -# return JSONResponse(uniq_trashboxes) - -# @app.get("/{rest_of_path:path}") -# async def react_app(req: Request, rest_of_path: str): -# return templates.TemplateResponse('index.html', { 'request': req }) -# >>>>>>> 3668e8c33f71b7a79a0c83d41a106d9b55e2df71 -======= ->>>>>>> de8a1abcbfea61d8d4898c18e133b8b0feaf87e8 diff --git a/back/utils.py b/back/utils.py index f85821c..b45dede 100644 --- a/back/utils.py +++ b/back/utils.py @@ -84,7 +84,7 @@ async def get_current_user(db: SessionLocal, token: Annotated[str, Depends(oauth except JWTError: raise credentials_exception user = get_user(db, email=token_data.email) - if user is None: + if user == None: raise credentials_exception return user From 21970120bc77130c9113d00db24bb8bd0a1b4ce8 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Tue, 18 Jul 2023 23:43:23 +0300 Subject: [PATCH 02/14] parameters of sessionmaker changed --- back/db.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/back/db.py b/back/db.py index 065b868..6c1b951 100644 --- a/back/db.py +++ b/back/db.py @@ -11,11 +11,7 @@ from fastapi import Depends SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db" -engine = create_engine( - SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False} -) - -SessionLocal = sessionmaker(bind=engine, expire_on_commit=False) +SessionLocal = sessionmaker(class_='Session', bind=Engine(sqlite:///./sql_app.db), autoflush=True, autocommit=False, expire_on_commit=False) database = SessionLocal() Base = declarative_base() \ No newline at end of file From a234f95ace017b0297ef63e13e5d8acfb355bbe1 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Tue, 18 Jul 2023 23:47:01 +0300 Subject: [PATCH 03/14] pass new parameters to sessionmaker --- back/db.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/back/db.py b/back/db.py index 6c1b951..cab4b6f 100644 --- a/back/db.py +++ b/back/db.py @@ -11,7 +11,11 @@ from fastapi import Depends SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db" -SessionLocal = sessionmaker(class_='Session', bind=Engine(sqlite:///./sql_app.db), autoflush=True, autocommit=False, expire_on_commit=False) +engine = create_engine( + SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False} +) + +SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False, expire_on_commit=False) database = SessionLocal() Base = declarative_base() \ No newline at end of file From 7c317805fb2f2454da45961e489f18e1770f520d Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Tue, 18 Jul 2023 23:56:07 +0300 Subject: [PATCH 04/14] fastapi.Responce has been imported --- back/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/utils.py b/back/utils.py index b45dede..f9b13a5 100644 --- a/back/utils.py +++ b/back/utils.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta from typing import Annotated, Union -from fastapi import Depends, FastAPI, HTTPException, status +from fastapi import Depends, FastAPI, HTTPException, status, Response from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from jose import JWTError, jwt from passlib.context import CryptContext From 98139e2162a0504139ea63686f513f11865faf2e Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 19 Jul 2023 00:05:42 +0300 Subject: [PATCH 05/14] =?UTF-8?q?=D0=9A=20=D1=81=D1=85=D0=B5=D0=BC=D0=B0?= =?UTF-8?q?=D0=BC=20=D0=B8=D0=B7=20schema.py=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B4=D0=BE=D0=BF.=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=8F=20(=D1=81=D0=BE=D0=BE=D1=82=D0=B2.=20models)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/schema.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/back/schema.py b/back/schema.py index 424983d..2d63adc 100644 --- a/back/schema.py +++ b/back/schema.py @@ -15,10 +15,13 @@ class TokenData(BaseModel): class User(BaseModel): - email: Union[str, None] = None - full_name: Union[str, None] = None - disabled: Union[bool, None] = None + id: int + phone: Union[int, None] = None + email: str + name: Union[str, None] = None + surname: Union[str, None] = None class UserInDB(User): + password: str hashed_password: str \ No newline at end of file From 959596311b894595c39b49c669aa0180968d9c48 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 19 Jul 2023 00:10:59 +0300 Subject: [PATCH 06/14] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=20response=5Fmodel=20=D0=BA=20get=5Fuser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/utils.py b/back/utils.py index f9b13a5..0f28c18 100644 --- a/back/utils.py +++ b/back/utils.py @@ -42,10 +42,10 @@ def get_password_hash(password): # проблема здесь -def get_user(db: SessionLocal, email: str): +def get_user(db: SessionLocal, email: str, response_model=User): user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).one() if user_with_required_email: - return user_with_required_email + return UserInDB(user_with_required_email) return None From ee823ff0c46d31550846aff7a7a2f44b065b4781 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 19 Jul 2023 00:11:57 +0300 Subject: [PATCH 07/14] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=20responce=5Fmodel=3DUser=20=D0=BA=20get=5Fcurrent?= =?UTF-8?q?=5Fuser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/utils.py b/back/utils.py index 0f28c18..68df045 100644 --- a/back/utils.py +++ b/back/utils.py @@ -76,7 +76,7 @@ async def get_current_user(db: SessionLocal, token: Annotated[str, Depends(oauth headers={"WWW-Authenticate": "Bearer"}, ) try: - payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM]) + payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM], response_model=User) email: str = payload.get("sub") if email is None: raise credentials_exception From 8513e8610b7439247a2cb5b90ba127c97869c65d Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 19 Jul 2023 00:14:56 +0300 Subject: [PATCH 08/14] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20response=5Fmodel=3DUser=20=D0=B2=20get=5Fc?= =?UTF-8?q?urrent=5Fuser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/utils.py b/back/utils.py index 68df045..1b8bd01 100644 --- a/back/utils.py +++ b/back/utils.py @@ -69,14 +69,14 @@ 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)]): +async def get_current_user(db: SessionLocal, token: Annotated[str, Depends(oauth2_scheme)], response_model=User): credentials_exception = HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, detail="Could not validate credentials", headers={"WWW-Authenticate": "Bearer"}, ) try: - payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM], response_model=User) + payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM]) email: str = payload.get("sub") if email is None: raise credentials_exception From d2c7ce453e29070f2d26b5653626523cc35c2063 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 19 Jul 2023 23:24:42 +0300 Subject: [PATCH 09/14] Prepare to use another auth code --- back/schema.py | 4 +++- back/utils.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/back/schema.py b/back/schema.py index 2d63adc..dc71245 100644 --- a/back/schema.py +++ b/back/schema.py @@ -19,8 +19,10 @@ class User(BaseModel): phone: Union[int, None] = None email: str name: Union[str, None] = None - surname: Union[str, None] = None + surname: str + class Config: + orm_mode = True class UserInDB(User): password: str diff --git a/back/utils.py b/back/utils.py index 1b8bd01..41f4bc3 100644 --- a/back/utils.py +++ b/back/utils.py @@ -42,7 +42,7 @@ 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) @@ -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", From b06306a20bc2d67c6da69c3df8f43e72394e26aa Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Thu, 20 Jul 2023 00:09:30 +0300 Subject: [PATCH 10/14] Still no result --- back/main.py | 2 +- back/utils.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/back/main.py b/back/main.py index 0d9a438..e7542a1 100644 --- a/back/main.py +++ b/back/main.py @@ -167,7 +167,7 @@ async def login_for_access_token( @app.get("/api/users/me/", response_model=schema.User) -async def read_users_me( +async def read_users_me( #!!!!!!!!!!! current_user: Annotated[User, Depends(get_current_active_user)] ): return current_user diff --git a/back/utils.py b/back/utils.py index 41f4bc3..d128168 100644 --- a/back/utils.py +++ b/back/utils.py @@ -9,7 +9,7 @@ from passlib.context import CryptContext from sqlalchemy.orm import Session from sqlalchemy import select -from .db import SessionLocal, database +from .db import Session, database from .models import UserDatabase from .schema import Token, TokenData, UserInDB, User @@ -42,14 +42,15 @@ def get_password_hash(password): # проблема здесь -def get_user(db: SessionLocal, email: str): - user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).one() +def get_user(db: Session, email: str): + user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).first() + print(user_with_required_email) if user_with_required_email: - return UserInDB(user_with_required_email) + return user_with_required_email return None -def authenticate_user(db: SessionLocal, email: str, password: str): +def authenticate_user(db: Session, email: str, password: str): user = get_user(db, email) if not user: return False @@ -69,7 +70,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)]): +async def get_current_user(db: Session, token: Annotated[str, Depends(oauth2_scheme)]): credentials_exception = HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, detail="Could not validate credentials", From d97ca1c43f6ee07f154e0296fa7a7b3a42263578 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Sun, 23 Jul 2023 22:52:31 +0300 Subject: [PATCH 11/14] Alembic installed and activated. Poems table added --- alembic.ini | 102 ++++++++++++++++++ back/base.py | 2 + back/db.py | 4 +- back/main.py | 16 ++- back/models.py | 8 +- back/service.py | 2 + back/utils.py | 18 ++-- migrations/README | 1 + migrations/env.py | 85 +++++++++++++++ migrations/script.py.mako | 24 +++++ migrations/versions/0006eca30e2c_first.py | 28 +++++ .../18001c2231e3_poems_table_added.py | 34 ++++++ ...716276b5_try_to_make_alembic_see_models.py | 70 ++++++++++++ 13 files changed, 378 insertions(+), 16 deletions(-) create mode 100644 alembic.ini create mode 100644 back/base.py create mode 100644 back/service.py create mode 100644 migrations/README create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/0006eca30e2c_first.py create mode 100644 migrations/versions/18001c2231e3_poems_table_added.py create mode 100644 migrations/versions/33c5716276b5_try_to_make_alembic_see_models.py diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 0000000..e041d95 --- /dev/null +++ b/alembic.ini @@ -0,0 +1,102 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +script_location = migrations + +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the python-dateutil library that can be +# installed by adding `alembic[tz]` to the pip requirements +# string value is passed to dateutil.tz.gettz() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the +# "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to migrations/versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "version_path_separator" below. +# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions + +# version path separator; As mentioned above, this is the character used to split +# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. +# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. +# Valid values for version_path_separator are: +# +# version_path_separator = : +# version_path_separator = ; +# version_path_separator = space +version_path_separator = os # Use os.pathsep. Default configuration used for new projects. + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +# sqlalchemy.url = driver://user:pass@localhost/dbname + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/back/base.py b/back/base.py new file mode 100644 index 0000000..eb0d312 --- /dev/null +++ b/back/base.py @@ -0,0 +1,2 @@ +from .db import Base +from .models import UserDatabase, Announcement, Trashbox \ No newline at end of file diff --git a/back/db.py b/back/db.py index cab4b6f..23d40cf 100644 --- a/back/db.py +++ b/back/db.py @@ -1,6 +1,6 @@ from typing import AsyncGenerator -from sqlalchemy import Column, Integer, String, create_engine, select +from sqlalchemy import create_engine, select # from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine from sqlalchemy.orm import sessionmaker, Session from sqlalchemy.ext.declarative import declarative_base @@ -15,7 +15,7 @@ engine = create_engine( SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False} ) -SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False, expire_on_commit=False) +SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False) database = SessionLocal() Base = declarative_base() \ No newline at end of file diff --git a/back/main.py b/back/main.py index e7542a1..0bab08c 100644 --- a/back/main.py +++ b/back/main.py @@ -36,8 +36,22 @@ if not os.path.exists("./uploads"): app.mount("/uploads", StaticFiles(directory = "./uploads")) +# Функция, создающая сессию БД при каждом запросе к нашему API. +# Срабатывает до запуска остальных функций. +# Всегда закрывает сессию при окончании работы с ней +@app.middleware("http") +async def db_session_middleware(request: Request, call_next): + response = Response("Internal server error", status_code=500) + try: + request.state.db = SessionLocal() + response = await call_next(request) + finally: + request.state.db.close() + return response + + @app.get("/api/announcements")#адрес объявлений -def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = -1): +def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = 0): # Считываем данные из Body и отображаем их на странице. # В последствии будем вставлять данные в html-форму diff --git a/back/models.py b/back/models.py index dbab143..9f7e754 100644 --- a/back/models.py +++ b/back/models.py @@ -6,7 +6,7 @@ from .db import Base class UserDatabase(Base):#класс пользователя __tablename__ = "users" - id = Column(Integer, primary_key=True, index=True)#айди пользователя + id = Column(Integer, primary_key=True, index=True, unique=True)#айди пользователя phone = Column(Integer, nullable=True)#номер телефона пользователя email = Column(String)#электронная почта пользователя password = Column(String) # пароль @@ -44,6 +44,12 @@ class Trashbox(Base):#класс мусорных баков category = Column(String)#категория продукта из объявления +class Poems(Base):#класс поэзии + __tablename__ = "poems" + + id = Column(Integer, primary_key=True, index=True) #айди + poem_text = Column(String) # текст стихотворения + # from typing import AsyncGenerator # from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine # from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase diff --git a/back/service.py b/back/service.py new file mode 100644 index 0000000..2458976 --- /dev/null +++ b/back/service.py @@ -0,0 +1,2 @@ +from sqlalchemy.orm import Session + diff --git a/back/utils.py b/back/utils.py index d128168..53dd12c 100644 --- a/back/utils.py +++ b/back/utils.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta from typing import Annotated, Union -from fastapi import Depends, FastAPI, HTTPException, status, Response +from fastapi import Depends, FastAPI, HTTPException, status, Response, Request from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from jose import JWTError, jwt from passlib.context import CryptContext @@ -19,16 +19,6 @@ ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 -# fake_users_db = { -# "johndoe": { -# "email": "johndoe", -# "full_name": "John Doe", -# "email": "johndoe@example.com", -# "hashed_password": "$2b$12$EixZaYVK1fsbw1ZfbX3OXePaWxn96p36WQoeG6Lruj3vjPGga31lW", -# "disabled": False, -# } -# } - pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token") @@ -95,4 +85,8 @@ async def get_current_active_user( ): if current_user.disabled: raise HTTPException(status_code=400, detail="Inactive user") - return current_user \ No newline at end of file + return current_user + + +def get_db(request: Request): + return request.state.db \ No newline at end of file diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..692d4b8 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,85 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + + +from back import db, base + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = base.Base.metadata +# target_metadata = None + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + # url = config.get_main_option("sqlalchemy.url") + url = config.get_main_option(db.SQLALCHEMY_DATABASE_URL) + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + configuration = config.get_section(config.config_ini_section) + configuration['sqlalchemy.url'] = db.SQLALCHEMY_DATABASE_URL + connectable = engine_from_config( + configuration, + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/0006eca30e2c_first.py b/migrations/versions/0006eca30e2c_first.py new file mode 100644 index 0000000..4f379a7 --- /dev/null +++ b/migrations/versions/0006eca30e2c_first.py @@ -0,0 +1,28 @@ +"""first + +Revision ID: 0006eca30e2c +Revises: +Create Date: 2023-07-23 22:32:43.496939 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0006eca30e2c' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/migrations/versions/18001c2231e3_poems_table_added.py b/migrations/versions/18001c2231e3_poems_table_added.py new file mode 100644 index 0000000..78675aa --- /dev/null +++ b/migrations/versions/18001c2231e3_poems_table_added.py @@ -0,0 +1,34 @@ +"""Poems table added + +Revision ID: 18001c2231e3 +Revises: 33c5716276b5 +Create Date: 2023-07-23 22:50:16.055961 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '18001c2231e3' +down_revision = '33c5716276b5' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('poems', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('poem_text', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_poems_id'), 'poems', ['id'], unique=False) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_poems_id'), table_name='poems') + op.drop_table('poems') + # ### end Alembic commands ### diff --git a/migrations/versions/33c5716276b5_try_to_make_alembic_see_models.py b/migrations/versions/33c5716276b5_try_to_make_alembic_see_models.py new file mode 100644 index 0000000..84de522 --- /dev/null +++ b/migrations/versions/33c5716276b5_try_to_make_alembic_see_models.py @@ -0,0 +1,70 @@ +"""Try to make alembic see models + +Revision ID: 33c5716276b5 +Revises: 0006eca30e2c +Create Date: 2023-07-23 22:42:07.532395 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '33c5716276b5' +down_revision = '0006eca30e2c' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('announcements', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('category', sa.String(), nullable=True), + sa.Column('best_by', sa.Integer(), nullable=True), + sa.Column('address', sa.String(), nullable=True), + sa.Column('longtitude', sa.Integer(), nullable=True), + sa.Column('latitude', sa.Integer(), nullable=True), + sa.Column('description', sa.String(), nullable=True), + sa.Column('src', sa.String(), nullable=True), + sa.Column('metro', sa.String(), nullable=True), + sa.Column('trashId', sa.Integer(), nullable=True), + sa.Column('booked_by', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_announcements_id'), 'announcements', ['id'], unique=False) + op.create_table('trashboxes', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('address', sa.String(), nullable=True), + sa.Column('latitude', sa.Integer(), nullable=True), + sa.Column('longtitude', sa.Integer(), nullable=True), + sa.Column('category', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_trashboxes_id'), 'trashboxes', ['id'], unique=False) + op.create_table('users', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('phone', sa.Integer(), nullable=True), + sa.Column('email', sa.String(), nullable=True), + sa.Column('password', sa.String(), nullable=True), + sa.Column('hashed_password', sa.String(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('surname', sa.String(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_users_id'), table_name='users') + op.drop_table('users') + op.drop_index(op.f('ix_trashboxes_id'), table_name='trashboxes') + op.drop_table('trashboxes') + op.drop_index(op.f('ix_announcements_id'), table_name='announcements') + op.drop_table('announcements') + # ### end Alembic commands ### From 904b00059f6d320e7d93610458573582132fc57f Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Mon, 24 Jul 2023 07:07:36 +0300 Subject: [PATCH 12/14] Trying to change models --- back/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/back/models.py b/back/models.py index 9f7e754..ba4ca55 100644 --- a/back/models.py +++ b/back/models.py @@ -1,8 +1,14 @@ from sqlalchemy import Column, Integer, String - +from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase from fastapi import Depends from .db import Base + +class User(SQLAlchemyBaseUserTableUUID, Base): + pass + + + class UserDatabase(Base):#класс пользователя __tablename__ = "users" From dd719a20ecbfb81314e8a6db32aa8ff2e7cc0e6a Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Wed, 26 Jul 2023 00:56:22 +0300 Subject: [PATCH 13/14] Auth. was fixed. Problem is in getting curr. user --- back/main.py | 44 +++++++++++++++++++++++--------------------- back/models.py | 6 +++--- back/schema.py | 19 ++++++++++++++++++- back/utils.py | 33 ++++++++++++++++++--------------- 4 files changed, 62 insertions(+), 40 deletions(-) diff --git a/back/main.py b/back/main.py index 0bab08c..e61031c 100644 --- a/back/main.py +++ b/back/main.py @@ -39,15 +39,15 @@ app.mount("/uploads", StaticFiles(directory = "./uploads")) # Функция, создающая сессию БД при каждом запросе к нашему API. # Срабатывает до запуска остальных функций. # Всегда закрывает сессию при окончании работы с ней -@app.middleware("http") -async def db_session_middleware(request: Request, call_next): - response = Response("Internal server error", status_code=500) - try: - request.state.db = SessionLocal() - response = await call_next(request) - finally: - request.state.db.close() - return response +# @app.middleware("http") +# async def db_session_middleware(request: Request, call_next): +# response = Response("Internal server error", status_code=500) +# try: +# request.state.db = SessionLocal() +# response = await call_next(request) +# finally: +# request.state.db.close() +# return response @app.get("/api/announcements")#адрес объявлений @@ -150,10 +150,12 @@ def change_book_status(data: schema.Book): return {"Success": False} # reginstration +# {"id":1, "email":"poopka@mail.ru", "password":"good", "name":"Vasya", "surname":"Poopkin"} @app.post("/api/signup") def create_user(data = Body()): if database.query(UserDatabase).filter(UserDatabase.email == data["email"]).first() == None: - new_user = UserDatabase(id=data["id"], email=data["email"], password=data["password"], name=data["name"], surname=data["surname"]) + new_user = UserDatabase(id=data["id"], email=data["email"], password=data["password"], + hashed_password=get_password_hash(data["password"]), name=data["name"], surname=data["surname"]) database.add(new_user) database.commit() database.refresh(new_user) # обновляем состояние объекта @@ -177,21 +179,21 @@ async def login_for_access_token( access_token = create_access_token( data={"user_id": user.id}, expires_delta=access_token_expires ) - return access_token + return {"access_token":access_token} -@app.get("/api/users/me/", response_model=schema.User) -async def read_users_me( #!!!!!!!!!!! - current_user: Annotated[User, Depends(get_current_active_user)] -): - return current_user +# @app.get("/api/users/me/", response_model=schema.User) +# async def read_users_me( #!!!!!!!!!!! +# current_user: Annotated[schema.User, Depends(get_current_active_user)] +# ): +# return {"data": current_user} -@app.get("/api/users/me/items/") -async def read_own_items( - current_user: Annotated[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[schema.User, Depends(get_current_active_user)] +# ): +# return [{"Current user name": current_user.name, "Current user surname": current_user.surname}] diff --git a/back/models.py b/back/models.py index ba4ca55..f1c0039 100644 --- a/back/models.py +++ b/back/models.py @@ -1,11 +1,11 @@ from sqlalchemy import Column, Integer, String from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase from fastapi import Depends -from .db import Base +from .db import Base, engine -class User(SQLAlchemyBaseUserTableUUID, Base): - pass +# class User(SQLAlchemyBaseUserTableUUID, Base): +# name = Column(String, nullable=True)#имя пользователя diff --git a/back/schema.py b/back/schema.py index dc71245..a563691 100644 --- a/back/schema.py +++ b/back/schema.py @@ -1,3 +1,20 @@ +# import uuid + +# from fastapi_users import schemas + + +# class UserRead(schema.BaseUser[uuid.UUID]): +# pass + + +# class UserCreate(schema.BaseUserCreate): +# pass + + +# class UserUpdate(schema.BaseUserUpdate): +# pass + + from pydantic import BaseModel from typing import Annotated, Union @@ -7,7 +24,7 @@ class Book(BaseModel): class Token(BaseModel): access_token: str - token_type: str + # token_type: str class TokenData(BaseModel): diff --git a/back/utils.py b/back/utils.py index 53dd12c..3b419cd 100644 --- a/back/utils.py +++ b/back/utils.py @@ -9,20 +9,20 @@ from passlib.context import CryptContext from sqlalchemy.orm import Session from sqlalchemy import select -from .db import Session, database +# from .db import Session, database from .models import UserDatabase - from .schema import Token, TokenData, UserInDB, User -SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7" + + + +SECRET_KEY = "SECRET" ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 - - pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") - oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token") + def verify_password(plain_password, hashed_password): return pwd_context.verify(plain_password, hashed_password) @@ -33,11 +33,7 @@ def get_password_hash(password): # проблема здесь def get_user(db: Session, email: str): - user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).first() - print(user_with_required_email) - if user_with_required_email: - return user_with_required_email - return None + return db.query(UserDatabase).filter(UserDatabase.email == email).first() def authenticate_user(db: Session, email: str, password: str): @@ -74,8 +70,8 @@ async def get_current_user(db: Session, token: Annotated[str, Depends(oauth2_sch token_data = TokenData(email=email) except JWTError: raise credentials_exception - user = get_user(db, email=token_data.email) - if user == None: + user = get_user(db=db, email=token_data.email) + if user is None: raise credentials_exception return user @@ -88,5 +84,12 @@ async def get_current_active_user( return current_user -def get_db(request: Request): - return request.state.db \ No newline at end of file +# def get_db(request: Request): +# return request.state.db + +# def get_db(): +# db = SessionLocal() +# try: +# yield db +# finally: +# db.close() \ No newline at end of file From 6bb7ab5ce9378827c02bbb388199943b08fe19f0 Mon Sep 17 00:00:00 2001 From: DmitryGantimurov Date: Thu, 27 Jul 2023 18:55:30 +0300 Subject: [PATCH 14/14] Auth is working. Disabled field added (models) --- back/main.py | 1 - back/models.py | 3 +- back/schema.py | 1 + back/utils.py | 4 +-- ...new_colomn_disabled_added_to_user_table.py | 28 +++++++++++++++++++ 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 migrations/versions/daffcb4729af_new_colomn_disabled_added_to_user_table.py diff --git a/back/main.py b/back/main.py index e61031c..831d364 100644 --- a/back/main.py +++ b/back/main.py @@ -167,7 +167,6 @@ 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) if not user: raise HTTPException( diff --git a/back/models.py b/back/models.py index f1c0039..357e77a 100644 --- a/back/models.py +++ b/back/models.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, Integer, String +from sqlalchemy import Column, Integer, String, Boolean from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase from fastapi import Depends from .db import Base, engine @@ -19,6 +19,7 @@ class UserDatabase(Base):#класс пользователя hashed_password = Column(String) name = Column(String, nullable=True)#имя пользователя surname = Column(String)#фамилия пользователя + disabled = Column(Boolean, default=True) class Announcement(Base): #класс объявления diff --git a/back/schema.py b/back/schema.py index a563691..56e839f 100644 --- a/back/schema.py +++ b/back/schema.py @@ -37,6 +37,7 @@ class User(BaseModel): email: str name: Union[str, None] = None surname: str + disabled: Union[bool, None] = None class Config: orm_mode = True diff --git a/back/utils.py b/back/utils.py index 3b419cd..3f3af8d 100644 --- a/back/utils.py +++ b/back/utils.py @@ -73,11 +73,11 @@ async def get_current_user(db: Session, token: Annotated[str, Depends(oauth2_sch user = get_user(db=db, email=token_data.email) if user is None: raise credentials_exception - return user + return UserInDB(user) async def get_current_active_user( - current_user: Annotated[User, Depends(get_current_user)] + current_user: Annotated[UserInDB, Depends(get_current_user)] ): if current_user.disabled: raise HTTPException(status_code=400, detail="Inactive user") diff --git a/migrations/versions/daffcb4729af_new_colomn_disabled_added_to_user_table.py b/migrations/versions/daffcb4729af_new_colomn_disabled_added_to_user_table.py new file mode 100644 index 0000000..b6abe04 --- /dev/null +++ b/migrations/versions/daffcb4729af_new_colomn_disabled_added_to_user_table.py @@ -0,0 +1,28 @@ +"""new colomn (disabled) added to user table + +Revision ID: daffcb4729af +Revises: 18001c2231e3 +Create Date: 2023-07-26 23:54:22.640750 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'daffcb4729af' +down_revision = '18001c2231e3' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('disabled', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'disabled') + # ### end Alembic commands ###