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

Bug fix for multiple user functions missing response=response in mk_resp() call.

Browse Source
This commit is contained in:
Scott Idem
2021-09-20 19:26:57 -04:00
parent 8a3101d562
commit 200ee82b9d
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/routers/user.py
View File

@@ -128,8 +128,8 @@ async def change_user_obj_password(
data = user_obj
else:
data = True
return mk_resp(data=data)
#return mk_resp(data=None, status_code=501) # Not Implemented
return mk_resp(data=data, response=response)
#return mk_resp(data=None, status_code=501, response=response) # Not Implemented
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
@@ -193,7 +193,7 @@ async def user_new_auth_key(
else:
user_obj = {}
user_obj['auth_key'] = update_user_data['auth_key']
return mk_resp(data=user_obj)
return mk_resp(data=user_obj, response=response)
else:
log.info('The user record was not updated with a new auth_key')
log.debug(user_rec_update_result)
@@ -248,15 +248,15 @@ async def user_authenticate(
if password_hash := user_rec_result.get('password', None):
if verify_secure_hash_string(string=password, string_hash=password_hash):
log.info('The username was found, and the password matched.')
#return mk_resp(data=False, status_message='The username was found, and the password matched.')
#return mk_resp(data=False, status_message='The username was found, and the password matched.', response=response)
else:
log.info('The username was found, but the password did not match.')
return mk_resp(data=False, status_message='The username was found, but the password did not match.')
return mk_resp(data=False, status_message='The username was found, but the password did not match.', response=response)
else:
log.error('The password has was not found. This should not happen.')
return mk_resp(data=False, status_message='The password has was not found. This should not happen.')
return mk_resp(data=False, status_message='The password has was not found. This should not happen.', response=response)
else: return mk_resp(data=None, status_code=404, status_message='The user account was not found')
else: return mk_resp(data=None, status_code=404, status_message='The user account was not found', response=response)
elif auth_key:
if user_rec_result := sql_select(table_name='user', field_name='auth_key', field_value=auth_key):
update_user_data = {}
@@ -270,9 +270,9 @@ async def user_authenticate(
log.debug(user_rec_update_result)
user_id = user_rec_result.get('id', None) # NOTE: This us looking for "id", not "user_id"
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=404, status_message='A user account with that auth key was not found', response=response)
else:
return mk_resp(data=None, status_code=400, status_message='One more user account fields was missing or unexpected.') # Bad Request
return mk_resp(data=None, status_code=400, status_message='One more user account fields was missing or unexpected.', response=response) # Bad Request
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_rec_result)
@@ -285,7 +285,7 @@ async def user_authenticate(
log.info('The user account is enabled')
else:
log.info('The user account is not enabled')
return mk_resp(data=False, status_message='This user account is not enabled')
return mk_resp(data=False, status_message='This user account is not enabled', response=response)
#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):
@@ -294,7 +294,7 @@ async def user_authenticate(
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')
return mk_resp(data=False, status_message='This account is not yet enabled', response=response)
#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):
@@ -303,7 +303,7 @@ async def user_authenticate(
log.info('Enable to datetime is valid')
else:
log.info('Enable to datetime is in the past. Your user account has been disabled.')
return mk_resp(data=False, status_message='This account is not enabled because the expiratation date has passed')
return mk_resp(data=False, status_message='This account is not enabled because the expiratation date has passed', response=response)
user_obj = load_user_obj(
user_id=user_id,
@@ -313,7 +313,7 @@ async def user_authenticate(
inc_person=inc_person
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = user_obj
return mk_resp(data=user_obj)
return mk_resp(data=user_obj, response=response)
else:
log.error('SQL result was unexpected. A dict result type was expected. This should not happen.')
return mk_resp(data=False, status_code=500, response=response)
@@ -417,8 +417,8 @@ async def lookup_user_obj(
data = user_obj_li
else:
log.debug(user_rec_result)
return mk_resp(data=None, status_code=404) # Not Found
return mk_resp(data=data)
return mk_resp(data=None, status_code=404, response=response) # Not Found
return mk_resp(data=data, response=response)
# Look up a user with an email address for an account
@@ -575,8 +575,8 @@ async def lookup_username(
data = user_obj_li
else:
log.debug(user_obj_result)
return mk_resp(data=None, status_code=404) # Not Found
return mk_resp(data=data)
return mk_resp(data=None, status_code=404, response=response) # Not Found
return mk_resp(data=data, response=response)
# ### BEGIN ### API User ### get_user_obj() ###
@@ -615,7 +615,7 @@ async def get_user_obj(
if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
else:
return mk_resp(data=None, status_code=404)
return mk_resp(data=None, status_code=404, response=response)
if user_result := load_user_obj(
user_id = user_id,
@@ -646,7 +646,7 @@ async def get_user_obj(
else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
return mk_resp(data=response_data, response=response)
# ### END ### API User ### get_user_obj() ###
@@ -677,7 +677,7 @@ async def get_user_obj_order_list(
if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
else:
return mk_resp(data=None, status_code=404)
return mk_resp(data=None, status_code=404, response=response)
# Updated 2021-06-28
if order_rec_list_result := get_order_rec_list(
@@ -708,7 +708,7 @@ async def get_user_obj_order_list(
else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data)
return mk_resp(data=response_data, response=response)
# ### END ### API User ### get_user_obj_order_list() ###