From 9d4d261d1d7676a0ecfa5b8fe0256d86fe565337 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Sat, 10 Apr 2021 00:48:13 -0400 Subject: [PATCH] Bug fix sort of for timezone UTC... again --- app/models/user_model.py | 4 +++- app/routers/user.py | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/models/user_model.py b/app/models/user_model.py index 7161e57..f080384 100644 --- a/app/models/user_model.py +++ b/app/models/user_model.py @@ -38,8 +38,10 @@ class User_New_Base(BaseModel): allow_auth_key: Optional[int] enable: Optional[bool] = False - enable_from: Optional[datetime.datetime] = datetime.datetime.now(datetime.timezone.utc) + #enable_from: Optional[datetime.datetime] = datetime.datetime.now(datetime.timezone.utc) + enable_from: Optional[datetime.datetime] = datetime.datetime.now() enable_to: Optional[datetime.datetime] = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=365) + #enable_to: Optional[datetime.datetime] = datetime.datetime.now() + datetime.timedelta(days=365) #super: Optional[bool] = False #manager: Optional[bool] = False diff --git a/app/routers/user.py b/app/routers/user.py index 2ed3f0a..53ad467 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -262,11 +262,13 @@ async def user_authenticate( else: return mk_resp(data=None, status_code=404, status_message='A user account with that auth key was not found') else: return mk_resp(data=None, status_code=400, status_message='One more user account fields was missing or unexpected.') # Bad Request + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(user_rec_result) if isinstance(user_rec_result, dict): current_utc_datetime = datetime.datetime.now(datetime.timezone.utc) + log.debug(current_utc_datetime) if user_rec_result.get('enable', None): log.info('The user account is enabled') @@ -274,14 +276,18 @@ async def user_authenticate( log.info('The user account is not enabled') return mk_resp(data=False, status_message='This user account is not enabled') - if user_enable_from := user_rec_result.get('enable_from', None).astimezone(pytz.UTC): + #if user_enable_from := user_rec_result.get('enable_from', None).astimezone(pytz.UTC): + if user_enable_from := user_rec_result.get('enable_from', None).replace(tzinfo=datetime.timezone.utc): + log.debug(user_enable_from) if user_enable_from <= current_utc_datetime: log.info('Enable from datetime is valid') else: log.info('Enable from datetime is in the future. Please wait.') return mk_resp(data=False, status_message='This account is not yet enabled') - if user_enable_to := user_rec_result.get('enable_to', None).astimezone(pytz.UTC): + #if user_enable_to := user_rec_result.get('enable_to', None).astimezone(pytz.UTC): + if user_enable_to := user_rec_result.get('enable_to', None).replace(tzinfo=datetime.timezone.utc): + log.debug(user_enable_to) if user_enable_to >= current_utc_datetime: log.info('Enable to datetime is valid') else: