[Jifty-commit] r4266 - in jifty/trunk: lib/Jifty/Plugin/OAuth lib/Jifty/Plugin/OAuth/Action lib/Jifty/Plugin/OAuth/Model

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Fri Oct 19 17:18:43 2007
New Revision: 4266

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/OAuth/Action/AuthorizeRequestToken.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/Dispatcher.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/Model/Consumer.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/View.pm

Log:
 r43894 at onn:  sartak | 2007-10-19 17:18:30 -0400
 Users can now authorize/deny request tokens


Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Action/AuthorizeRequestToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Action/AuthorizeRequestToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Action/AuthorizeRequestToken.pm	Fri Oct 19 17:18:43 2007
@@ -56,7 +56,6 @@
     my $token = Jifty::Plugin::OAuth::Model::RequestToken->new(current_user => Jifty::CurrentUser->superuser);
     $token->load_by_cols(
         token => $self->argument_value('token'),
-        auth_as => Jifty->web->current_user->id
     );
 
     if ($self->argument_value('authorize') eq 'allow') {

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Dispatcher.pm	Fri Oct 19 17:18:43 2007
@@ -24,6 +24,7 @@
 sub request_token {
     my @params = qw/consumer_key signature_method signature
                     timestamp nonce version/;
+    set no_abort => 0;
 
     my %oauth_params  = get_parameters(@params);
     my $consumer      = get_consumer($oauth_params{consumer_key});
@@ -79,10 +80,11 @@
 
     set next => $oauth_params{callback};
     set consumer => 'Some application';
+    del 'token';
 
     if ($oauth_params{token}) {
         my $request_token = Jifty::Plugin::OAuth::Model::RequestToken->new(current_user => Jifty::CurrentUser->superuser);
-        $request_token->load_by_cols(token => $oauth_params{token});
+        $request_token->load_by_cols(token => $oauth_params{token}, authorized => 'f');
 
         if ($request_token->id) {
             set consumer => $request_token->consumer;
@@ -95,6 +97,7 @@
 sub access_token {
     my @params = qw/consumer_key signature_method signature
                     timestamp nonce token version/;
+    set no_abort => 0;
 
     my %oauth_params  = get_parameters(@params);
     my $consumer      = get_consumer($oauth_params{consumer_key});
@@ -108,7 +111,7 @@
 
     abortmsg(401, "No token found for consumer ".$consumer->name." with key $oauth_params{token}") unless $request_token->id;
 
-    my ($ok, $msg) = $request_token->can_trade_for_access_token;
+    ($ok, $msg) = $request_token->can_trade_for_access_token;
     abortmsg(401, "Cannot trade request token for access token: $msg") if !$ok;
 
     # Net::OAuth::Request will die hard if it doesn't get everything it wants

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm	Fri Oct 19 17:18:43 2007
@@ -29,5 +29,13 @@
 
 };
 
+=head2 table
+
+AccessTokens are stored in the table C<oauth_access_tokens>.
+
+=cut
+
+sub table {'oauth_access_tokens'}
+
 1;
 

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Model/Consumer.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Model/Consumer.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Model/Consumer.pm	Fri Oct 19 17:18:43 2007
@@ -44,6 +44,14 @@
         filters are 'Jifty::DBI::Filter::Storable';
 };
 
+=head2 table
+
+Consumers are stored in the table C<oauth_consumers>.
+
+=cut
+
+sub table {'oauth_consumers'}
+
 sub before_set_last_timestamp {
     my $self = shift;
     my $new_ts = shift;

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm	Fri Oct 19 17:18:43 2007
@@ -44,6 +44,14 @@
 
 };
 
+=head2 table
+
+RequestTokens are stored in the table C<oauth_request_tokens>.
+
+=cut
+
+sub table {'oauth_request_tokens'}
+
 sub after_set_authorized {
     my $self = shift;
     $self->set_authorized_by(Jifty->web->current_user->id);

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/View.pm	Fri Oct 19 17:18:43 2007
@@ -113,14 +113,14 @@
 };
 
 private template 'oauth/consumer' => sub {
-    my $consumer = get 'consumer' || 'Some application';
+    my $consumer = (get 'consumer') || 'Some application';
 
     span {
         outs ref($consumer) ? $consumer->name : $consumer;
         if (ref($consumer) && $consumer->url) {
-            outs ' (';
-            a { attr { $consumer->url } $consumer->url };
-            outs ')';
+            outs ' <';
+            a { attr { href => $consumer->url } $consumer->url };
+            outs ' >';
         }
     }
 };