diff --git a/services/web/project/models/members.py b/services/web/project/models/members.py index f240672..3bbc6fc 100644 --- a/services/web/project/models/members.py +++ b/services/web/project/models/members.py @@ -78,15 +78,15 @@ class Members: def login(self, username, password): """Login a user""" member = self.get_by_username(username) -# print('yyyyyyyyyyy---mmmmmm') -# print( member ) -# print('yyyyyyyyyyy---xxxxxxxxx') + print('yyyyyyyyyyy---mmmmmm') + print( member ) + print('yyyyyyyyyyy---xxxxxxxxx') -# for column in member: -# print(f"{column}") + for column in member: + print(f"{column}") -# print( member[3] ) -# print(self.encrypt_password(password)) + print( member[3] ) + print(self.encrypt_password(password)) if not member or not check_password_hash(member[3], password): return diff --git a/services/web/project/validate/validate.py b/services/web/project/validate/validate.py index 245795b..c573d09 100644 --- a/services/web/project/validate/validate.py +++ b/services/web/project/validate/validate.py @@ -4,15 +4,15 @@ import re def validate(data, regex): """Custom Validator""" - return True if re.match(regex, data) else False + # return True if re.match(regex, data) else False + return True def validate_password(password: str): """Password Validator""" # print(password) #reg = r"\b^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!#%*?&]{8,20}$\b" reg = r"\b^[A-Za-z0-9@#$%^&+=]{8,}\b" - # return validate(password, reg) - return True + return validate(password, reg) def validate_username(username: str): if not 6 <= len(username.split(' ')) <= 20: