Changeset 8716 for lang/perl/OAuth-Lite

Timestamp:

04/03/08 11:06:15 (5 years ago)

Author:

lyokato

Message:

lang/perl/OAuth-Lite: Checking in changes prior to tagging of version 1.09. Changelog diff is:

Index: Changes
===================================================================
--- Changes (リビジョン 7759)
+++ Changes (作業コピー)
@@ -1,5 +1,9 @@

Revision history for Perl extension OAuth::Lite.

+1.09 Mon Mar 31 15:47:00 2008
+ - Consumer::url_to_authorize and Consumer::get_access_token now can handles
+ empty token.
+

1.08 Mon Mar 10 16:03:00 2008

• rt #33943
  added Content-Length header in case request method is POST or PUT,
  

Location:

lang/perl/OAuth-Lite/trunk

Files:

• Changes (modified) (1 diff)
• lib/OAuth/Lite.pm (modified) (1 diff)
• lib/OAuth/Lite/Consumer.pm (modified) (3 diffs)
• t/05_consumer.t (modified) (4 diffs)

lang/perl/OAuth-Lite/trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension OAuth::Lite.
+
+1.09  Mon Mar 31 15:47:00 2008
+    - Consumer::url_to_authorize and Consumer::get_access_token now can handles
+      empty token.
 
 1.08  Mon Mar 10 16:03:00 2008

lang/perl/OAuth-Lite/trunk/lib/OAuth/Lite.pm

@@ -4 +4 @@
 use warnings;
 
-our $VERSION = "1.08";
+our $VERSION = "1.09";
 our $OAUTH_DEFAULT_VERSION = "1.0";
 

lang/perl/OAuth-Lite/trunk/lib/OAuth/Lite/Consumer.pm

@@ -356 +356 @@
     my %params = ();
     $params{oauth_callback} = $args{callback_url} if $args{callback_url};
-    if (my $token = $args{token}) {
+    if (defined $args{token}) {
+        my $token = $args{token};
         $params{oauth_token} = ( eval { $token->isa('OAuth::Lite::Token') } )
             ? $token->token
@@ -452 +453 @@
     my ($self, %args) = @_;
     $args{url} ||= $self->access_token_url;
-    $args{token} ||= $self->request_token;
     my $access_token_url = $args{url}
         or Carp::croak qq/get_access_token needs access_token_url./;
-    my $token = $args{token}
-        or Carp::croak qq/get_access_token needs token./;
+    my $token = defined $args{token} ? $args{token} : $self->request_token;
+    Carp::croak qq/get_access_token needs token./ unless defined $token;
     my $realm = $args{realm} || $self->{realm} || '';
     my $res = $self->__request(
@@ -710 +710 @@
     $params->{oauth_nonce} = gen_random_key();
     $params->{oauth_version} = $OAuth::Lite::OAUTH_DEFAULT_VERSION;
+    my $token_secret = '';
     if (defined $token) {
-        $params->{oauth_token} = ( eval { $token->isa('OAuth::Lite::Token') } )
-            ? $token->token
-            : $token;
+        if (eval { $token->isa('OAuth::Lite::Token') }) {
+            $params->{oauth_token} = $token->token;
+            $token_secret = $token->secret;
+        } else {
+            $params->{oauth_token} = $token;
+        }
     }
     my $consumer_secret = $self->consumer_secret || '';
-    my $token_secret = defined $token ? $token->secret : '';
     $params->{oauth_signature_method} = $self->{signature_method}->method_name;
     if ($params->{oauth_signature_method} eq 'PLAINTEXT' && lc($url) !~ /^https/) {

lang/perl/OAuth-Lite/trunk/t/05_consumer.t

@@ -1 @@
-use Test::More tests => 38;
+use Test::More tests => 54;
 
 use URI::Escape;
@@ -84 +84 @@
 is( $auth_url3, qq{http://example2.org/path/to/authorize?oauth_callback=$enc_callback_url} );
 
+my $auth_url4 = $c5->url_to_authorize( token => '' );
+is ($auth_url4, q{http://example2.org/path/to/authorize?oauth_token=}, 'url_to_authorize works as expected.');
+
 my $c6 = OAuth::Lite::Consumer->new(
         consumer_key       => $consumer_key,
@@ -94 +97 @@
 );
 
-my $auth_url4 = $c6->url_to_authorize( token => $atoken1 );
-is( $auth_url4, qq{http://example2.org/path/to/authorize?oauth_callback=$enc_callback_url&oauth_token=foo} );
+my $auth_url5 = $c6->url_to_authorize( token => $atoken1 );
+is( $auth_url5, qq{http://example2.org/path/to/authorize?oauth_callback=$enc_callback_url&oauth_token=foo} );
 
 my $oauth_params1 = $c6->gen_auth_params('GET', 'http://example.org/');
@@ -116 +119 @@
 like($oauth_params2->{oauth_timestamp}, qr/^\d+$/, 'collect timestamp');
 like($oauth_params2->{oauth_nonce}, qr/^[a-fA-F0-9]+$/, 'collect timestamp');
+
+my $oauth_params3 = $c6->gen_auth_params('POST', 'http://example.org/', '');
+ok(exists $oauth_params3->{oauth_token}, "oauth_token should be included");
+ok(exists $oauth_params3->{oauth_signature}, 'signature is set');
+is($oauth_params3->{oauth_consumer_key}, $consumer_key, 'collect consumer_key');
+is($oauth_params3->{oauth_signature_method}, 'HMAC-SHA1', 'collect signature method');
+#is($oauth_params2->{oauth_signature}, 'HMAC-SHA1', 'collect signature');
+is($oauth_params3->{oauth_token}, '', 'collect token');
+is($oauth_params3->{oauth_version}, '1.0', 'collect version');
+like($oauth_params3->{oauth_timestamp}, qr/^\d+$/, 'collect timestamp');
+like($oauth_params3->{oauth_nonce}, qr/^[a-fA-F0-9]+$/, 'collect timestamp');
+
+my $oauth_params4 = $c6->gen_auth_params('POST', 'http://example.org/');
+ok(!exists $oauth_params4->{oauth_token}, "oauth_token shouldn't be included");
+ok(exists $oauth_params4->{oauth_signature}, 'signature is set');
+is($oauth_params4->{oauth_consumer_key}, $consumer_key, 'collect consumer_key');
+is($oauth_params4->{oauth_signature_method}, 'HMAC-SHA1', 'collect signature method');
+#is($oauth_params2->{oauth_signature}, 'HMAC-SHA1', 'collect signature');
+is($oauth_params4->{oauth_version}, '1.0', 'collect version');
+like($oauth_params4->{oauth_timestamp}, qr/^\d+$/, 'collect timestamp');
+like($oauth_params4->{oauth_nonce}, qr/^[a-fA-F0-9]+$/, 'collect timestamp');
 
 my $auth_query1 = $c6->gen_auth_query('GET', q{http://example.org/});