From d6f82392e0098a279d21798845d1d15fe0ba9e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Fri, 30 Jan 2015 16:43:41 +0100 Subject: [PATCH] authform: during an auto association don't reload the login page --- mandaye/auth/authform.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mandaye/auth/authform.py b/mandaye/auth/authform.py index dde9205..5f615a7 100644 --- a/mandaye/auth/authform.py +++ b/mandaye/auth/authform.py @@ -321,14 +321,14 @@ a password_field key if you want to encode a password.") logger.debug('User %s successfully login' % env['beaker.session']['unique_id']) association = Association.get_last_connected(self.site_name, unique_id) + if not association and session.get('post_values'): + logger.info('Auto associate user which is already locally logged in') + self._save_association(env, unique_id, session['post_values']) + del session['post_values'] + del session['is_associated'] + session.save() + association = Association.get_last_connected(self.site_name, unique_id) if not association: - if session.get('post_values'): - logger.info('Auto associate user which is already locally logged in') - self._save_association(env, unique_id, session['post_values']) - del session['post_values'] - del session['is_associated'] - session.save() - return _302(self.urls['login_url']) logger.debug('User %s is not associate' % env['beaker.session']['unique_id']) return _302(self.urls.get('associate_url') + "?type=first") return self._login_sp_user(association, env, values)