Merge branch 'develop' into feature/adm_ruleset/backend

main/views.py

@@ -1,15 +1,15 @@
-import os
-
-from django.contrib.auth.forms import PasswordResetForm
 import logging
 import os
 
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.tokens import default_token_generator
+from django.contrib.auth.forms import PasswordResetForm
+from django.contrib.auth.views import LoginView
 from django.contrib.contenttypes.models import ContentType
-from django.shortcuts import render, get_list_or_404
+from django.http import HttpResponseRedirect
-from django.urls import reverse_lazy
+from django.shortcuts import render, get_list_or_404, redirect
+from django.urls import reverse_lazy, reverse
 from django.views.generic import FormView
+from zenpy import Zenpy
 
 from access_controller.settings import EMAIL_HOST_USER
 from main.extra_func import check_user_exist, update_profile, get_user_organization, \
@@ -17,13 +17,14 @@ from main.extra_func import check_user_exist, update_profile, get_user_organizat
 
 from django.contrib.auth.models import User, Permission
 from main.models import UserProfile
-from main.forms import CustomRegistrationForm, AdminPageUsers
+from main.forms import CustomRegistrationForm, AdminPageUsers, CustomAuthenticationForm
 from django_registration.views import RegistrationView
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
 from django.core.exceptions import PermissionDenied
 
-from access_controller.settings ZENDESK_ROLES
+from access_controller.settings import ZENDESK_ROLES
+from zenpy.lib.api_objects import User as ZenpyUser
 
 
 class CustomRegistrationView(RegistrationView):