pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure that deactivated Users can't login

Browse source
This commit is contained in:
Marc Hannappel 2017-10-25 14:40:49 +02:00
parent 38c410f80f
commit 3d1f3be4fc
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/server/api/__init__.py
View file

@ -204,6 +204,9 @@ def login():
user = octoprint.server.userManager.findUser(username)
if user is not None:
if not user.is_active():
return make_response(("Your account is deactivated", 403, []))
if octoprint.server.userManager.checkPassword(username, password):
if octoprint.server.userManager.enabled:
user = octoprint.server.userManager.login_user(user)

21
src/octoprint/static/js/app/viewmodels/loginstate.js
View file

@ -113,8 +113,25 @@ $(function() {
history.replaceState({success: true}, document.title, window.location.pathname);
}
})
.fail(function() {
new PNotify({title: gettext("Login failed"), text: gettext("User unknown or wrong password"), type: "error"});
.fail(function(response) {
switch(response.status) {
case 401: {
new PNotify({
title: gettext("Login failed"),
text: gettext("User unknown or wrong password"),
type: "error"
});
break;
}
case 403: {
new PNotify({
title: gettext("Login failed"),
text: gettext("Your account is deactivated"),
type: "error"
});
break;
}
}
});
};