Skip to content
This repository was archived by the owner on Oct 1, 2021. It is now read-only.

Commit cd57d7a

Browse files
Make prepare_request() asynchronous
1 parent eef76f0 commit cd57d7a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

aiohttp_json_rpc/auth/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class AuthBackend:
33

44

55
class DummyAuthBackend(AuthBackend):
6-
def prepare_request(self, request):
6+
async def prepare_request(self, request):
77
request.methods = request.rpc.methods
88
request.topics = set(request.rpc.topics.keys())
99
request.subscriptions = set()

aiohttp_json_rpc/auth/django.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,12 @@ async def login(self, request):
175175
)
176176

177177
# rediscover methods and topics
178-
self.prepare_request(request.http_request, user=user)
178+
await self.prepare_request(request.http_request, user=user)
179179

180180
return True
181181

182182
# request processing
183-
def prepare_request(self, request, user=None):
183+
async def prepare_request(self, request, user=None):
184184
request.user = user or self.get_user(request)
185185
request.methods = {}
186186

aiohttp_json_rpc/auth/passwd.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def _is_authorized(self, request, method):
126126

127127
return True
128128

129-
def prepare_request(self, request):
129+
async def prepare_request(self, request):
130130
if not hasattr(request, 'user'):
131131
request.user = None
132132

@@ -175,7 +175,7 @@ async def login(self, request):
175175
await loop.run_in_executor(None, self._login, username, password))
176176

177177
# rediscover methods
178-
self.prepare_request(request.http_request)
178+
await self.prepare_request(request.http_request)
179179

180180
return bool(request.http_request.user)
181181

@@ -184,7 +184,7 @@ async def logout(self, request):
184184
request.http_request.user = None
185185
request.http_request.permissions = set()
186186

187-
self.prepare_request(request.http_request)
187+
await self.prepare_request(request.http_request)
188188

189189
return True
190190

aiohttp_json_rpc/rpc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def __call__(self, request):
253253
async def handle_request(self, request):
254254
# prepare request
255255
request.rpc = self
256-
self.auth_backend.prepare_request(request)
256+
await self.auth_backend.prepare_request(request)
257257

258258
# handle request
259259
if request.method == 'GET':

0 commit comments

Comments
 (0)