From 1d8dea4d1bee1d5faec729cd23c327c8355e72f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 24 Aug 2016 16:23:41 +0200 Subject: [PATCH] Fully mirror regular passive_login for auto login --- src/octoprint/server/util/flask.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 2788dd6c..7b8c66b4 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -247,9 +247,13 @@ def passive_login(): if netaddr.IPAddress(remoteAddr) in localNetworks: user = octoprint.server.userManager.findUser(autologinAs) if user is not None: - flask.g.user = user 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() + flask.g.user = user return flask.jsonify(user.asDict()) except: logger = logging.getLogger(__name__)