projects
/
zzz-spline-users.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated login to work correctly with current spline. #69
[zzz-spline-users.git]
/
spline
/
plugins
/
users
/
controllers
/
accounts.py
diff --git
a/spline/plugins/users/controllers/accounts.py
b/spline/plugins/users/controllers/accounts.py
index
67d62e4
..
03c9392
100644
(file)
--- a/
spline/plugins/users/controllers/accounts.py
+++ b/
spline/plugins/users/controllers/accounts.py
@@
-4,9
+4,9
@@
from openid.extensions.sreg import SRegRequest, SRegResponse
from openid.store.filestore import FileOpenIDStore
from sqlalchemy.orm.exc import NoResultFound
from openid.store.filestore import FileOpenIDStore
from sqlalchemy.orm.exc import NoResultFound
-from pylons import config, request, response, session, tmpl_context as c
+from pylons import config, request, response, session, tmpl_context as c
, url
from pylons.controllers.util import abort, redirect_to
from pylons.controllers.util import abort, redirect_to
-from routes import
url_for,
request_config
+from routes import request_config
from spline import model
from spline.model import meta
from spline import model
from spline.model import meta
@@
-35,7
+35,7
@@
class AccountsController(BaseController):
host = request.headers['host']
protocol = request_config().protocol
host = request.headers['host']
protocol = request_config().protocol
- return_url = url
_for
(host=host, controller='accounts', action='login_finish')
+ return_url = url(host=host, controller='accounts', action='login_finish')
new_url = auth_request.redirectURL(return_to=return_url,
realm=protocol + '://' + host)
redirect_to(new_url)
new_url = auth_request.redirectURL(return_to=return_url,
realm=protocol + '://' + host)
redirect_to(new_url)
@@
-45,7
+45,7
@@
class AccountsController(BaseController):
cons = Consumer(session=session, store=self.openid_store)
host = request.headers['host']
cons = Consumer(session=session, store=self.openid_store)
host = request.headers['host']
- return_url = url
_for
(host=host, controller='accounts', action='login_finish')
+ return_url = url(host=host, controller='accounts', action='login_finish')
res = cons.complete(request.params, return_url)
if res.status != 'success':
res = cons.complete(request.params, return_url)
if res.status != 'success':
@@
-61,7
+61,8
@@
class AccountsController(BaseController):
sreg_res = SRegResponse.fromSuccessResponse(res)
try:
username = sreg_res['nickname']
sreg_res = SRegResponse.fromSuccessResponse(res)
try:
username = sreg_res['nickname']
- except KeyError:
+ except (KeyError, TypeError):
+ # KeyError if sreg has no nickname; TypeError if sreg is None
username = 'Anonymous'
# Create db records
username = 'Anonymous'
# Create db records
@@
-75,4
+76,4
@@
class AccountsController(BaseController):
session['user_id'] = user.id
session.save()
session['user_id'] = user.id
session.save()
- re
turn "Hello, %s" % user.name
+ re
direct_to(url('/'))