ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5738 from FinnStutzenstein/fixGetWhoAmIError

Browse Source 
Fix error handling in WhoAmI data view
This commit is contained in:
Finn Stutzenstein 2020-11-30 13:44:29 +01:00 committed by GitHub
commit 652b727386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/openslides/users/views.py
View File

@ -36,6 +36,7 @@ from ..utils.auth import (
from ..utils.autoupdate import AutoupdateElement, inform_changed_data, inform_elements from ..utils.autoupdate import AutoupdateElement, inform_changed_data, inform_elements
from ..utils.cache import element_cache from ..utils.cache import element_cache
from ..utils.rest_api import ( from ..utils.rest_api import (
APIException,
ModelViewSet, ModelViewSet,
Response, Response,
SimpleMetadata, SimpleMetadata,
@ -858,9 +859,8 @@ class WhoAmIDataView(APIView):
self.request.user.get_collection_string(), user_id self.request.user.get_collection_string(), user_id
) )
if user_full_data is None: if user_full_data is None:
return Response( raise APIException(f"Could not find user {user_id}", 500)
{"detail": "Cache offline, could not fetch user"}, status=500
)
auth_type = user_full_data["auth_type"] auth_type = user_full_data["auth_type"]
user_data = async_to_sync(element_cache.restrict_element_data)( user_data = async_to_sync(element_cache.restrict_element_data)(
user_full_data, self.request.user.get_collection_string(), user_id user_full_data, self.request.user.get_collection_string(), user_id

1
server/openslides/utils/rest_api.py
View File

@ -51,6 +51,7 @@ from .cache import element_cache
__all__ = [ __all__ = [
"APIException",
"detail_route", "detail_route",
"DecimalField", "DecimalField",
"list_route", "list_route",