From 33aa0747f91056bdb29ef8c0b0ac7efaa253f318 Mon Sep 17 00:00:00 2001 From: Giacomo Furlan Date: Tue, 25 Oct 2022 08:20:51 +0300 Subject: [PATCH] Fix env variables checks * update configuration file --- b2share/config.py | 11 ++++++----- b2share/factory.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/b2share/config.py b/b2share/config.py index ae1fb2459..b4e7fb8b4 100644 --- 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 index 5a4480294..76d39d341 100644 --- 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')