diff --git a/access_controller/urls.py b/access_controller/urls.py index 5420838..033d53f 100644 --- a/access_controller/urls.py +++ b/access_controller/urls.py @@ -17,7 +17,10 @@ from django.contrib import admin from django.contrib.auth.views import LoginView from django.contrib.auth import views as auth_views from django.urls import path, include -from main.views import main_page, profile_page, CustomRegistrationView, AdminPageView +from access_controller import settings +from access_controller.settings import DEBUG +from main.views import main_page, profile_page, CustomRegistrationView, work_page, work_hand_over, work_become_engineer, AdminPageView + urlpatterns = [ path('admin/', admin.site.urls, name='admin'), @@ -26,6 +29,10 @@ urlpatterns = [ path('accounts/register/', CustomRegistrationView.as_view(), name='registration'), path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context path('accounts/', include('django.contrib.auth.urls')), + path('accounts/', include('django_registration.backends.one_step.urls')), + path('work/', work_page, name="work"), + path('work/hand_over/', work_hand_over, name="work_hand_over"), + path('work/become_engineer/', work_become_engineer, name="work_become_engineer"), path('accounts/', include('django_registration.backends.activation.urls')), path('accounts/login/', include('django.contrib.auth.urls')), path('control/', AdminPageView.as_view(), name='control') @@ -52,4 +59,5 @@ urlpatterns += [ auth_views.PasswordResetCompleteView.as_view(), name='password_reset_complete' ), + ] diff --git a/main/templates/pages/profile.html b/main/templates/pages/profile.html index bfd8cd7..6c6ecd2 100644 --- a/main/templates/pages/profile.html +++ b/main/templates/pages/profile.html @@ -45,7 +45,7 @@
- + Запросить права доступа
{% endblock %} diff --git a/main/templates/pages/work.html b/main/templates/pages/work.html index bd760cb..2fcb4cf 100644 --- a/main/templates/pages/work.html +++ b/main/templates/pages/work.html @@ -4,7 +4,7 @@ {% block title %}{{ pagename }}{% endblock %} -{% block heading %}Управление{% endblock %} +{% block heading %}Управление правами{% endblock %} {% block extra_css %} @@ -23,24 +23,15 @@ - - - + - - - - - - - - - - - - - + {% for engineer in engineers %} + + + + + {% endfor %}
IDemailExpiration DateName(link to profile)Name
1big_boss123@example.ru19:30 18.02.21Иван Иванов
2gachi_cool456@example.ru21:00 18.02.21Пётр Петров
{{ engineer.id }}{{ engineer.name }}
@@ -52,23 +43,24 @@
инженеров:
- 13 + {{ engineers|length }}
легких агентов:
- 22 + {{ agents|length }}
- +
- - + Получить права инженера + Сдать права инженера
-{% endblock %} \ No newline at end of file +{% endblock %} + diff --git a/main/views.py b/main/views.py index 72d4e52..df99c53 100644 --- a/main/views.py +++ b/main/views.py @@ -1,3 +1,6 @@ +from django.shortcuts import render, redirect, reverse +from django.http import HttpResponseRedirect + from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.models import User @@ -6,7 +9,6 @@ from django.shortcuts import render, get_list_or_404 from django.urls import reverse_lazy from django.views.generic import FormView from django_registration.backends.one_step.views import RegistrationView - from access_controller.settings import EMAIL_HOST_USER from main.extra_func import check_user_exist, update_profile, get_user_organization, \ make_engineer, make_light_agent, get_users_list @@ -21,6 +23,12 @@ from django.core.exceptions import PermissionDenied import logging +from zenpy import Zenpy +from zenpy.lib.api_objects import User as ZenpyUser + +from .models import UserProfile + +import os from access_controller.settings import ZENDESK_ROLES @@ -88,12 +96,58 @@ def profile_page(request): 'email': user_profile.user.email, 'name': user_profile.name, 'role': user_profile.role, + 'id': user_profile.id, 'image_url': user_profile.image, 'pagename': 'Страница профиля' } return render(request, 'pages/profile.html', context) +def auth_user(request): + admin_creds = { + 'email': os.environ.get('ACCESS_CONTROLLER_API_EMAIL'), + 'subdomain': 'ngenix1612197338', + 'token': os.environ.get('ACCESS_CONTROLLER_API_TOKEN'), + } + admin = Zenpy(**admin_creds) + zenpy_user: ZenpyUser = admin.users.search(request.user.email).values[0] + return zenpy_user, admin + + +@login_required() +def work_page(request, id): + if request.user.id == id: + context = { + 'engineers': UserProfile.objects.filter(role="admin"), + 'agents': UserProfile.objects.filter(role="agent"), + 'pagename': 'Управление правами' + } + return render(request, 'pages/work.html', context) + return redirect("login") + + +@login_required() +def work_hand_over(request): + zenpy_user, admin = auth_user(request) + if zenpy_user.role == "admin" or zenpy_user.role == "end-user": + zenpy_user.role = "agent" + admin.users.update(zenpy_user) + request.user.userprofile.role = "agent" + request.user.userprofile.save() + return HttpResponseRedirect(reverse('work', args=(request.user.id,))) + + +@login_required() +def work_become_engineer(request): + zenpy_user, admin = auth_user(request) + if zenpy_user.role == "agent" or zenpy_user.role == "end-user": + zenpy_user.role = "admin" + admin.users.update(zenpy_user) + request.user.userprofile.role = "admin" + request.user.userprofile.save() + return HttpResponseRedirect(reverse('work', args=(request.user.id,))) + + def main_page(request): logger = logging.getLogger('main.index') logger.info('Index page opened')