archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fixed user switching.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-09-19 13:38:48 +02:00
parent 9cce441f6c
commit bd976e6c2e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pillar/web/users/routes.py
View File

@@ -82,6 +82,11 @@ def oauth_callback(provider):
@blueprint.route('/login') @blueprint.route('/login')
def login(): def login():
if request.args.get('force'):
log.debug('Forcing logout of user before rendering login page.')
logout_user()
session.clear()
session['next_after_login'] = request.args.get('next') or request.referrer session['next_after_login'] = request.args.get('next') or request.referrer
return render_template('login.html') return render_template('login.html')
@@ -120,6 +125,7 @@ def switch():
# back to the Cloud after switching users. # back to the Cloud after switching users.
next_url_after_bid_login = url_for('users.login', next_url_after_bid_login = url_for('users.login',
next=next_url_after_cloud_login, next=next_url_after_cloud_login,
force='yes',
_external=True) _external=True)
return redirect(blender_id.switch_user_url(next_url=next_url_after_bid_login)) return redirect(blender_id.switch_user_url(next_url=next_url_after_bid_login))