[Jifty-commit] r5332 - in jifty/trunk/lib/Jifty/Plugin: .

[Jifty commits]

Author: clkao
Date: Tue Apr 22 05:23:53 2008
New Revision: 5332

Modified:
   jifty/trunk/lib/Jifty/Plugin/OpenID.pm
   jifty/trunk/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm
   jifty/trunk/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm

Log:
Refactor get_csr.

Modified: jifty/trunk/lib/Jifty/Plugin/OpenID.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID.pm	Tue Apr 22 05:23:53 2008
@@ -3,6 +3,7 @@
 
 package Jifty::Plugin::OpenID;
 use base qw/Jifty::Plugin/;
+use LWPx::ParanoidAgent;
 
 =head1 NAME
 
@@ -14,4 +15,16 @@
 
 =cut
 
+sub get_csr {
+    my $class = shift;
+
+    return Net::OpenID::Consumer->new(
+        ua              => LWPx::ParanoidAgent->new,
+        cache           => Cache::FileCache->new,
+        args            => scalar Jifty->handler->cgi->Vars,
+        consumer_secret => Jifty->config->app('OpenIDSecret'),
+        @_,
+    );
+}
+
 1;

Modified: jifty/trunk/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm	Tue Apr 22 05:23:53 2008
@@ -45,13 +45,7 @@
     my $path   = $self->argument_value('return_to');
 
     my $baseurl = Jifty->web->url;
-    my $csr = Net::OpenID::Consumer->new(
-        ua    => LWPx::ParanoidAgent->new,
-        cache => Cache::FileCache->new,
-        args  => scalar Jifty->handler->cgi->Vars,
-        consumer_secret => Jifty->config->app('OpenIDSecret'),
-        required_root => $baseurl
-    );
+    my $csr = Jifty::Plugin::OpenID->get_csr( required_root => $baseurl );
 
     my $claimed_id = $csr->claimed_identity( $openid );
 

Modified: jifty/trunk/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm	Tue Apr 22 05:23:53 2008
@@ -12,7 +12,6 @@
 
 use Net::OpenID::Consumer;
 use Cache::FileCache;
-use LWPx::ParanoidAgent;
 
 =head2 arguments
 
@@ -39,12 +38,7 @@
     $sig =~ s/ /+/g;
     Jifty->handler->cgi->param( 'openid.sig' => $sig );
 
-    my $csr = Net::OpenID::Consumer->new(
-        ua              => LWPx::ParanoidAgent->new,
-        cache           => Cache::FileCache->new,
-        args            => scalar Jifty->handler->cgi->Vars,
-        consumer_secret => Jifty->config->app('OpenIDSecret')
-    );
+    my $csr = Jifty::Plugin::OpenID->get_csr;
 
     if ( my $setup = $csr->user_setup_url ) {
         Jifty->web->_redirect($setup);