pretty openid login

* openid: Incorporated a fancy openid-selector signin form.
  (http://code.google.com/p/openid-selector/)
* openid: Use "openid_identifier" as the form field, as required
  by OpenID Authentication v2.0 spec.

1 files changed, 22 insertions, 46 deletions

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0ad8697d8..e722c68ba 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	add_underlay("openid-selector");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
@@ -19,10 +20,16 @@ sub checkconfig () {
 	if ($config{cgi}) {
 		# Intercept normal signin form, so the openid selector
 		# can be displayed.
-		require IkiWiki::CGI;
-		my $real_cgi_signin=\&IkiWiki::cgi_signin;
+		# 
+		# When other auth hooks are registered, give the selector
+		# a reference to the normal signin form.
+		my $real_cgi_signin;
+		if (keys %{$IkiWiki::hooks{auth}} > 1) {
+			require IkiWiki::CGI;
+			$real_cgi_signin=\&IkiWiki::cgi_signin;
+		}
 		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-				openid_selector($real_cgi_signin, @_);
+			openid_selector($real_cgi_signin, @_);
 		});
 	}
 }
@@ -55,15 +62,21 @@ sub openid_selector {
         my $q=shift;
         my $session=shift;
 
-	my $openid_url=$q->param('openid_url');
+	my $openid_url=$q->param('openid_identifier');
 	my $openid_error;
 
-	if (defined $q->param("action") && $q->param("action") eq "verify") {
+	if (! load_openid_module()) {
+		if ($real_cgi_signin) {
+			$real_cgi_signin->($q, $session);
+		}
+		error(sprintf(gettext("failed to load openid module: "), @_));
+	}
+	elsif (defined $q->param("action") && $q->param("action") eq "verify") {
 		validate($q, $session, $openid_url, sub {
 			$openid_error=shift;
 		});
 	}
-	elsif ($q->param("do") eq "signin" || ! load_openid_module()) {
+	elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
 		$real_cgi_signin->($q, $session);
 		exit;
 	}
@@ -73,8 +86,7 @@ sub openid_selector {
 		cgiurl => $config{cgiurl},
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
-		# TODO only if other auth methods are available
-		nonopenidurl => IkiWiki::cgiurl(do => "signin"),
+		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
 		loginlabel => loginlabel(),
 	);
 
@@ -90,45 +102,9 @@ sub formbuilder_setup (@) {
 	my $session=$params{session};
 	my $cgi=$params{cgi};
 	
-	if ($form->title eq "signin") {
-		return unless load_openid_module();
-
-		# This avoids it displaying a redundant label for the
-		# OpenID fieldset.
-		$form->fieldsets("OpenID");
-
-		$form->field(
-			name => "openid_url",
-			label => loginlabel(),
-			fieldset => "OpenID",
-			size => 30,
-			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
-		);
-
-		# Handle submission of an OpenID as validation.
-		if ($form->submitted && $form->submitted eq "Login" &&
-		    defined $form->field("openid_url") && 
-		    length $form->field("openid_url")) {
-			$form->field(
-				name => "openid_url",
-				validate => sub {
-					validate($cgi, $session, shift, sub {
-						# Display error in the form.
-						$form->field(name => "openid_url", comment => shift);
-					});
-				},
-			);
-			# Skip all other required fields in this case.
-			foreach my $field ($form->field) {
-				next if $field eq "openid_url";
-				$form->field(name => $field, required => 0,
-					validate => '/.*/');
-			}
-		}
-	}
-	elsif ($form->title eq "preferences" &&
+	if ($form->title eq "preferences" &&
 	       IkiWiki::openiduser($session->param("name"))) {
-		$form->field(name => "openid_url", disabled => 1,
+		$form->field(name => "openid_identifier", disabled => 1,
 			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			value => $session->param("name"), 
 			size => 50, force => 1,