freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

login: Allow e-mail address instead of user name 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2017-12-12 13:22:28 +01:00
parent 782d4b4065
commit 083f3c3534
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffmap/usertools.py
View File

@ -57,13 +57,15 @@ def register_user(nickname, email, password):
def check_login_details(nickname, password):
mysql = FreifunkMySQL()
user = mysql.findone("SELECT * FROM users WHERE nickname = %s LIMIT 1",(nickname,))
user = mysql.findone("SELECT * FROM users WHERE nickname = %s LIMIT 1",(nickname,))
userbymail = mysql.findone("SELECT * FROM users WHERE email = %s LIMIT 1",(nickname,))
mysql.close()
if user and check_password_hash(user.get('password', ''), password):
return user
else:
return False
elif userbymail and check_password_hash(userbymail.get('password', ''), password):
return userbymail
return False
def reset_user_password(mysql, email, token=None, password=None):
userid = mysql.findone("SELECT id FROM users WHERE email = %s LIMIT 1",(email,),"id")