Changeset 1480 for trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm

Timestamp:

03/02/09 08:35:18 (9 months ago)

Author:

auno

Message:

Merged changes from internal. #99460

Files:

• trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm (modified) (3 diffs)

trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm

@@ -15 +15 @@
         my $return_to = $path . '?__mode=mixicomment_verify_blog_owner'
             . '&blog_id='  . $blog->id;
-        return ( trust_root => $path, return_to => $return_to );
+        return ( trust_root => $path, return_to => $return_to, delayed_return => 1 );
     }
     else {
-        return $class->SUPER::check_url_params(@_);
+        my %params = $class->SUPER::check_url_params(@_);
+        $params{delayed_return} = 1;
+        return %params;
     }
 }
@@ -33 +35 @@
 }
 
-# TODO: remove these once core code supports SREG - BugID:71011
-sub NS_OPENID_SREG { "http://openid.net/extensions/sreg/1.1" }
+sub set_extension_args {
+    my $class = shift;
+    my ( $claimed_identity ) = @_;
 
-sub login {
-    my $class = shift;
-    my ($app) = @_;
-    my $q = $app->{query};
-    return $app->errtrans("Invalid request.")
-        unless $q->param('blog_id');
-    my $blog = MT::Blog->load(scalar $q->param('blog_id'));
-    my %param = $app->param_hash;
-    my $csr = MT::Auth::OpenID::_get_csr(\%param, $blog) or return;
-    my $identity = $q->param('openid_url');
-    if (!$identity &&
-        (my $u = $q->param('openid_userid')) && $class->can('url_for_userid')) {
-        $identity = $class->url_for_userid($u);
-    }
-    my $claimed_identity = $csr->claimed_identity($identity);
-    if (!$claimed_identity) {
-        my ($err_code, $err_msg) = ($csr->errcode, $csr->errtext);
-        if ($err_code eq 'no_head_tag' || $err_code eq 'no_identity_server' || $err_code eq 'url_gone') {
-            $err_msg = $app->translate('The address entered does not appear to be an OpenID');
-        }
-        elsif ($err_code eq 'empty_url' || $err_code eq 'bogus_url') {
-            $err_msg = $app->translate('The text entered does not appear to be a web address');
-        }
-        elsif ($err_code eq 'url_fetch_error') {
-            $err_msg =~ s{ \A Error \s fetching \s URL: \s }{}xms;
-            $err_msg = $app->translate('Unable to connect to [_1]: [_2]', $identity, $err_msg);
-        }
-        return $app->error($app->translate("Could not verify the OpenID provided: [_1]", $err_msg));
-    }
-
-    my %params = $class->check_url_params( $app, $blog );
-
-    $claimed_identity->set_extension_args(NS_OPENID_SREG(), {
+    $claimed_identity->set_extension_args(MT::Auth::OpenID::NS_OPENID_SREG(), {
         optional => join(",", qw/email nickname fullname/)
     });
-
-    my $check_url = $claimed_identity->check_url(
-        ( %params, delayed_return => 1 )
-    );
-
-    return $app->redirect($check_url);
 }
 
@@ -84 +49 @@
 
     # Try SREG extension first
-    my $fields = $vident->extension_fields(NS_OPENID_SREG);
+    my $fields = $vident->extension_fields(MT::Auth::OpenID::NS_OPENID_SREG());
     my $nick = $fields->{nickname} if exists $fields->{nickname};
     $nick ||= $fields->{fullname} if exists $fields->{fullname};