Merge pull request #21 from biocompute-objects/22.05

22.05

Author: HadleyKing

admin_only/db.sqlite3.dev

@@ -1,18 +1,18 @@
-from django.db.models.query import QuerySet
+#!/usr/bin/env python3
+"""Custom Serializers
+"""
 from rest_framework import serializers
 from rest_framework_jwt.settings import api_settings
 from django.contrib.auth.models import User
-
-# API model
-from .models import ApiInfo, Profile
+from django.contrib.auth.models import Group
+from core.models import ApiInfo, Profile
 
 # Groups require special processing.
-# Source: https://stackoverflow.com/questions/33844003/how-to-serialize-groups-of-a-user-with-django-rest-framework/33844179
-from django.contrib.auth.models import Group
+# Source: https://stackoverflow.com/questions/33844003/
+#           how-to-serialize-groups-of-a-user-with-django-rest-framework/33844179
 
 class ChangePasswordSerializer(serializers.Serializer):
-    """
-    Serializer for password change endpoint.
+    """Serializer for password change endpoint.
 
     * Provideds serializer for an old password and a new password
 
@@ -21,68 +21,78 @@ class ChangePasswordSerializer(serializers.Serializer):
     """
 
     model = User
-
     old_password = serializers.CharField(required=True)
     new_password = serializers.CharField(required=True)
 
 # Profile serializer
 class ProfileSerializer(serializers.ModelSerializer):
+    """Profile serializer
 
-    # username = serializers.SlugRelatedField(slug_field = 'username', queryset = User.objects.all())
-
-    class Meta:
-        model = Profile
-        fields = ('username', 'public', 'affiliation', 'orcid')
-
-
-
-# Profile serializer
-class ProfileSerializer(serializers.ModelSerializer):
-
-    # username = serializers.SlugRelatedField(slug_field = 'username', queryset = User.objects.all())
+    username = serializers.SlugRelatedField(slug_field = 'username', queryset = User.objects.all())
+    """
 
     class Meta:
+        """Meta"""
         model = Profile
         fields = ('username', 'public', 'affiliation', 'orcid')
 
 
-
 # API serializer
 class ApiSerializer(serializers.ModelSerializer):
+    """API Serializer
+
+    Only if the username on portal and the API are the same...
+    """
 
-    # Only if the username on portal and the API are the same...
-    # username = serializers.SlugRelatedField(slug_field = 'username', queryset = User.objects.all())
-    
     class Meta:
+        """Meta"""
         model = ApiInfo
-        fields = ('username', 'hostname', 'human_readable_hostname', 'public_hostname', 'token', 'other_info',)
+        fields = (
+            'username',
+            'hostname',
+            'human_readable_hostname',
+            'public_hostname',
+            'token',
+            'other_info'
+        )
 
 
 class GroupSerializer(serializers.ModelSerializer):
-    
+    """Group Serializer"""
     class Meta:
+        """Meta"""
         model = Group
         fields = ('name',)
 
 
 class UserSerializer(serializers.ModelSerializer):
-
+    """User Serializer"""
     apiinfo = ApiSerializer(source='custom_user', many=True)
     groups = GroupSerializer(many=True)
     profile = ProfileSerializer(many=False)
 
     class Meta:
+        """Meta"""
         model = User
-        fields = ('username', 'password', 'first_name', 'last_name', 'email', 'profile', 'groups', 'apiinfo')
+        fields = (
+            'username',
+            'password',
+            'first_name',
+            'last_name',
+            'email',
+            'profile',
+            'groups',
+            'apiinfo'
+        )
 
 
 class UserSerializerWithToken(serializers.ModelSerializer):
-
+    """User Serializer"""
     token = serializers.SerializerMethodField()
     password = serializers.CharField(write_only=True)
 
     def get_token(self, obj):
-
+        """Get Token"""
         jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
         jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER
 
@@ -92,7 +102,8 @@ def get_token(self, obj):
         return token
 
     def create(self, validated_data):
-
+        """Create
+        """
         password = validated_data.pop('password', None)
         instance = self.Meta.model(**validated_data)
 
@@ -103,5 +114,6 @@ def create(self, validated_data):
         return instance
 
     class Meta:
+        "Meta"
         model = User
         fields = ('token', 'username', 'password', 'first_name', 'last_name', 'email', 'groups',)

core/serializers.py

@@ -4,10 +4,19 @@
 """
 
 from django.urls import path, include
-from core.views import current_user, add_api, remove_api, CreateUser, update_user, ChangePasswordView, register_prefix, view_prefixes
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.views.generic.base import RedirectView
 from rest_framework_jwt.views import obtain_jwt_token, refresh_jwt_token, verify_jwt_token
+from core.views import (
+    current_user,
+    add_api,
+    remove_api,
+    CreateUser,
+    update_user,
+    ChangePasswordView,
+    register_prefix,
+    view_prefixes
+)
 
 urlpatterns = [
     path('favicon.ico', RedirectView.as_view(url=staticfiles_storage.url('img/favicon.ico'))),
@@ -20,7 +29,10 @@
     path('users/token-refresh/', refresh_jwt_token),
     path('users/token-verify/', verify_jwt_token),
     path('users/change_password/', ChangePasswordView.as_view()),
-    path('users/password_reset/', include('django_rest_passwordreset.urls', namespace='password_reset')),
+    path('users/password_reset/', include(
+        'django_rest_passwordreset.urls',
+        namespace='password_reset')
+    ),
     path('users/register_prefix/<str:username>/<str:prefix>', register_prefix, name='register'),
     path('users/prefixes/', view_prefixes, name='view'),
 ]

core/urls.py

@@ -1,21 +1,59 @@
-from core.serializers import UserSerializer, ApiSerializer
+#!/usr/bin/env python3
+"""Utils
+"""
 
+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
+
+def update_api_info(api):
+    """Update API info"""
+
+    url = api['public_hostname']+'/api/accounts/describe/'
+    token = api['token']
+    header =  {'Authorization': f'Token {token}'}
+
+    try:
+        response = requests.post(url, headers=header)
+    except requests.exceptions.ConnectionError:
+        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
+
+    BAD SOLUTION!!!
+    Couldn't get the groups to work quite right, so a bit hacky here.
+    TODO: refer to API code for a cleaner way to do this.
+    """
 
-    # BAD SOLUTION!!!
-    # Couldn't get the groups to work quite right, so a bit hacky here.
     user_info = UserSerializer(user, context={'request': request}).data
-    print('user')
-    print(user)
-    print('------')
-    print('user_info')
-    print(user_info)
+    for api in user_info['apiinfo']:
+        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()
 
-    # TODO: refer to API code for a cleaner way to do this.
+    # 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
-    }
+    return {'token': token, 'user': user_info}