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

Only trigger onUserLogged(In|Out) if login state actually changed

Browse source 
This also includes triggering an initial onUserLoggedIn after
initialization if the user turned out to be logged in by passive login.
This commit is contained in:
Gina Häußge 2017-06-30 14:34:05 +02:00
parent 8aec836d22
commit 96ee80afd2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,16 +52,21 @@ $(function() {
self.fromResponse = function(response) {
var process = function() {
var currentLoggedIn = self.loggedIn();
if (response && response.name) {
self.loggedIn(true);
self.updateCurrentUserData(response);
callViewModels(self.allViewModels, "onUserLoggedIn", [response]);
log.info("User " + response.name + " logged in")
if (!currentLoggedIn) {
callViewModels(self.allViewModels, "onUserLoggedIn", [response]);
log.info("User " + response.name + " logged in")
}
} else {
self.loggedIn(false);
self.resetCurrentUserData();
callViewModels(self.allViewModels, "onUserLoggedOut");
log.info("User logged out");
if (currentLoggedIn) {
callViewModels(self.allViewModels, "onUserLoggedOut");
log.info("User logged out");
}
}
};