Changeset 515 for trunk/openid-server

Timestamp:

02/29/08 12:25:48 (21 months ago)

Author:

fumiakiy

Message:

Made OpenIDServer plugin MT 4-ish. No need of server.cgi, no need of MT::App inherited class.

Location:

trunk/openid-server/plugins/openid-server

Files:

• OpenIDServer.pl (deleted)
• config.yaml (added)
• lib/OpenIDServer/App.pm (modified) (7 diffs)
• lib/OpenIDServer/Tags.pm (added)
• server.cgi (deleted)

trunk/openid-server/plugins/openid-server/lib/OpenIDServer/App.pm

@@ -2 +2 @@
 
 use strict;
-use MT;
-use MT::App;
-use MT::Util;
 use Net::OpenID::Server;
-use File::Spec;
-use vars qw(@ISA);
-@ISA = 'MT::App';
-
-sub uri {
-    my $app = shift;
-    my $path = $app->app_path;
-    $path .= '/' unless $path =~ m{/$};
-    $path .= 'plugins/openid-server/server.cgi';
-}
-
-sub init {
-    my $app = shift;
-    $app->SUPER::init(@_) or return;
-    $app->add_methods(
-        openid => \&openid,
-        trust  => \&trust,
-    );
-    $app->{default_mode} = 'openid';
-    my $mode = $app->{query}->param('__mode');
-    $app->{requires_login} = 1 if $mode && $mode eq 'trust';
-    $app;
-}
 
 sub trust {
     my $app = shift;
-    my $q = $app->{query};
+    my $q = $app->param;
     my %param;
 
     ## We're logged in, so just redirect, until we have actual trusting.
     my @params = grep { !/__mode/ && !/username/ && !/password/ && !/submit/ } $q->param;
-    my $uri = $app->uri . '?openid.mode=checkid_setup&openid.identity=';
+    my $uri = $app->uri . '?__mode=openid&openid.mode=checkid_setup&openid.identity=';
     $uri .= MT::Util::encode_url($q->param('identity'));
     $uri .= '&openid.return_to=';
@@ -48 +22 @@
 
 sub is_identity {
-    my ($app, $u, $identity_url) = @_;
+    my $app = shift;
+    my ( $u, $identity_url ) = @_;
     return 0 unless $u;
     my $ident;
@@ -58 +33 @@
 
 sub is_trusted {
-    my ($app, $u, $trust_root, $is_identity) = @_;
+    my $app = shift;
+    my ( $u, $trust_root, $is_identity ) = @_;
     ## TODO: use saved trust too
     return 0 unless defined($u) && $is_identity;
@@ -76 +52 @@
         get_args      => $app->{query},
         post_args     => $app->{query},
-        server_secret => sub { $app->make_secret($_[0]) },
+        server_secret => sub { &make_secret($app, $_[0]) },
         get_user      => sub { ($app->{author}) = $app->login; $app->{author} },
-        is_identity   => sub { $app->is_identity(@_) },
-        is_trusted    => sub { $app->is_trusted(@_) },
+        is_identity   => sub { &is_identity($app, @_) },
+        is_trusted    => sub { &is_trusted($app, @_) },
         setup_url     => ($path . '?__mode=trust'),
     );
@@ -87 +63 @@
 sub openid {
     my $app = shift;
-    my $nos = $app->_build_nos;
+    my $plugin = $app->component('openidserver');
+    my $nos = &_build_nos($app);
     my ($type, $data) = $nos->handle_page;
     if ($type eq "redirect") {
@@ -93 +70 @@
     } elsif($type eq 'setup') {
         ## Was it an identity or trust failure? Cancel.
-        return $app->error('Your account is not authorized to assert the requested identity.')
-            if $app->{author};
+        return $app->error(
+          $plugin->translate('Your account is not authorized to assert the requested identity.'))
+            if $app->user;
 
         my $url = $nos->setup_url;
@@ -102 +80 @@
     } else {
         $app->response_content_type($type);
-        return $data || "This is Movable Type's OpenID server endpoint, not a human-readable resource.  For more information, see <a href='http://openid.net/'>http://openid.net/</a>.<br /><br />Get <a href='?openid.mode=getpubkey'>public key</a>.";
+        return $data || $plugin->translate("This is Movable Type's OpenID server endpoint, not a human-readable resource.  For more information, see <a href='http://openid.net/'>http://openid.net/</a>.<br /><br />Get <a href='?openid.mode=getpubkey'>public key</a>.");
     }
 }