Added a comment

[git.ikiwiki.info.git] / IkiWiki / Plugin / openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 57cb139cae5b82509a59f4300b5d11e03ff9640e..bd67384f21a91477239df3c48c598cf837ea09b6 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -42,7 +42,7 @@ sub getsetup () {
                },
                openid_realm => {
                        type => "string",
                },
                openid_realm => {
                        type => "string",

-                       description => "url of openid realm (default is cgiurl)",
+                       description => "url pattern of openid realm (default is cgiurl)",

                        safe => 0,
                        rebuild => 0,
                },
                        safe => 0,
                        rebuild => 0,
                },


@@ -77,14 +77,14 @@ sub openid_selector {
 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(
 
        my $template=IkiWiki::template("openid-selector.tmpl");
        $template->param(

-               cgiurl => $config{cgiurl},
+               cgiurl => IkiWiki::cgiurl(),

                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
                ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
        );
 
        IkiWiki::printheader($session);
                (defined $openid_error ? (openid_error => $openid_error) : ()),
                (defined $openid_url ? (openid_url => $openid_url) : ()),
                ($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
        );
 
        IkiWiki::printheader($session);

-       print IkiWiki::misctemplate("signin", $template->output);
+       print IkiWiki::cgitemplate($q, "signin", $template->output);

        exit;
 }
 
        exit;
 }
 


@@ -148,7 +148,7 @@ sub validate ($$$;$) {
        }
 
        my $cgiurl=$config{openid_cgiurl};
        }
 
        my $cgiurl=$config{openid_cgiurl};

-       $cgiurl=$config{cgiurl} if ! defined $cgiurl;
+       $cgiurl=$q->url if ! defined $cgiurl;

 
        my $trust_root=$config{openid_realm};
        $trust_root=$cgiurl if ! defined $trust_root;
 
        my $trust_root=$config{openid_realm};
        $trust_root=$cgiurl if ! defined $trust_root;


@@ -175,7 +175,7 @@ sub auth ($$) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {

-                       IkiWiki::redirect($q, $config{url});
+                       IkiWiki::redirect($q, IkiWiki::baseurl(undef));

                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);
                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);


@@ -187,12 +187,17 @@ sub auth ($$) {
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }
                                        $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
                                );
                        }

+                       my $nickname;

                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});
                        foreach my $ext (@extensions) {
                                foreach my $field (qw{value.email email}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                                $session->param(email => $ext->{$field});

+                                               if (! defined $nickname &&
+                                                   $ext->{$field}=~/(.+)@.+/) {
+                                                       $nickname = $1;
+                                               }

                                                last;
                                        }
                                }
                                                last;
                                        }
                                }


@@ -200,11 +205,15 @@ sub auth ($$) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {
                                        if (exists $ext->{$field} &&
                                            defined $ext->{$field} &&
                                            length $ext->{$field}) {

-                                               $session->param(username => $ext->{$field});
+                                               $nickname=$ext->{$field};

                                                last;
                                        }
                                }
                        }
                                                last;
                                        }
                                }
                        }

+                       if (defined $nickname) {
+                               $session->param(nickname =>
+                                       Encode::decode_utf8($nickname));
+                       }

                }
                else {
                        error("OpenID failure: ".$csr->err);
                }
                else {
                        error("OpenID failure: ".$csr->err);


@@ -240,7 +249,7 @@ sub getobj ($$) {
        }
        
        my $cgiurl=$config{openid_cgiurl};
        }
        
        my $cgiurl=$config{openid_cgiurl};

-       $cgiurl=$config{cgiurl} if ! defined $cgiurl;
+       $cgiurl=$q->url if ! defined $cgiurl;

 
        return Net::OpenID::Consumer->new(
                ua => $ua,
 
        return Net::OpenID::Consumer->new(
                ua => $ua,