Merge branch 'groups' into 22.05

Author: HadleyKing

admin_only/db.sqlite3.dev

@@ -4,6 +4,8 @@
 
 import json
 import requests
+from rest_framework import status
+from rest_framework.response import Response
 from core.serializers import UserSerializer
 from core.models import ApiInfo
 
@@ -13,11 +15,24 @@ def update_api_info(api):
     url = api['public_hostname']+'/api/accounts/describe/'
     token = api['token']
     header =  {'Authorization': f'Token {token}'}
-    try: 
+
+    try:
         response = requests.post(url, headers=header)
     except requests.exceptions.ConnectionError:
-        return 'ConncetionError'
-    return json.loads(response.text)
+        return Response(status=status.HTTP_503_SERVICE_UNAVAILABLE,
+                data='ConnectionError'
+        )
+
+    if response.status_code == 401:
+        return Response(status=status.HTTP_401_UNAUTHORIZED,
+                data=json.loads(response.text)
+        )
+    if response.status_code is 400:
+        return Response(status=status.HTTP_400_BAD_REQUEST,
+                data=json.loads(response.text)
+        )
+
+    return Response(status=status.HTTP_200_OK, data=json.loads(response.text))
 
 def my_jwt_response_handler(token, user=None, request=None):
     """JWT
@@ -29,13 +44,16 @@ def my_jwt_response_handler(token, user=None, request=None):
 
     user_info = UserSerializer(user, context={'request': request}).data
     for api in user_info['apiinfo']:
-        updated_api = update_api_info(api)
-        if updated_api != 'ConncetionError':
-            new = ApiInfo.objects.get(token=updated_api['token'])
-            new.other_info = updated_api['other_info']
-            new.save()
-        # print(new.other_info)
+        api_object = ApiInfo.objects.get(token=api['token'])
+        api_update = update_api_info(api)
+        if api_update.status_code == 200:
+            # import pdb; pdb.set_trace()
+            api_object.other_info = api_update.data['other_info']
+
+        api_object.other_info['status'] = api_update.status_code
+        api_object.save()
 
+    # print(api_object.other_info)
     user_info['groups'] = [list(i.items())[0][1] for i in user_info['groups']]
 
     return {'token': token, 'user': user_info}