Moving all salesforce variables to environment

.gitignore

@@ -12,7 +12,7 @@
 node_modules/
 /npm-debug.log
 /.idea/
-salesforce.py
+sf.env
 
 # Distribution / packaging
 .Python

docker/Dockerfile.dev

@@ -9,6 +9,8 @@ ENV DATABASE_URL postgres://hypha:hypha@db:5432/hypha
 ENV DJANGO_SETTINGS_MODULE hypha.settings.dev
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
+
+# Salesforce Integration
 ENV SALESFORCE_INTEGRATION 1
 
 # Set owner on /usr/local.

docker/docker-compose.yaml

@@ -18,6 +18,8 @@ services:
     build:
       context: ..
       dockerfile: docker/Dockerfile.dev
+    env_file: 
+      - sf.env
     ports:
       - 9001:9001
     volumes:

hypha/settings/base.py

@@ -203,12 +203,34 @@ WSGI_APPLICATION = 'hypha.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/stable/ref/settings/#databases
 
-DATABASES = {
-    'default': dj_database_url.config(
-        conn_max_age=600,
-        default=f"postgres:///{APP_NAME}"
-    )
-}
+if 'SALESFORCE_INTEGRATION' in env and env['SALESFORCE_INTEGRATION']:
+    DATABASES = {
+        'default': dj_database_url.config(
+            conn_max_age=600,
+            default=f"postgres:///{APP_NAME}"
+        ),
+        'salesforce': {
+            'ENGINE': 'salesforce.backend',
+            'CONSUMER_KEY': env['CONSUMER_KEY'],
+            'CONSUMER_SECRET': env['CONSUMER_SECRET'],
+            'USER': env['SALESFORCE_USER'],
+            'PASSWORD': env['SALESFORCE_PASSWORD'],
+            'HOST': env['SALESFORCE_LOGIN_URL']
+        }
+    }
+
+    SALESFORCE_QUERY_TIMEOUT = (30, 30)  # (connect timeout, data timeout)
+
+    DATABASE_ROUTERS = [
+        "salesforce.router.ModelRouter"
+    ]
+else:
+    DATABASES = {
+        'default': dj_database_url.config(
+            conn_max_age=600,
+            default=f"postgres:///{APP_NAME}"
+        )
+    }
 
 
 # Cache

hypha/settings/dev.py

@@ -145,11 +145,3 @@ DEBUG_TOOLBAR_CONFIG = {
 WEBPACK_LOADER['DEFAULT'].update({
     'STATS_FILE': os.path.join(BASE_DIR, './hypha/static_compiled/app/webpack-stats.json'),
 })
-
-# Salesforce Integration
-if 'SALESFORCE_INTEGRATION' in env and env['SALESFORCE_INTEGRATION']:
-    try:
-        from .salesforce import *
-    except ImportError:
-        pass
-    DATABASES.update(SALESFORCE_DB)

hypha/settings/production.py

@@ -39,11 +39,3 @@ if 'SENTRY_DSN' in env:
 if 'ON_HEROKU' in env:
     import django_heroku
     django_heroku.settings(locals())
-
-# Salesforce Integration
-if 'SALESFORCE_INTEGRATION' in env and env['SALESFORCE_INTEGRATION']:
-    try:
-        from .salesforce import *
-    except ImportError:
-        pass
-    DATABASES.update(SALESFORCE_DB)

hypha/settings/salesforce.py.example

-SALESFORCE_DB = {
-    'ENGINE': 'salesforce.backend',
-    'CONSUMER_KEY': 'Consumer Key from Salesforce App',
-    'CONSUMER_SECRET': 'Consumer Secret from Salesforce APP',
-    'USER': 'user@email.com',
-    'PASSWORD': 'Password and security token concatenated',
-    'HOST': 'https://login.salesforce.com' # Or test or URL of salesforce org
-}
-
-SALESFORCE_QUERY_TIMEOUT = (30, 30)  # (connect timeout, data timeout)
-
-DATABASE_ROUTERS = [
-    "salesforce.router.ModelRouter"
-]

hypha/settings/test.py

@@ -17,11 +17,3 @@ STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
 PASSWORD_HASHERS = [
     'django.contrib.auth.hashers.MD5PasswordHasher',
 ]
-
-# Salesforce Integration
-if 'SALESFORCE_INTEGRATION' in env and env['SALESFORCE_INTEGRATION']:
-    try:
-        from .salesforce import *
-    except ImportError:
-        pass
-    DATABASES.update(SALESFORCE_DB)