entrouvert
/
mandayejs
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

archimed: return Response in Publik Api Response format(#14967)

This commit is contained in:
Josue Kouka 2017-02-15 15:26:55 +01:00
parent bf13a76532
commit e6a1342392
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mandayejs/views.py
View File

@ -32,6 +32,14 @@ class ArchimedAccountDetails(APIView):
"""Archimed user's account details
"""
def dispatch(self, request, *args, **kwargs):
response = super(ArchimedAccountDetails, self).dispatch(request, *args, **kwargs)
if response.status_code == 200:
response.data = {'data': response.data, 'err': 0}
else:
response.data = {'data': None, 'err': 1, 'err_desc': response.data}
return response
def get(self, request, *args, **kwargs):
logger = logging.getLogger(__name__)
app_settings = get_app_settings()
@ -43,15 +51,12 @@ class ArchimedAccountDetails(APIView):
try:
user = User.objects.get(username=username)
except (User.DoesNotExist,):
return Response({'message': 'User %s does not exist' % username,
'success': False}, status=status.HTTP_404_NOT_FOUND)
return Response('User %s does not exist' % username, status=status.HTTP_404_NOT_FOUND)
try:
credentials = UserCredentials.objects.get(user=user)
except (UserCredentials.DoesNotExist,):
return Response({
'message': 'User %s is not associated' % username,
'success': False}, status=status.HTTP_404_NOT_FOUND)
return Response('User %s is not associated' % username, status=status.HTTP_404_NOT_FOUND)
login_url = request.build_absolute_uri(
'/DEFAULT/Ermes/Recherche/logon.svc/logon')
@ -62,8 +67,7 @@ class ArchimedAccountDetails(APIView):
response = session.post(login_url, data=login_info)
logger.debug("Archimed login response {}".format(response.json()))
if not response.json()['success']:
return Response({'message': 'Authentication failed',
'success': False}, status=status.HTTP_401_UNAUTHORIZED)
return Response('Authentication failed', status=status.HTTP_401_UNAUTHORIZED)
content = {
'codeConfig': '',

16
tests/test_archimed.py
View File

@ -41,16 +41,16 @@ def test_archimed_ws(mocked_get_app_settings, mocked_requests_post):
client.login(username='kevin', password='kevin')
response = client.get('/_mandaye/ws/account/whatever/')
assert response.status_code == 404
assert json.loads(response.content)['message'] == 'User whatever does not exist'
assert json.loads(response.content)['success'] is False
assert json.loads(response.content)['err_desc'] == 'User whatever does not exist'
assert json.loads(response.content)['err'] == 1
# test with unlinked user
client = Client()
client.login(username='kevin', password='kevin')
response = client.get('/_mandaye/ws/account/kevin/')
assert response.status_code == 404
assert json.loads(response.content)['message'] == 'User kevin is not associated'
assert json.loads(response.content)['success'] is False
assert json.loads(response.content)['err_desc'] == 'User kevin is not associated'
assert json.loads(response.content)['err'] == 1
create_credentials(user, {'carte': 'kevin', 'code': 'whatever'})
# test with wrong credentials
@ -58,12 +58,12 @@ def test_archimed_ws(mocked_get_app_settings, mocked_requests_post):
client.login(username='kevin', password='kevin')
response = client.get('/_mandaye/ws/account/kevin/')
assert response.status_code == 401
assert json.loads(response.content)['message'] == 'Authentication failed'
assert json.loads(response.content)['success'] is False
assert json.loads(response.content)['err_desc'] == 'Authentication failed'
assert json.loads(response.content)['err'] == 1
# test with good credentials
client.login(username='kevin', password='kevin')
response = client.get('/_mandaye/ws/account/kevin/')
assert response.status_code == 200
assert json.loads(response.content)['message'] == 'Whatever is whatever'
assert json.loads(response.content)['success'] is True
assert json.loads(response.content)['data']['message'] == 'Whatever is whatever'
assert json.loads(response.content)['data']['success'] is True