[Jifty-commit] r4994 - in jifty/trunk/lib/Jifty/Plugin/OpenID: Mixin/Model

Jifty commits jifty-commit at lists.jifty.org
Tue Feb 5 09:46:15 EST 2008


Author: clkao
Date: Tue Feb  5 09:46:15 2008
New Revision: 4994

Modified:
   jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm
   jifty/trunk/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm

Log:
* don't prepend http:// on https:// openid urls.
* on verification failure, call continuation if there's one,
  rather than always redirect to /openid/login.


Modified: jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID/Dispatcher.pm	Tue Feb  5 09:46:15 2008
@@ -90,7 +90,11 @@
         }
     }
     else {
-        redirect '/openid/login';
+        if(Jifty->web->request->continuation) {
+            Jifty->web->request->continuation->call;
+        } else {
+            redirect '/openid/login';
+        }
     }
 };
 

Modified: jifty/trunk/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm	Tue Feb  5 09:46:15 2008
@@ -79,7 +79,7 @@
         if not defined $openid or not length $openid;
 
     $openid = 'http://' . $openid
-        if $openid !~ m{^http://};
+        if $openid !~ m{^https?://};
 
     my $uri = URI->new( $openid );
 


More information about the Jifty-commit mailing list