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

Better yet, mirror actual active login

Browse source
This commit is contained in:
Gina Häußge 2016-08-24 16:27:23 +02:00
parent 1d8dea4d1b
commit 2e27e640cd
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/octoprint/server/util/flask.py
View file

@ -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__)