From b6b1bfd33b42b4dcb90573023aea6d3ac9853aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 19 Aug 2015 17:29:25 +0200 Subject: [PATCH] Allow programmatic login in the UI --- src/octoprint/static/js/app/viewmodels/loginstate.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/loginstate.js b/src/octoprint/static/js/app/viewmodels/loginstate.js index 9acfe7bd..e1e6d2c8 100644 --- a/src/octoprint/static/js/app/viewmodels/loginstate.js +++ b/src/octoprint/static/js/app/viewmodels/loginstate.js @@ -66,10 +66,10 @@ $(function() { } }; - self.login = function() { - var username = self.loginUser(); - var password = self.loginPass(); - var remember = self.loginRemember(); + self.login = function(u, p, r, callback) { + var username = u || self.loginUser(); + var password = p || self.loginPass(); + var remember = (r != undefined ? r : self.loginRemember()); self.loginUser(""); self.loginPass(""); @@ -82,6 +82,7 @@ $(function() { success: function(response) { new PNotify({title: gettext("Login successful"), text: _.sprintf(gettext('You are now logged in as "%(username)s"'), {username: response.name}), type: "success"}); self.fromResponse(response); + if (callback) callback(response); }, error: function(jqXHR, textStatus, errorThrown) { new PNotify({title: gettext("Login failed"), text: gettext("User unknown or wrong password"), type: "error"});