промежуточный коммит

Author: petrCher

auth_backend/auth_method/oauth.py

@@ -1,13 +1,16 @@
 import logging
 from abc import abstractmethod
 
+from event_schema.auth import UserInfo, UserLogin, UserLoginKey
 from fastapi import Depends
+from fastapi.background import BackgroundTasks
 from fastapi_sqlalchemy import db
 from sqlalchemy.orm import Session as DbSession
 
 from auth_backend.auth_method import AUTH_METHODS, LoginableMixin
 from auth_backend.base import Base
 from auth_backend.exceptions import LastAuthMethodDelete
+from auth_backend.kafka.kafka import get_kafka_producer
 from auth_backend.models.db import AuthMethod, User, UserSession
 from auth_backend.utils.security import UnionAuth
 
@@ -44,13 +47,23 @@ async def _auth_url(*args, **kwargs) -> UrlSchema:
         raise NotImplementedError()
 
     @classmethod
-    async def _unregister(cls, user_session: UserSession = Depends(UnionAuth(scopes=[], auto_error=True))):
+    async def _unregister(
+        cls,
+        background_tasks: BackgroundTasks,
+        user_session: UserSession = Depends(UnionAuth(scopes=[], auto_error=True)),
+    ):
         """Отключает для пользователя метод входа"""
         old_user = {"user_id": user_session.user.id}
         new_user = {"user_id": user_session.user.id}
         old_user_params = await cls._delete_auth_methods(user_session.user, db_session=db.session)
         old_user[cls.get_name()] = old_user_params
         await AuthPluginMeta.user_updated(new_user, old_user)
+        background_tasks.add_task(
+            get_kafka_producer().produce,
+            cls.settings.KAFKA_USER_LOGIN_TOPIC_NAME,
+            UserLoginKey(user_id=user_session.user.id),
+            UserLogin(source=cls.get_name(), items=[UserInfo(category="Контакты", param="", value=None)]),
+        )
         return None
 
     @classmethod

auth_backend/auth_method/outer.py

@@ -2,16 +2,13 @@
 from abc import ABCMeta, abstractmethod
 from typing import Any
 
-from event_schema.auth import UserInfo, UserLogin, UserLoginKey
 from fastapi import Depends
-from fastapi.background import BackgroundTasks
 from fastapi.exceptions import HTTPException
 from fastapi_sqlalchemy import db
 from starlette.status import HTTP_403_FORBIDDEN, HTTP_404_NOT_FOUND, HTTP_409_CONFLICT, HTTP_424_FAILED_DEPENDENCY
 
 from auth_backend.auth_method.base import AuthPluginMeta
 from auth_backend.base import Base
-from auth_backend.kafka.kafka import get_kafka_producer
 from auth_backend.models.db import AuthMethod, UserSession
 from auth_backend.utils.security import UnionAuth
 
@@ -200,7 +197,6 @@ async def _link(
     async def _unlink(
         cls,
         user_id: int,
-        background_tasks: BackgroundTasks,
         request_user: UserSession = Depends(UnionAuth()),
     ):
         """Отвязать внешний аккаунт пользователю
@@ -214,11 +210,3 @@ async def _unlink(
             raise UserNotLinked(user_id)
         username.is_deleted = True
         db.session.commit()
-        background_tasks.add_task(
-            get_kafka_producer().produce,
-            cls.settings.KAFKA_USER_LOGIN_TOPIC_NAME,
-            UserLoginKey(user_id=user_id),
-            UserLogin(
-                source=cls.get_name(), items=[UserInfo(category=username.auth_method, param=username.param, value=None)]
-            ),
-        )