summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2015-04-23 23:25:04 +0200
committerPatrick Uiterwijk <puiterwijk@redhat.com>2015-04-24 19:08:27 +0200
commitb6d5f11ffe484e2ba7de14c7bac31c52461fe791 (patch)
tree8e9c9ab1a8cd22bc6b2b74fc8ad357a28d8345ff
parentbf5398120e33ff3e88d7b3794c9437e7e75ee369 (diff)
downloadipsilon-b6d5f11ffe484e2ba7de14c7bac31c52461fe791.tar.gz
ipsilon-b6d5f11ffe484e2ba7de14c7bac31c52461fe791.tar.xz
ipsilon-b6d5f11ffe484e2ba7de14c7bac31c52461fe791.zip
Use the new transaction convenience function in Persona
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
-rw-r--r--ipsilon/providers/persona/auth.py11
1 files changed, 1 insertions, 10 deletions
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)