admin test9

@@ -6,5 +6,5 @@ urlpatterns = [
     path(r'login/', views.LoginView.as_view()),
     path(r'iwalogin/', views.IWALoginView.as_view()),
     path(r'iwaurl/', views.IWAUrlView.as_view()),
-    path(r'testlogin/', views.TestView.as_view()),
+    path(r'adminlogin/', views.AdminLoginView.as_view()),
 ]

@@ -56,36 +56,33 @@ class LoginView(ObtainJSONWebToken, GenericView):
 class IWALoginView(IWABaseView, GenericView):
 
     def post(self, request, *args, **kwargs):
-        # code = request.data.get('code', '')
-        is_admin = request.data.get('state', '') == 'admin'
-        # q_number = self.get_q_number(conf.IWA_URL, code, conf.IWA_REDIRECT_URI, client_id_base64)
-
-        q_number = 'admin'
-
-        if is_admin:
-
-            self.running_log.info('[admin_users.iwalogin] [username: {0}] [params: {1}]'.format(q_number, request.data))
-
-            is_valid, data = self.validate_admin(q_number)
+        code = request.data.get('code', '')
+        # is_admin = request.data.get('state', '') == 'admin'
+        q_number = self.get_q_number(conf.IWA_URL, code, conf.IWA_REDIRECT_URI, client_id_base64)
+
+        # if is_admin:
+        #
+        #     self.running_log.info('[admin_users.iwalogin] [username: {0}] [params: {1}]'.format(q_number, request.data))
+        #
+        #     is_valid, data = self.validate_admin(q_number)
+        #
+        #     if is_valid:
+        #         request.user = data
+        #         auth_login(request, data)
+        #         index_path = reverse('admin:index')
+        #         return HttpResponseRedirect(index_path)
+        #     else:
+        #         self.no_permission(data)
+        # else:
+
+        self.running_log.info('[users.iwalogin] [username: {0}] [params: {1}]'.format(q_number, request.data))
+
+        is_valid, data = self.validate(q_number)
 
-            if is_valid:
-                request.user = data
-                auth_login(request, data)
-                # index_path = reverse('admin:index')
-                # return HttpResponseRedirect(index_path)
-                return redirect('https://staging-bmw-ocr.situdata.com/admin/')
-            else:
-                self.no_permission(data)
+        if is_valid:
+            return response.ok(data=data)
         else:
-
-            self.running_log.info('[users.iwalogin] [username: {0}] [params: {1}]'.format(q_number, request.data))
-
-            is_valid, data = self.validate(q_number)
-
-            if is_valid:
-                return response.ok(data=data)
-            else:
-                self.no_permission(data)
+            self.no_permission(data)
 
 
 class IWAUrlView(IWABaseView, GenericView):
@@ -97,12 +94,13 @@ class IWAUrlView(IWABaseView, GenericView):
         return response.ok(data=data)
 
 
-class TestView(IWABaseView, GenericView):
+class AdminLoginView(IWABaseView, GenericView):
 
     def get(self, request, *args, **kwargs):
-        # code = request.data.get('code', '')
-        # is_admin = request.data.get('state', '') == 'admin'
+        code = request.data.get('code', '')
+        is_admin = request.data.get('state', '') == 'admin'
         # q_number = self.get_q_number(conf.IWA_URL, code, conf.IWA_REDIRECT_URI, client_id_base64)
+        self.running_log.info('code={0}, is_admin={1}'.format(code, is_admin))
 
         q_number = 'admin'
 
@@ -115,6 +113,5 @@ class TestView(IWABaseView, GenericView):
             auth_login(request, data)
             index_path = reverse('admin:index')
             return HttpResponseRedirect(index_path)
-            # return redirect('https://staging-bmw-ocr.situdata.com/admin/')
         else:
             self.no_permission(data)

@@ -27,7 +27,7 @@ class MyAdminSite(admin.AdminSite):
             index_path = reverse('admin:index', current_app=self.name)
             return HttpResponseRedirect(index_path)
         # return HttpResponseRedirect(iwa_admin_url)
-        return HttpResponseRedirect('https://staging-bmw-ocr.situdata.com/login?state=admin&code=xxx')
+        return HttpResponseRedirect('https://staging-bmw-ocr.situdata.com/api/user/adminlogin/?state=admin&code=xxx')
 
 
 admin_site = MyAdminSite()