CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/documentation

Browse Source 
# Conflicts:
#	README.md
#	main/apiauth.py
#	main/tests.py
#	requirements/dev.txt
This commit is contained in:
Степаненко Ольга
2021-05-27 15:39:09 +03:00
parent a908fc4388 ad0c4b0960
commit 8747fc4aa1
12 changed files with 126 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
access_controller/settings.py
View File

@@ -148,7 +148,6 @@ LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = '/'
# Название_приложения.Название_файла.Название_класса_обработчика
AUTHENTICATION_BACKENDS = [
'access_controller.auth.EmailAuthBackend',
@@ -186,3 +185,6 @@ ACTRL_ZENDESK_SUBDOMAIN = os.getenv('ACTRL_ZENDESK_SUBDOMAIN') or os.getenv('ZD_
ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_API_EMAIL')
ACTRL_API_TOKEN = os.getenv('ACTRL_API_TOKEN') or os.getenv('ACCESS_CONTROLLER_API_TOKEN')
ACTRL_API_PASSWORD = os.getenv('ACTRL_API_PASSWORD') or os.getenv('ACCESS_CONTROLLER_API_PASSWORD')
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'