From 96ee80afd21acb74903fd69d9974580d4e0151a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 30 Jun 2017 14:34:05 +0200 Subject: [PATCH] Only trigger onUserLogged(In|Out) if login state actually changed This also includes triggering an initial onUserLoggedIn after initialization if the user turned out to be logged in by passive login. --- .../static/js/app/viewmodels/loginstate.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/loginstate.js b/src/octoprint/static/js/app/viewmodels/loginstate.js index a356ef13..abead92c 100644 --- a/src/octoprint/static/js/app/viewmodels/loginstate.js +++ b/src/octoprint/static/js/app/viewmodels/loginstate.js @@ -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"); + } } };