Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auth_backend/routes/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ async def delete_user(
# Удаляем AuthMethod
AuthMethod.delete(method.id, session=db.session)
logger.info(f'{method=} for {user.id=} deleted')

User.delete(user_id, session=db.session)
db.session.commit()
await AuthPluginMeta.user_updated(None, old_user)
logger.info(f'{user=} deleted')
22 changes: 21 additions & 1 deletion tests/test_routes/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from sqlalchemy.orm import Session

from auth_backend.models import AuthMethod, User
from auth_backend.models.db import Group
from auth_backend.models.db import Group, GroupScope, UserGroup


def test_user_email(client: TestClient, dbsession: Session, user_factory):
Expand All @@ -23,3 +23,23 @@ def test_user_email(client: TestClient, dbsession: Session, user_factory):
gr = Group.get(group, session=dbsession)
dbsession.delete(gr)
dbsession.commit()


def test_delete_user(client: TestClient, dbsession: Session, user_factory):
user1 = user_factory(client)
time1 = datetime.utcnow()
email_user = AuthMethod(user_id=user1, param="email", auth_method="email", value="testemailx@x.xy")
dbsession.add(email_user)
dbsession.commit()
body = {"name": f"group{time1}", "parent_id": None, "scopes": []}
group = client.post(url="/group", json=body).json()["id"]
client.patch(f"/user/{user1}", json={"groups": [group]})
resp = client.delete(f"user/{user1}")
assert resp.status_code == 200
user = dbsession.query(User).filter(User.id == user1).one_or_none()
assert user.is_deleted
dbsession.delete(email_user)
dbsession.query(GroupScope).filter(GroupScope.group_id == group).delete()
dbsession.query(UserGroup).filter(UserGroup.group_id == group).delete()
dbsession.query(Group).filter(Group.id == group).delete()
dbsession.commit()