From: Patrick Uiterwijk Date: Thu, 23 Apr 2015 21:25:04 +0000 (+0200) Subject: Use the new transaction convenience function in Persona X-Git-Tag: v1.0.0~44 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=b6d5f11ffe484e2ba7de14c7bac31c52461fe791 Use the new transaction convenience function in Persona Signed-off-by: Patrick Uiterwijk Reviewed-by: Rob Crittenden --- diff --git a/ipsilon/providers/persona/auth.py b/ipsilon/providers/persona/auth.py index f713347..d314993 100644 --- a/ipsilon/providers/persona/auth.py +++ b/ipsilon/providers/persona/auth.py @@ -1,7 +1,6 @@ # Copyright (C) 2014 Ipsilon project Contributors, for licensee see COPYING from ipsilon.providers.common import ProviderPageBase -from ipsilon.util.trans import Transaction from ipsilon.util.user import UserSession import base64 @@ -18,15 +17,7 @@ class AuthenticateRequest(ProviderPageBase): self.trans = None def _preop(self, *args, **kwargs): - try: - # generate a new id or get current one - self.trans = Transaction('persona', **kwargs) - if self.trans.cookie.value != self.trans.provider: - self.debug('Invalid transaction, %s != %s' % ( - self.trans.cookie.value, self.trans.provider)) - except Exception, e: # pylint: disable=broad-except - self.debug('Transaction initialization failed: %s' % repr(e)) - raise cherrypy.HTTPError(400, 'Invalid transaction id') + self.trans = self.get_valid_transaction('persona', **kwargs) def pre_GET(self, *args, **kwargs): self._preop(*args, **kwargs)