Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : bkabrda-workspace
commit e19fa97a7e3f90fa18a7c973ccffb241a58d3ccb Author: Bohuslav Kabrda bkabrda@redhat.com Date: Mon Nov 26 08:11:17 2012 +0100
Ask fedorapeople for mail, too
wsgi/coprs/views/misc.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/wsgi/coprs/views/misc.py b/wsgi/coprs/views/misc.py index 224e8eb..3836a90 100644 --- a/wsgi/coprs/views/misc.py +++ b/wsgi/coprs/views/misc.py @@ -19,10 +19,7 @@ def login(): if flask.request.method == 'POST': fasusername = flask.request.form.get('fasuname') if fasusername: - return oid.try_login('http://%7B0%7D.id.fedoraproject.org/%27.format(fasusername)) - openid = flask.request.form.get('openid') - if openid: - return oid.try_login(openid) + return oid.try_login('http://%7B0%7D.id.fedoraproject.org/%27.format(fasusername), ask_for = ["email"]) return flask.render_template('login.html', next=oid.get_next_url(), error=oid.fetch_error()) @@ -33,7 +30,7 @@ def create_or_login(resp): flask.session['openid'] = resp.identity_url user = models.User.query.filter(models.User.openid_name == resp.identity_url).first() if not user: # create if not created already - user = models.User(openid_name = resp.identity_url) + user = models.User(openid_name = resp.identity_url, mail = resp.email) db.session.add(user) db.session.commit() flask.flash(u'Welcome, {0}'.format(user.name))
copr-devel@lists.fedorahosted.org