Fix env variables checks

* update configuration file
EUDAT-B2SHARE · Oct 25, 2022 · 33aa074 · 33aa074
1 parent 3c6ee27
commit 33aa074
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/b2share/config.py b/b2share/config.py
@@ -197,11 +197,12 @@
 RECORDS_REST_DEFAULT_DELETE_PERMISSION_FACTORY = \
     'b2share.modules.records.permissions:DeleteRecordPermission'
 
-B2ACCESS_APP_CREDENTIALS = dict(
-    # B2ACCESS authentication key and secret
-    consumer_key=os.environ.get("B2ACCESS_CONSUMER_KEY"),
-    consumer_secret=os.environ.get("B2ACCESS_SECRET_KEY"),
-)
+if os.environ.get("B2ACCESS_CONSUMER_KEY") and os.environ.get("B2ACCESS_SECRET_KEY"):
+    B2ACCESS_APP_CREDENTIALS = dict(
+        # B2ACCESS authentication key and secret
+        consumer_key=os.environ.get("B2ACCESS_CONSUMER_KEY"),
+        consumer_secret=os.environ.get("B2ACCESS_SECRET_KEY"),
+    )
 
 
 B2ACCESS_BASE_URL = 'https://b2access.eudat.eu/'

diff --git a/b2share/factory.py b/b2share/factory.py
@@ -205,7 +205,7 @@ def check(var_name):
         if not config.get(var_name):
             error("Configuration variable expected: {}".format(var_name))
 
-    if not os.environ.get('B2SHARE_SECRET_KEY'):
+    if not os.environ.get('B2SHARE_SECRET_KEY') and check('B2SHARE_SECRET_KEY'):
         error("Environment variable not defined: B2SHARE_SECRET_KEY")
 
     check('SQLALCHEMY_DATABASE_URI')