From d14c024d9c1999f1489d5b84fb60d6e10be13dd2 Mon Sep 17 00:00:00 2001 From: lance Date: Sun, 10 Mar 2019 21:52:00 -0700 Subject: [PATCH] minor edits --- secretshare/app.py | 3 --- secretshare/library/secretsmanager.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/secretshare/app.py b/secretshare/app.py index 1c9b58d..6295c1e 100644 --- a/secretshare/app.py +++ b/secretshare/app.py @@ -52,16 +52,13 @@ class Secrets(Resource): secret = secretsmanager.Secret(secret_name=secret_name) if secret.exists and not secret.expired: - # If secret exists and not expired, return secret return secret.retrieve(), 200 else: - # If secret is expired or doesn't exist, return error return { 'error_msg': 'This secret is expired or does not exist.', 'error_id': 'expired_secret' }, 400 else: - # If no query string provided, return error return { 'error_msg': 'No secret token provided.', 'error_id': 'no_token' diff --git a/secretshare/library/secretsmanager.py b/secretshare/library/secretsmanager.py index cf3948e..d503845 100644 --- a/secretshare/library/secretsmanager.py +++ b/secretshare/library/secretsmanager.py @@ -90,7 +90,7 @@ class Secret(object): if not expiration: # Set default time expiration - self.expiration = str(now.shift(hours=app.config['DEFAULT_HOURS'])) + self.expiration = str(now.shift(hours=app.config.get('DEFAULT_HOURS'))) else: # Otherwise validate we have a good expiration date try: