Merge pull request #30 from PROCOLLAB-github/feature/auth

Feature/auth

Author: yakser

users/migrations/0015_customuser_speciality.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2022-11-15 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0014_alter_customuser_birthday"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="customuser",
+            name="speciality",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]

users/models.py

@@ -44,6 +44,7 @@ class CustomUser(AbstractUser):
         organization: CharField instance the user's place of study or work.
         datetime_updated: A DateTimeField indicating date of update.
         datetime_created: A DateTimeField indicating date of creation.
+        speciality: CharField instance the user's specialty.
     """
 
     ADMIN = ADMIN
@@ -71,6 +72,7 @@ class CustomUser(AbstractUser):
     region = models.CharField(max_length=255, blank=True)
     city = models.CharField(max_length=255, blank=True)
     organization = models.CharField(max_length=255, blank=True)
+    speciality = models.CharField(max_length=255, blank=True)
 
     datetime_updated = models.DateTimeField(null=False, auto_now=True)
     datetime_created = models.DateTimeField(null=False, auto_now_add=True)

users/urls.py

@@ -1,15 +1,15 @@
 from django.urls import path, re_path
 
 from users.views import (
+    CurrentUser,
     EmailResetPassword,
     ResetPassword,
     SpecialistsList,
-    UserAdditionalRolesView,
+    UserAdditionalRoles,
     UserDetail,
     UserList,
-    UserTypesView,
-    VerifyEmail,
     UserTypes,
+    VerifyEmail,
 )
 
 app_name = "users"
@@ -19,11 +19,11 @@
         "specialists/", SpecialistsList.as_view()
     ),  # this url actually returns  mentors, experts and investors
     path("users/", UserList.as_view()),
-    path("users/roles/", UserAdditionalRolesView.as_view()),
-    path("users/types/", UserTypesView.as_view()),
+    path("users/roles/", UserAdditionalRoles.as_view()),
+    path("users/types/", UserTypes.as_view()),
     path("users/<int:pk>/", UserDetail.as_view()),
     path("users/reset-password/", EmailResetPassword.as_view()),
-    path("users/user-types", UserTypes.as_view()),
+    path("users/current/", CurrentUser.as_view()),
     re_path(
         r"^account-confirm-email/",
         VerifyEmail.as_view(),

users/views.py

@@ -23,7 +23,7 @@
 
 from core.permissions import IsOwnerOrReadOnly
 from core.utils import Email
-from users.helpers import VERBOSE_ROLE_TYPES, VERBOSE_USER_TYPES
+from users.helpers import VERBOSE_ROLE_TYPES
 from users.serializers import (
     EmailSerializer,
     PasswordSerializer,
@@ -73,17 +73,7 @@ def post(self, request, *args, **kwargs):
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
 
-class UserTypesView(GenericAPIView):
-    permission_classes = [AllowAny]
-
-    def get(self, request, format=None):
-        """
-        Return a tuple of user types.
-        """
-        return Response(VERBOSE_USER_TYPES, status=status.HTTP_200_OK)
-
-
-class UserAdditionalRolesView(GenericAPIView):
+class UserAdditionalRoles(GenericAPIView):
     permission_classes = [AllowAny]
 
     def get(self, request, format=None):
@@ -111,6 +101,17 @@ class UserDetail(RetrieveUpdateDestroyAPIView):
     serializer_class = UserDetailSerializer
 
 
+class CurrentUser(APIView):
+    queryset = User.objects.get_users_for_detail_view()
+    permission_classes = [IsAuthenticated]
+    serializer_class = UserDetailSerializer
+
+    def get(self, request):
+        user = request.user
+        serializer = UserDetailSerializer(user)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
 class UserTypes(APIView):
     def get(self, request, format=None):
         """