From 2e27e640cd9bd3f192ec498ba3a03f0132f8cb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 24 Aug 2016 16:27:23 +0200 Subject: [PATCH] Better yet, mirror actual active login --- src/octoprint/server/util/flask.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 7b8c66b4..98a7b4e0 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -247,13 +247,11 @@ def passive_login(): if netaddr.IPAddress(remoteAddr) in localNetworks: user = octoprint.server.userManager.findUser(autologinAs) if user is not None: - flask.ext.login.login_user(user) - if octoprint.server.userManager.enabled: - user = octoprint.server.userManager.login_user(user) - flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id())) - if hasattr(user, "get_session"): - flask.session["usersession.id"] = user.get_session() + user = octoprint.server.userManager.login_user(user) + flask.session["usersession.id"] = user.get_session() flask.g.user = user + flask.ext.login.login_user(user) + flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id())) return flask.jsonify(user.asDict()) except: logger = logging.getLogger(__name__)