190 build попытка 2

hockey_data/auth_bridge.py

@@ -21,10 +21,7 @@ from .database import HockeyDatabase
 from .async_work import run_db
 from .models import HockeyWebSession
 from .account_activity import ACCOUNT_IDLE_SECONDS, lock_account
-<<<<<<< HEAD
 from .program_log import set_log_context
-=======
->>>>>>> e4bedb1264fca8a6bc8a41f0ca1ff67b176c6651
 
 
 HOCKEY_COOKIE_NAME = "hockey_auth_token"
@@ -317,7 +314,6 @@ class HockeyAuthDependencies:
         self.adapter = adapter
 
     async def optional_user(self, request: Request) -> HockeyUser | None:
-<<<<<<< HEAD
         user = getattr(request.state, "wfl_user", None)
         if user is None:
             user = await self.adapter.current_user(request)
@@ -325,9 +321,6 @@ class HockeyAuthDependencies:
             request.state.wfl_user = user
             set_log_context(actor_id=user.id, actor_login=user.login)
         return user
-=======
-        return await self.adapter.current_user(request)
->>>>>>> e4bedb1264fca8a6bc8a41f0ca1ff67b176c6651
 
     async def require_user(self, request: Request) -> HockeyUser:
         user = await self.optional_user(request)