from openid.consumer.consumer import Consumer
from openid.extensions.sreg import SRegRequest, SRegResponse
from openid.store.filestore import FileOpenIDStore
+from openid.yadis.discover import DiscoveryFailure
from sqlalchemy.orm.exc import NoResultFound
-from pylons import request, response, session, tmpl_context as c, url, h
-from pylons.controllers.util import abort, redirect
+from pylons import request, response, session, tmpl_context as c, url
+from pylons.controllers.util import abort, redirect, redirect_to
from routes import url_for, request_config
from floof.lib.base import BaseController, render
+import floof.lib.helpers as h
from floof.model.users import IdentityURL, User
log = logging.getLogger(__name__)
+from floof.model import UserPage
+
class AccountController(BaseController):
openid_store = FileOpenIDStore('/var/tmp')
def login(self):
+ c.bogus_identity_url = request.params.get('bogus_identity_url', None)
return render('/account/login.mako')
def login_begin(self):
"""Step one of logging in with OpenID; we redirect to the provider"""
+ identity_url = request.params['identity_url']
cons = Consumer(session=session, store=self.openid_store)
- auth_request = cons.begin(request.params['identity_url'])
+ try:
+ auth_request = cons.begin(identity_url)
+ except DiscoveryFailure:
+ redirect_to(controller='account', action='login',
+ bogus_identity_url=identity_url)
+
sreg_req = SRegRequest(optional=['nickname', 'email', 'dob', 'gender',
'country', 'language', 'timezone'])
auth_request.addExtension(sreg_req)
c.identity_url = session['register:identity_url']
c.nickname = session.get('register:nickname', None)
+ # XXX hey, uh. warn if this name is taken already.
return render('/account/register.mako')
identity_url = session['register:identity_url']
username = request.params.get('username', None)
- # XXX how do we return errors in some useful way?
-
if not username:
- return 'Please enter a username.'
+ h.flash(u'Please enter a username.')
+ return self.register()
if User.query.filter_by(name=username).count():
- return 'That username is taken.'
+ h.flash(u'This username is already taken.')
+ return self.register()
+
+ if not User.is_valid_name(username):
+ h.flash(u'This username is not valid.')
+ return self.register()
# Create db records
- user = User(name=username)
+ user = User(name=username, display_name=username)
user.identity_urls.append(IdentityURL(url=identity_url))
+
elixir.session.commit()
# Log in
session['user_id'] = user.id
session.save()
+ h.flash(u'You are now logged in.')
- # XXX how do we do success messages in some useful way?
# XXX send me where I came from
redirect('/')