Committer: wisest-owl
LJSUP-6475. Not possible to login use openID <name>.livejournal.com in other networksU trunk/cgi-bin/ljfeed.pl U trunk/htdocs/openid/server.bml
Modified: trunk/cgi-bin/ljfeed.pl =================================================================== --- trunk/cgi-bin/ljfeed.pl 2011-02-02 08:56:41 UTC (rev 18184) +++ trunk/cgi-bin/ljfeed.pl 2011-02-02 09:19:09 UTC (rev 18185) @@ -952,7 +952,7 @@ # Only people (not communities, etc) can be OpenID authenticated if ($person && LJ::OpenID->server_enabled) { $println->(' <Service priority="0">'); - $println->(' <Type>http://specs.openid.net/auth/2.0</Type>'); + $println->(' <Type>http://specs.openid.net/auth/2.0/signon</Type>'); $println->(' <URI>'.LJ::ehtml($LJ::OPENID_SERVER).'</URI>'); $println->(' <LocalID>'.LJ::ehtml($u->journal_base) . '/' .'</LocalID>'); $println->(' </Service>'); Modified: trunk/htdocs/openid/server.bml =================================================================== --- trunk/htdocs/openid/server.bml 2011-02-02 08:56:41 UTC (rev 18184) +++ trunk/htdocs/openid/server.bml 2011-02-02 09:19:09 UTC (rev 18185) @@ -6,7 +6,7 @@ use strict; use vars qw(%GET %POST); - + my $remote = LJ::get_remote(); ## Non-OpenID-compliant section: let trusted sites query remote user, @@ -26,7 +26,10 @@ } } - my $nos = LJ::OpenID::server(\%GET, \%POST); + ## OpenID 1.1 specs checkid_setup as a GET request, + ## but there's nothing said about it in the OpenID 2.0 spec, + ## other than that if sending a POST, all params must be in the POST body. + my $nos = LJ::OpenID::server({ %GET, %POST }, { %GET, %POST }); my ($type, $data) = $nos->handle_page(redirect_for_setup => 1); if ($type eq "redirect") {