Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix sort of for timezone UTC... again

Browse Source
This commit is contained in:
Scott Idem
2021-04-10 00:48:13 -04:00
parent 2147f54724
commit 9d4d261d1d
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user_model.py
View File

@@ -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

10
app/routers/user.py
View File

@@ -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: