'listuser'

aminatadjer · Jun 2, 2020 · a900202 · a900202
1 parent a721ec9
commit a900202
Show file tree

Hide file tree

Showing 103 changed files with 96 additions and 17 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/CoronaWatchApi.iml b/.idea/CoronaWatchApi.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/API/__pycache__/__init__.cpython-36.pyc b/API/__pycache__/__init__.cpython-36.pyc
diff --git a/API/__pycache__/__init__.cpython-38.pyc b/API/__pycache__/__init__.cpython-38.pyc
diff --git a/API/__pycache__/settings.cpython-36.pyc b/API/__pycache__/settings.cpython-36.pyc
diff --git a/API/__pycache__/settings.cpython-38.pyc b/API/__pycache__/settings.cpython-38.pyc
diff --git a/API/__pycache__/urls.cpython-36.pyc b/API/__pycache__/urls.cpython-36.pyc
diff --git a/API/__pycache__/urls.cpython-38.pyc b/API/__pycache__/urls.cpython-38.pyc
diff --git a/API/__pycache__/wsgi.cpython-36.pyc b/API/__pycache__/wsgi.cpython-36.pyc
diff --git a/API/__pycache__/wsgi.cpython-38.pyc b/API/__pycache__/wsgi.cpython-38.pyc
diff --git a/API/urls.py b/API/urls.py
@@ -33,6 +33,7 @@
     path('', include('coronawatch.urls')),
     path('', include('report.urls')),
     path('', include('article.urls')),
+    path('',include('customauth.urls')),
     path('api/token/obtain', MyTokenObtainPairView.as_view(), name='token_create'),
     path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
     path('api/token/verify/', TokenVerifyView.as_view(), name='token_verify'),

diff --git a/article/__pycache__/__init__.cpython-36.pyc b/article/__pycache__/__init__.cpython-36.pyc
diff --git a/article/__pycache__/__init__.cpython-38.pyc b/article/__pycache__/__init__.cpython-38.pyc
diff --git a/article/__pycache__/admin.cpython-36.pyc b/article/__pycache__/admin.cpython-36.pyc
diff --git a/article/__pycache__/admin.cpython-38.pyc b/article/__pycache__/admin.cpython-38.pyc
diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc
diff --git a/article/__pycache__/models.cpython-38.pyc b/article/__pycache__/models.cpython-38.pyc
diff --git a/article/__pycache__/serializers.cpython-36.pyc b/article/__pycache__/serializers.cpython-36.pyc
diff --git a/article/__pycache__/serializers.cpython-38.pyc b/article/__pycache__/serializers.cpython-38.pyc
diff --git a/article/__pycache__/urls.cpython-36.pyc b/article/__pycache__/urls.cpython-36.pyc
diff --git a/article/__pycache__/urls.cpython-38.pyc b/article/__pycache__/urls.cpython-38.pyc
diff --git a/article/__pycache__/views.cpython-36.pyc b/article/__pycache__/views.cpython-36.pyc
diff --git a/article/__pycache__/views.cpython-38.pyc b/article/__pycache__/views.cpython-38.pyc
diff --git a/article/migrations/__pycache__/0001_initial.cpython-36.pyc b/article/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/article/migrations/__pycache__/0001_initial.cpython-38.pyc b/article/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/article/migrations/__pycache__/0002_article_url.cpython-36.pyc b/article/migrations/__pycache__/0002_article_url.cpython-36.pyc
diff --git a/article/migrations/__pycache__/0002_article_url.cpython-38.pyc b/article/migrations/__pycache__/0002_article_url.cpython-38.pyc
diff --git a/article/migrations/__pycache__/__init__.cpython-36.pyc b/article/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/article/migrations/__pycache__/__init__.cpython-38.pyc b/article/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/coronawatch/__pycache__/__init__.cpython-36.pyc b/coronawatch/__pycache__/__init__.cpython-36.pyc
diff --git a/coronawatch/__pycache__/__init__.cpython-38.pyc b/coronawatch/__pycache__/__init__.cpython-38.pyc
diff --git a/coronawatch/__pycache__/admin.cpython-36.pyc b/coronawatch/__pycache__/admin.cpython-36.pyc
diff --git a/coronawatch/__pycache__/admin.cpython-38.pyc b/coronawatch/__pycache__/admin.cpython-38.pyc
diff --git a/coronawatch/__pycache__/models.cpython-36.pyc b/coronawatch/__pycache__/models.cpython-36.pyc
diff --git a/coronawatch/__pycache__/models.cpython-38.pyc b/coronawatch/__pycache__/models.cpython-38.pyc
diff --git a/coronawatch/__pycache__/urls.cpython-36.pyc b/coronawatch/__pycache__/urls.cpython-36.pyc
diff --git a/coronawatch/__pycache__/urls.cpython-38.pyc b/coronawatch/__pycache__/urls.cpython-38.pyc
diff --git a/coronawatch/migrations/__pycache__/0001_initial.cpython-36.pyc b/coronawatch/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/coronawatch/migrations/__pycache__/0001_initial.cpython-38.pyc b/coronawatch/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/coronawatch/migrations/__pycache__/__init__.cpython-36.pyc b/coronawatch/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/coronawatch/migrations/__pycache__/__init__.cpython-38.pyc b/coronawatch/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/__pycache__/__init__.cpython-36.pyc b/customauth/__pycache__/__init__.cpython-36.pyc
diff --git a/customauth/__pycache__/__init__.cpython-38.pyc b/customauth/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/__pycache__/admin.cpython-36.pyc b/customauth/__pycache__/admin.cpython-36.pyc
diff --git a/customauth/__pycache__/admin.cpython-38.pyc b/customauth/__pycache__/admin.cpython-38.pyc
diff --git a/customauth/__pycache__/models.cpython-36.pyc b/customauth/__pycache__/models.cpython-36.pyc
diff --git a/customauth/__pycache__/models.cpython-38.pyc b/customauth/__pycache__/models.cpython-38.pyc
diff --git a/customauth/__pycache__/serializers.cpython-36.pyc b/customauth/__pycache__/serializers.cpython-36.pyc
diff --git a/customauth/__pycache__/serializers.cpython-38.pyc b/customauth/__pycache__/serializers.cpython-38.pyc
diff --git a/customauth/__pycache__/urls.cpython-38.pyc b/customauth/__pycache__/urls.cpython-38.pyc
diff --git a/customauth/__pycache__/views.cpython-36.pyc b/customauth/__pycache__/views.cpython-36.pyc
diff --git a/customauth/__pycache__/views.cpython-38.pyc b/customauth/__pycache__/views.cpython-38.pyc
diff --git a/customauth/migrations/__pycache__/0001_initial.cpython-36.pyc b/customauth/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/customauth/migrations/__pycache__/0001_initial.cpython-38.pyc b/customauth/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/customauth/migrations/__pycache__/__init__.cpython-36.pyc b/customauth/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/customauth/migrations/__pycache__/__init__.cpython-38.pyc b/customauth/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/serializers.py b/customauth/serializers.py
@@ -8,10 +8,10 @@ class MyTokenObtainPairSerializer(TokenObtainPairSerializer):
     @classmethod
     def get_token(cls, user):
         token = super().get_token(user)
-
         # Add custom claims
         token['role'] = user.role
-        # ...
+        token['userId'] = user.pk
+        token['email'] = user.email
 
         return token
 
@@ -32,4 +32,9 @@ def create(self, validated_data):
         if password is not None:
             instance.set_password(password)
         instance.save()
-        return instance
+        return instance
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = '__all__'
diff --git a/customauth/urls.py b/customauth/urls.py
@@ -7,6 +7,7 @@
 
 
 router = routers.DefaultRouter()
+router.register('api/user', UserViewSet, 'user')
 """""
 router.register('api/token/obtain', MyTokenObtainPairView, 'token_create')
 router.register('api/token/refresh/', TokenRefreshView, 'token_refresh')

diff --git a/customauth/views.py b/customauth/views.py
@@ -1,9 +1,11 @@
 from django.shortcuts import render
-from .serializers import MyTokenObtainPairSerializer, UserCreateSerializer
+from .serializers import MyTokenObtainPairSerializer, UserCreateSerializer, UserSerializer
 from rest_framework.views import APIView
-from rest_framework import status, permissions
+from rest_framework import status, permissions, viewsets
 from rest_framework.response import Response
 from rest_framework_simplejwt.views import TokenObtainPairView
+from .models import User
+
 # Create your views here.
 
 class MyTokenObtainPairView(TokenObtainPairView):
@@ -21,3 +23,11 @@ def post(self, request):
                 json = serializer.data
                 return Response(json, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class UserViewSet(viewsets.ModelViewSet):
+    queryset = User.objects.all()
+    permission_classes = [
+        permissions.AllowAny
+    ]
+    serializer_class = UserSerializer
diff --git a/media/DSC_0384.JPG b/media/DSC_0384.JPG
diff --git a/media/Event_org_chart_example_-_Page_5.png b/media/Event_org_chart_example_-_Page_5.png
diff --git a/media/bilan2.jpg b/media/bilan2.jpg
diff --git a/media/bilan2_UYcGWDN.jpg b/media/bilan2_UYcGWDN.jpg
diff --git a/media/coronavirusarticleimage.jpg b/media/coronavirusarticleimage.jpg
diff --git a/media/coronavirusarticleimage_WqJTmGW.jpg b/media/coronavirusarticleimage_WqJTmGW.jpg
diff --git a/media/coronavirusarticleimage_aJPx2nP.jpg b/media/coronavirusarticleimage_aJPx2nP.jpg
diff --git a/media/coronavirusarticleimage_ks293lr.jpg b/media/coronavirusarticleimage_ks293lr.jpg
diff --git a/media/coronavirusarticleimage_pgIvn7M.jpg b/media/coronavirusarticleimage_pgIvn7M.jpg
diff --git a/media/oms.jfif b/media/oms.jfif
diff --git a/media/oms.jpg b/media/oms.jpg
diff --git a/media/oms_dTb8VuD.jfif b/media/oms_dTb8VuD.jfif
diff --git a/media/oms_m7Re6OI.jfif b/media/oms_m7Re6OI.jfif
diff --git a/report/__pycache__/__init__.cpython-36.pyc b/report/__pycache__/__init__.cpython-36.pyc
diff --git a/report/__pycache__/__init__.cpython-38.pyc b/report/__pycache__/__init__.cpython-38.pyc
diff --git a/report/__pycache__/admin.cpython-36.pyc b/report/__pycache__/admin.cpython-36.pyc
diff --git a/report/__pycache__/admin.cpython-38.pyc b/report/__pycache__/admin.cpython-38.pyc
diff --git a/report/__pycache__/models.cpython-36.pyc b/report/__pycache__/models.cpython-36.pyc
diff --git a/report/__pycache__/models.cpython-38.pyc b/report/__pycache__/models.cpython-38.pyc
diff --git a/report/__pycache__/serializers.cpython-36.pyc b/report/__pycache__/serializers.cpython-36.pyc
diff --git a/report/__pycache__/serializers.cpython-38.pyc b/report/__pycache__/serializers.cpython-38.pyc
diff --git a/report/__pycache__/urls.cpython-36.pyc b/report/__pycache__/urls.cpython-36.pyc
diff --git a/report/__pycache__/urls.cpython-38.pyc b/report/__pycache__/urls.cpython-38.pyc
diff --git a/report/__pycache__/views.cpython-36.pyc b/report/__pycache__/views.cpython-36.pyc
diff --git a/report/__pycache__/views.cpython-38.pyc b/report/__pycache__/views.cpython-38.pyc
diff --git a/report/migrations/__pycache__/0001_initial.cpython-36.pyc b/report/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/report/migrations/__pycache__/0001_initial.cpython-38.pyc b/report/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/report/migrations/__pycache__/__init__.cpython-36.pyc b/report/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/report/migrations/__pycache__/__init__.cpython-38.pyc b/report/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/report/urls.py b/report/urls.py
@@ -6,4 +6,5 @@
 router = routers.DefaultRouter()
 router.register('api/region', RegionViewSet, 'region')
 router.register('api/casSignaler', CasSignaleeViewSet, 'casSignaler')
+
 urlpatterns = router.urls
diff --git a/sendMail/__pycache__/__init__.cpython-36.pyc b/sendMail/__pycache__/__init__.cpython-36.pyc
diff --git a/sendMail/__pycache__/__init__.cpython-38.pyc b/sendMail/__pycache__/__init__.cpython-38.pyc
diff --git a/sendMail/__pycache__/admin.cpython-36.pyc b/sendMail/__pycache__/admin.cpython-36.pyc
diff --git a/sendMail/__pycache__/admin.cpython-38.pyc b/sendMail/__pycache__/admin.cpython-38.pyc
diff --git a/sendMail/__pycache__/models.cpython-36.pyc b/sendMail/__pycache__/models.cpython-36.pyc
diff --git a/sendMail/__pycache__/models.cpython-38.pyc b/sendMail/__pycache__/models.cpython-38.pyc
diff --git a/sendMail/__pycache__/views.cpython-36.pyc b/sendMail/__pycache__/views.cpython-36.pyc
diff --git a/sendMail/__pycache__/views.cpython-38.pyc b/sendMail/__pycache__/views.cpython-38.pyc
diff --git a/static/rest_framework/docs/js/api.js b/static/rest_framework/docs/js/api.js
@@ -65,7 +65,7 @@ function formEntries (form) {
 
 $(function () {
   var $selectedAuthentication = $('#selected-authentication')
-  var $authControl = $('#customauth-control')
+  var $authControl = $('#auth-control')
   var $authTokenModal = $('#auth_token_modal')
   var $authBasicModal = $('#auth_basic_modal')
   var $authSessionModal = $('#auth_session_modal')
@@ -265,12 +265,12 @@ $(function () {
   })
 
   // Authentication: none
-  $authControl.find("[data-customauth='none']").click(function (event) {
+  $authControl.find("[data-auth='none']").click(function (event) {
     event.preventDefault()
     window.auth = null
     $selectedAuthentication.text('none')
-    $authControl.find("[data-customauth]").closest('li').removeClass('active')
-    $authControl.find("[data-customauth='none']").closest('li').addClass('active')
+    $authControl.find("[data-auth]").closest('li').removeClass('active')
+    $authControl.find("[data-auth='none']").closest('li').addClass('active')
   })
 
   // Authentication: token
@@ -285,8 +285,8 @@ $(function () {
       'token': token
     }
     $selectedAuthentication.text('token')
-    $authControl.find("[data-customauth]").closest('li').removeClass('active')
-    $authControl.find("[data-customauth='token']").closest('li').addClass('active')
+    $authControl.find("[data-auth]").closest('li').removeClass('active')
+    $authControl.find("[data-auth='token']").closest('li').addClass('active')
     $authTokenModal.modal('hide')
   })
 
@@ -302,8 +302,8 @@ $(function () {
       'password': password
     }
     $selectedAuthentication.text('basic')
-    $authControl.find("[data-customauth]").closest('li').removeClass('active')
-    $authControl.find("[data-customauth='basic']").closest('li').addClass('active')
+    $authControl.find("[data-auth]").closest('li').removeClass('active')
+    $authControl.find("[data-auth='basic']").closest('li').addClass('active')
     $authBasicModal.modal('hide')
   })
 
@@ -314,8 +314,8 @@ $(function () {
       'type': 'session'
     }
     $selectedAuthentication.text('session')
-    $authControl.find("[data-customauth]").closest('li').removeClass('active')
-    $authControl.find("[data-customauth='session']").closest('li').addClass('active')
+    $authControl.find("[data-auth]").closest('li').removeClass('active')
+    $authControl.find("[data-auth='session']").closest('li').addClass('active')
     $authSessionModal.modal('hide')
   })
 })
diff --git a/static/rest_framework/js/coreapi-0.1.1.js b/static/rest_framework/js/coreapi-0.1.1.js