darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 07:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

109898688: Refactor the validate codes logic to be more susinct and easier to read.

Browse Source
This commit is contained in:
Rebecca Law
2015-12-17 15:09:12 +00:00
parent 010be66d31
commit fe8a1a10c5
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/main/forms.py
View File

@@ -95,21 +95,18 @@ class AddServiceForm(Form):
def validate_codes(field, code_type): def validate_codes(field, code_type):
codes = verify_codes_dao.get_codes(user_id=session['user_id'], code_type=code_type) codes = verify_codes_dao.get_codes(user_id=session['user_id'], code_type=code_type)
for code in codes: is_valid = len([code for code in codes if validate_code(field, code)]) == 1
if validate_code(field, code): if is_valid:
if code.expiry_datetime <= datetime.now(): field.errors.clear()
field.errors.append('Code has expired') return is_valid
return False
return True
field.errors.append('Code does not match')
return False
def validate_code(field, code): def validate_code(field, code):
if field.data is not None: if field.data and check_hash(field.data, code.code):
if check_hash(field.data, code.code) is False: if code.expiry_datetime <= datetime.now():
field.errors.append('Code has expired')
return False return False
else: return True
return True
else: else:
field.errors.append('Code does not match')
return False return False