Merge pull request #14 from LifeLaboratory/add-authorezation

Налажена аторизация, но пока без валидации входных параметров.

Author: Txyza

task/urls.py

@@ -18,10 +18,12 @@
 from task_lesson.api.task.task import AddTask
 from task_lesson.api.team.create import CreateTeam
 from task_lesson.api.team.edit import EditTeam
+from task_lesson.api.authorization.get_session import Authorization as Auth
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('team/create/', CreateTeam().create),
     path('team/edit/', EditTeam().edit),
     path('add_task/', AddTask().add_task),
+    path('auth/', Auth.get_session)
 ]

task_lesson/api/authorization/get_session.py

@@ -1,29 +1,36 @@
-
-
-__author__= 'rv.fomichev'
-
 import json
-import redis
-import django_redis
 import api.helpers.names as names
 
 from django.core.cache import cache
 from uuid import uuid4
+from task_lesson.models import User
+from django.http import HttpResponse
+
+__author__ = 'rv.fomichev'
 
 
 class Authorization:
 
     @classmethod
     def check_request(cls, request):
         """Проверка входных данных на корректность"""
-        return cls.RequestValueErorr
+        # return names.RequestValueErorr
+        return None
 
     @classmethod
     def get_id_user(cls, request):
 
+        data = request.POST
+        qset = User.objects.filter(login=data['login'], password=data['password'])
+        if len(qset):
+            answer = None
+            user_id = qset[0].user
+        else:
+            answer = names.CreateSessionError
+            user_id = None
         return {
-            names.ANSWER: cls.LoginError,
-            names.USER: None
+            names.ANSWER: answer,
+            names.USER: user_id
         }
 
     @classmethod
@@ -54,4 +61,4 @@ def get_session(cls, request):
             names.SESSION: session
         }
 
-        return json.dumps(response)
+        return HttpResponse(json.dumps(response))

task_lesson/api/authorization/test_get_session.py

@@ -1,9 +1,13 @@
 
 
-import unittest as ut
 import json
+import unittest as ut
 import api.authorization.get_session as gt
 import api.helpers.names as names
+import requests
+
+# from django.test import TestCase
+
 
 class TestGetSession(ut.TestCase):
 
@@ -94,4 +98,16 @@ def test_error_create_session(self):
             names.ANSWER: answer,
             names.SESSION: None
         }
-        self.assertEqual(reference, dict_r, 'Неожиданный реультат')
+        self.assertEqual(reference, dict_r, 'Неожиданный реультат')
+
+    def test_auth(self):
+        data = {
+            'login': 'test_andrew',
+            'password': 'test_andrew'
+        }
+        # js_d = json.dumps(data)
+        r = requests.post('http://127.0.0.1:8000/auth/', data=data)
+
+        # _uuid = gt.Authorization.take_session(self.user_id)
+        # self.assertIsInstance(_uuid, str, 'Некорректный тип сессии')
+        return

task_lesson/api/authorization/test_take_session.py

@@ -1,9 +1,14 @@
 
 
-import unittest as ut
+
 import json
-import api.authorization.get_session as gt
+import unittest as ut
+# import api.authorization.get_session as gt
 import api.helpers.names as names
+import requests
+
+from django.test import TestCase
+
 
 class TestTakeSession(ut.TestCase):
     #  Пока не работает
@@ -13,5 +18,23 @@ def setUp(self):
 
     def test_take_session(self):
 
-        _uuid = gt.Authorization.take_session(self.user_id)
-        self.assertIsInstance(_uuid, str, 'Некорректный тип сессии')
+        data = {
+            'login': 'roman',
+            'password': 'roman123'
+        }
+        # js_d = json.dumps(data)
+        r = requests.post('http://127.0.0.1:8000/auth/', data=data)
+
+        # _uuid = gt.Authorization.take_session(self.user_id)
+        # self.assertIsInstance(_uuid, str, 'Некорректный тип сессии')
+        return
+
+    def test_auth(self):
+        data = {
+            'login': 'test_andrew',
+            'password': 'test_andrew'
+        }
+        r = requests.post('http://127.0.0.1:8000/auth/', data=data)
+
+
+        return

task_lesson/api/registration/__init__.py

@@ -0,0 +1,30 @@
+
+from task_lesson.models import User
+
+
+class Registration:
+
+    @classmethod
+    def check_request(cls, request):
+        """Проверка входных данных на корректность"""
+        # return names.RequestValueErorr
+        return None
+
+    @classmethod
+    def set_user(cls, request):
+
+        data = request.POST
+        user = User()
+
+    @classmethod
+    def registation(cls, request):
+
+        answer = cls.check_request(request)
+
+        if not answer:
+            pass
+
+
+
+
+