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

Make prepare_request() asynchronous #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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 aiohttp_json_rpc/auth/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class AuthBackend:


class DummyAuthBackend(AuthBackend):
def prepare_request(self, request):
async def prepare_request(self, request):
request.methods = request.rpc.methods
request.topics = set(request.rpc.topics.keys())
request.subscriptions = set()
Expand Down
4 changes: 2 additions & 2 deletions aiohttp_json_rpc/auth/django.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ async def login(self, request):
)

# rediscover methods and topics
self.prepare_request(request.http_request, user=user)
await self.prepare_request(request.http_request, user=user)

return True

# request processing
def prepare_request(self, request, user=None):
async def prepare_request(self, request, user=None):
request.user = user or self.get_user(request)
request.methods = {}

Expand Down
6 changes: 3 additions & 3 deletions aiohttp_json_rpc/auth/passwd.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def _is_authorized(self, request, method):

return True

def prepare_request(self, request):
async def prepare_request(self, request):
if not hasattr(request, 'user'):
request.user = None

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

# rediscover methods
self.prepare_request(request.http_request)
await self.prepare_request(request.http_request)

return bool(request.http_request.user)

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

self.prepare_request(request.http_request)
await self.prepare_request(request.http_request)

return True

Expand Down
2 changes: 1 addition & 1 deletion aiohttp_json_rpc/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def __call__(self, request):
async def handle_request(self, request):
# prepare request
request.rpc = self
self.auth_backend.prepare_request(request)
await self.auth_backend.prepare_request(request)

# handle request
if request.method == 'GET':
Expand Down