From: Mikael Frykholm Date: Mon, 14 May 2018 11:22:04 +0000 (+0200) Subject: Make secret settings actually work. X-Git-Url: https://git.frykholm.com/tranquillity.git/commitdiff_plain/93be18536faaa33c9c2d3a4e5625fa7bfca8eb20 Make secret settings actually work. --- diff --git a/tranquillity/auth_backend.py b/tranquillity/auth_backend.py index bd410d1..e8c682a 100644 --- a/tranquillity/auth_backend.py +++ b/tranquillity/auth_backend.py @@ -2,14 +2,15 @@ from django.contrib.auth import get_user_model from django.contrib.auth.models import User from django.contrib.auth.backends import ModelBackend import requests +from django.conf import settings class EmailBackend(ModelBackend): def fetch_fortnox(self): """ Fetch all active customers from Fortnox API. Return as dict keyed on email.""" res = None customers = {} - headers = {"Access-Token":FORTNOX_Access_Token, - "Client-Secret":FORTNOX_Client_Secret, + headers = {"Access-Token":settings.FORTNOX_ACCESS_TOKEN, + "Client-Secret":settings.FORTNOX_CLIENT_SECRET, "Content-Type":"application/json", "Accept":"application/json" } diff --git a/tranquillity/settings.py b/tranquillity/settings.py index 74d30b0..b01cf5a 100644 --- a/tranquillity/settings.py +++ b/tranquillity/settings.py @@ -11,7 +11,10 @@ https://docs.djangoproject.com/en/2.0/ref/settings/ """ import os -from settings_secret import * +try: + from .settings_secret import * +except ImportError: + pass # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))