mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-25 01:20:32 +00:00
Fix for login issue on MacOS
This commit is contained in:
parent
f59d9d5aa8
commit
73bbffccaa
@ -288,7 +288,7 @@ def check_auth(username, password):
|
||||
username=username.encode('windows-1252')
|
||||
user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) ==
|
||||
username.decode('utf-8').lower()).first()
|
||||
return bool(user and check_password_hash(user.password, password))
|
||||
return bool(user and check_password_hash(str(user.password), password))
|
||||
|
||||
|
||||
def authenticate():
|
||||
|
@ -1115,7 +1115,7 @@ def login():
|
||||
log.info('LDAP Login failed for user "%s" IP-adress: %s', form['username'], ipAdress)
|
||||
flash(_(u"Wrong Username or Password"), category="error")
|
||||
else:
|
||||
if user and check_password_hash(user.password, form['password']) and user.nickname != "Guest":
|
||||
if user and check_password_hash(str(user.password), form['password']) and user.nickname != "Guest":
|
||||
login_user(user, remember=True)
|
||||
flash(_(u"You are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
|
||||
return redirect_back(url_for("web.index"))
|
||||
|
Loading…
Reference in New Issue
Block a user