mirror of
https://github.com/kevin-DL/full-stack-fastapi-postgresql.git
synced 2026-01-14 19:14:44 +00:00
Refactor/upgrade backend and frontend parts (#2)
* ♻️ Refactor and simplify backend code * ♻️ Refactor frontend state, integrate typesafe-vuex accessors into state files * ♻️ Use new state accessors and standardize layout * 🔒 Upgrade and fix npm security audit * 🔧 Update local re-generation scripts * 🔊 Log startup exceptions to detect errors early * ✏️ Fix password reset token content * 🔥 Remove unneeded Dockerfile directives * 🔥 Remove unnecessary print * 🔥 Remove unnecessary code, upgrade dependencies in backend * ✏️ Fix typos in docstrings and comments * 🏗️ Improve user Depends utilities to simplify and remove code * 🔥 Remove deprecated SQLAlchemy parameter
This commit is contained in:
committed by
GitHub
parent
9e0b826618
commit
cd112bd683
@@ -1,7 +1,7 @@
|
||||
import requests
|
||||
|
||||
from app import crud
|
||||
from app.core import config
|
||||
from app.crud import user as crud_user
|
||||
from app.db.session import db_session
|
||||
from app.models.user import UserInCreate
|
||||
from app.tests.utils.user import user_authentication_headers
|
||||
@@ -32,7 +32,7 @@ def test_create_user_new_email(superuser_token_headers):
|
||||
)
|
||||
assert 200 <= r.status_code < 300
|
||||
created_user = r.json()
|
||||
user = crud_user.get_by_email(db_session, email=username)
|
||||
user = crud.user.get_by_email(db_session, email=username)
|
||||
assert user.email == created_user["email"]
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ def test_get_existing_user(superuser_token_headers):
|
||||
username = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
user_id = user.id
|
||||
r = requests.get(
|
||||
f"{server_api}{config.API_V1_STR}/users/{user_id}",
|
||||
@@ -49,7 +49,7 @@ def test_get_existing_user(superuser_token_headers):
|
||||
)
|
||||
assert 200 <= r.status_code < 300
|
||||
api_user = r.json()
|
||||
user = crud_user.get_by_email(db_session, email=username)
|
||||
user = crud.user.get_by_email(db_session, email=username)
|
||||
assert user.email == api_user["email"]
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ def test_create_user_existing_username(superuser_token_headers):
|
||||
# username = email
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
data = {"email": username, "password": password}
|
||||
r = requests.post(
|
||||
f"{server_api}{config.API_V1_STR}/users/",
|
||||
@@ -76,7 +76,7 @@ def test_create_user_by_normal_user():
|
||||
username = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
user_token_headers = user_authentication_headers(server_api, username, password)
|
||||
data = {"email": username, "password": password}
|
||||
r = requests.post(
|
||||
@@ -90,12 +90,12 @@ def test_retrieve_users(superuser_token_headers):
|
||||
username = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
|
||||
username2 = random_lower_string()
|
||||
password2 = random_lower_string()
|
||||
user_in2 = UserInCreate(email=username2, password=password2)
|
||||
user2 = crud_user.create(db_session, user_in=user_in2)
|
||||
user2 = crud.user.create(db_session, user_in=user_in2)
|
||||
|
||||
r = requests.get(
|
||||
f"{server_api}{config.API_V1_STR}/users/", headers=superuser_token_headers
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from fastapi.encoders import jsonable_encoder
|
||||
|
||||
from app.crud import user as crud_user
|
||||
from app import crud
|
||||
from app.db.session import db_session
|
||||
from app.models.user import UserInCreate
|
||||
from app.tests.utils.utils import random_lower_string
|
||||
@@ -10,7 +10,7 @@ def test_create_user():
|
||||
email = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=email, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
assert user.email == email
|
||||
assert hasattr(user, "hashed_password")
|
||||
|
||||
@@ -19,8 +19,8 @@ def test_authenticate_user():
|
||||
email = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=email, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
authenticated_user = crud_user.authenticate(
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
authenticated_user = crud.user.authenticate(
|
||||
db_session, email=email, password=password
|
||||
)
|
||||
assert authenticated_user
|
||||
@@ -30,16 +30,16 @@ def test_authenticate_user():
|
||||
def test_not_authenticate_user():
|
||||
email = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user = crud_user.authenticate(db_session, email=email, password=password)
|
||||
assert user is False
|
||||
user = crud.user.authenticate(db_session, email=email, password=password)
|
||||
assert user is None
|
||||
|
||||
|
||||
def test_check_if_user_is_active():
|
||||
email = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=email, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
is_active = crud_user.is_active(user)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
is_active = crud.user.is_active(user)
|
||||
assert is_active is True
|
||||
|
||||
|
||||
@@ -48,9 +48,9 @@ def test_check_if_user_is_active_inactive():
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=email, password=password, disabled=True)
|
||||
print(user_in)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
print(user)
|
||||
is_active = crud_user.is_active(user)
|
||||
is_active = crud.user.is_active(user)
|
||||
print(is_active)
|
||||
assert is_active
|
||||
|
||||
@@ -59,8 +59,8 @@ def test_check_if_user_is_superuser():
|
||||
email = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=email, password=password, is_superuser=True)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
is_superuser = crud_user.is_superuser(user)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
is_superuser = crud.user.is_superuser(user)
|
||||
assert is_superuser is True
|
||||
|
||||
|
||||
@@ -68,8 +68,8 @@ def test_check_if_user_is_superuser_normal_user():
|
||||
username = random_lower_string()
|
||||
password = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
is_superuser = crud_user.is_superuser(user)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
is_superuser = crud.user.is_superuser(user)
|
||||
assert is_superuser is False
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ def test_get_user():
|
||||
password = random_lower_string()
|
||||
username = random_lower_string()
|
||||
user_in = UserInCreate(email=username, password=password, is_superuser=True)
|
||||
user = crud_user.create(db_session, user_in=user_in)
|
||||
user_2 = crud_user.get(db_session, user_id=user.id)
|
||||
user = crud.user.create(db_session, user_in=user_in)
|
||||
user_2 = crud.user.get(db_session, user_id=user.id)
|
||||
assert user.email == user_2.email
|
||||
assert jsonable_encoder(user) == jsonable_encoder(user_2)
|
||||
|
||||
Reference in New Issue
Block a user