Move email, secrets, run params to env. Update README.md

main/apiauth.py

@@ -3,6 +3,8 @@ import os
 from zenpy import Zenpy
 from zenpy.lib.api_objects import User as ZenpyUser
 
+from access_controller.settings import ACTRL_ZENDESK_SUBDOMAIN, ACTRL_API_EMAIL, ACTRL_API_TOKEN, ACTRL_API_PASSWORD
+
 
 def api_auth() -> dict:
     """
@@ -15,15 +17,15 @@ def api_auth() -> dict:
     :return: данные пользователя
     """
     credentials = {
-        'subdomain': os.getenv('ZD_DOMAIN')
+        'subdomain': ACTRL_ZENDESK_SUBDOMAIN
     }
-    email = os.getenv('ACCESS_CONTROLLER_API_EMAIL')
-    token = os.getenv('ACCESS_CONTROLLER_API_TOKEN')
-    password = os.getenv('ACCESS_CONTROLLER_API_PASSWORD')
+    email = ACTRL_API_EMAIL
+    token = ACTRL_API_TOKEN
+    password = ACTRL_API_PASSWORD
 
     if email is None:
         raise ValueError('access_controller email not in env')
-    credentials['email'] = os.getenv('ACCESS_CONTROLLER_API_EMAIL')
+    credentials['email'] = email
 
     # prefer token, use password if token not provided
     if token:

main/extra_func.py

@@ -1,4 +1,3 @@
-import os
 from datetime import timedelta, datetime, date
 
 from django.contrib.auth.models import User
@@ -7,7 +6,8 @@ from django.utils import timezone
 from zenpy import Zenpy
 from zenpy.lib.exception import APIException
 
-from access_controller.settings import ZENDESK_ROLES as ROLES, ONE_DAY, ZENDESK_GROUPS, SOLVED_TICKETS_EMAIL
+from access_controller.settings import ZENDESK_ROLES as ROLES, ONE_DAY, ZENDESK_GROUPS, SOLVED_TICKETS_EMAIL, \
+    ACTRL_API_EMAIL, ACTRL_API_TOKEN, ACTRL_API_PASSWORD, ACTRL_ZENDESK_SUBDOMAIN
 from main.models import UserProfile, RoleChangeLogs, UnassignedTicket, UnassignedTicketStatus
 
 
@@ -26,11 +26,11 @@ class ZendeskAdmin:
     """
 
     credentials: dict = {
-        'subdomain': 'ngenix1612197338'
+        'subdomain': ACTRL_ZENDESK_SUBDOMAIN
     }
-    email: str = os.getenv('ACCESS_CONTROLLER_API_EMAIL')
-    token: str = os.getenv('ACCESS_CONTROLLER_API_TOKEN')
-    password: str = os.getenv('ACCESS_CONTROLLER_API_PASSWORD')
+    email: str = ACTRL_API_EMAIL
+    token: str = ACTRL_API_TOKEN
+    password: str = ACTRL_API_PASSWORD
 
     def __init__(self):
         self.create_admin()
@@ -264,7 +264,7 @@ def check_user_auth(email: str, password: str) -> bool:
     creds = {
         'email': email,
         'password': password,
-        'subdomain': 'ngenix1612197338',
+        'subdomain': ACTRL_ZENDESK_SUBDOMAIN,
     }
     try:
         user = Zenpy(**creds)

main/views.py

@@ -25,7 +25,7 @@ from rest_framework.response import Response
 
 from zenpy.lib.api_objects import User as ZenpyUser
 
-from access_controller.settings import EMAIL_HOST_USER, ZENDESK_ROLES, ZENDESK_MAX_AGENTS
+from access_controller.settings import DEFAULT_FROM_EMAIL, ZENDESK_ROLES, ZENDESK_MAX_AGENTS
 from main.extra_func import ZendeskAdmin
 from main.extra_func import check_user_exist, update_profile, get_user_organization, \
     make_engineer, make_light_agent, get_users_list, update_users_in_model, count_users, \
@@ -71,7 +71,7 @@ class CustomRegistrationView(RegistrationView):
                 opts = {
                     'use_https': self.request.is_secure(),
                     'token_generator': default_token_generator,
-                    'from_email': EMAIL_HOST_USER,
+                    'from_email': DEFAULT_FROM_EMAIL,
                     'email_template_name': 'registration/password_reset_email.html',
                     'subject_template_name': 'registration/password_reset_subject.txt',
                     'request': self.request,