Make secret settings actually work.

diff --git a/tranquillity/auth_backend.py b/tranquillity/auth_backend.py
index bd410d15185cc1aacca6a58c14e6bc136531d914..e8c682a34b1bdb89b8be167278240f9d377c0320 100644 (file)
--- 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.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 = {}
 
 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" }
 
            "Content-Type":"application/json",
            "Accept":"application/json" }
 

diff --git a/tranquillity/settings.py b/tranquillity/settings.py
index 74d30b0e42d6933159f42cbd5bb2363829863ba5..b01cf5a885a5d7724f1743406b6c020ee14f2c92 100644 (file)
--- a/tranquillity/settings.py
+++ b/tranquillity/settings.py
@@ -11,7 +11,10 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
 """
 
 import os
 """
 
 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__)))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))