Changeset 676 for oss/oidtool/oidtool.py

Timestamp:

05/15/08 08:52:13 (6 months ago)

Author:

sylvain

Message:

updated for CherryPy? 3.1

Files:

• oss/oidtool/oidtool.py (modified) (5 diffs)

oss/oidtool/oidtool.py

@@ -1 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-1
+2
-__authors__ = ["Sylvain Hellegouarch (sh@defuze.org)"]
-6/12/28
+8/05/15
-__copyright__ = """
-
+, 2007, 2008
-All rights reserved.
-"""
@@ -137 +136 @@
-        we redirect the user-agent to that url for authentication.
-        """
-
-        # If the requested path belongs to the one defined for the
-        # connection handlers then we do not performany verification
@@ -148 +146 @@
-        if self.is_processing():
-            return 
-    
+
-        openid_url = cherrypy.request.params.get('openid_url', None)
-        if not openid_url:
-            raise cherrypy.HTTPRedirect(self.login_path)
+
+        del cherrypy.request.params['openid_url']
-
-        oidconsumer = consumer.Consumer(self.get_session(), self.store)
@@ -175 +175 @@
-                redirect_url = request.redirectURL(cherrypy.request.base, return_to)
-
+                cherrypy.session[self.session_name]['return_to'] = return_to
-                cherrypy.session[self.session_name]['status'] = PROCESSING
-                raise cherrypy.HTTPRedirect(redirect_url)
@@ -202 +203 @@
-        # either None or a string containing more information about
-        # the return type.
-
+
+
-        cherrypy.session[self.session_name]['info'] = info
-        if info.status == consumer.FAILURE and info.identity_url: