From 7d6b57239331d9639c07828a250a0af62bade2cf Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Wed, 15 Feb 2017 08:57:25 +0100 Subject: [PATCH 2/2] return explicite errors (#14967) --- mandayejs/views.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mandayejs/views.py b/mandayejs/views.py index 04368ac..8e76da3 100644 --- a/mandayejs/views.py +++ b/mandayejs/views.py @@ -20,8 +20,6 @@ import logging import requests from django.contrib.auth.models import User -from django.shortcuts import get_object_or_404 - from rest_framework import status from rest_framework.views import APIView from rest_framework.response import Response @@ -41,8 +39,16 @@ class ArchimedAccountDetails(APIView): app_settings.SITE_WS_ENDPOINT['account_details']) username = kwargs['username'] - user = get_object_or_404(User, username=username) - credentials = get_object_or_404(UserCredentials, user=user) + # user = get_object_or_404(User, username=username) + try: + user = User.objects.get(username=username) + except (User.DoesNotExist,): + return Response('User %s does not exist' % username, status=status.HTTP_404_NOT_FOUND) + # credentials = get_object_or_404(UserCredentials, user=user) + try: + credentials = UserCredentials.objects.get(user=user) + except (UserCredentials.DoesNotExist,): + 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') -- 2.11.0