Changeset 2758

Timestamp:

07/11/08 03:03:09 (1 month ago)

Author:

fumiakiy

Message:

Updated Net::OpenID::Consumer modules to the latest (revision 136).

Files:

• branches/release-41/extlib/Net/OpenID/Consumer.pm (modified) (7 diffs)
• branches/release-41/extlib/Net/OpenID/IndirectMessage.pm (modified) (3 diffs)
• branches/release-41/extlib/Net/OpenID/Yadis.pm (modified) (3 diffs)

branches/release-41/extlib/Net/OpenID/Consumer.pm

@@ -109 +109 @@
-
-    if (my $what = shift) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -405 +393 @@
-}
-
-
-
+
-    my Net::OpenID::Consumer $self = shift;
-    my $url = shift;
-
+
+
+
+
+
+
+
+
-
-    # trim whitespace
@@ -422 +416 @@
-    $url .= "/" unless $url =~ m!^https?://.+/!i;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    # TODO: Support XRI too?
-
-try 
+
-    my $yadis = Net::OpenID::Yadis->new(ua => $self->{ua});
-    if ($yadis->discover($url)) {
@@ -439 +435 @@
-        # when the semantic info is accessed.
-
-
+my 
-        my @services = $yadis->services(
-            OpenID::util::version_2_xrds_service_url(),
@@ -450 +446 @@
-
-        foreach my $service (@services) {
-
+s
-
-            # Service->URI seems to return all sorts of bizarre things, so let's
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-
- = $service_uri->{content}
+s
+s = [ $service_uris->{content} ]
-            }
+            unless (ref($service_uris)) {
+                $service_uris = [ $service_uris ];
+            }
+
+            my $delegate = undef;
+            my @versions = ();
-
-            if (grep(/^${version2}$/, $service->Type)) {
-                # We have an OpenID 2.0 end-user identifier
-                $id_server = $service_uri;
-                $delegate = $service->extra_field("LocalID");
-
-
+
-            }
-els
+
-                # We have an OpenID 1.1 end-user identifier
-                $id_server = $service_uri;
-                $delegate = $service->extra_field("Delegate", "http://openid.net/xmlns/1.0");
-
-
+
-            }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                # We have an OpenID 2.0 OP identifier (i.e. we're doing directed identity)
-
-
+
-                # In this case, the user's claimed identifier is a magic value
-                # and the actual identifier will be determined by the provider.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -630 +712 @@
-        $a_ident_nofragment =~ s/\#.*$//;
-        $self->_debug("verified_identity: verifying delegate $delegate for $a_ident_nofragment");
-
-
-
-
+
-    }
-
@@ -1097 +1176 @@
-must return the value given one argument (the parameter to retrieve)
-
+If you pass in an Apache $r object, you must not have already called
+$r->content as the consumer module will want to get the request
+arguments out of here in the case of a POST request.
+
-2. Get a paramater:
-

branches/release-41/extlib/Net/OpenID/IndirectMessage.pm

@@ -20 +20 @@
-    my $enumer;
-    if (ref $what eq "HASH") {
+        # In this case it's the caller's responsibility to determine
+        # whether the method is GET or POST.
-        $getter = sub { $what->{$_[0]}; };
-        $enumer = sub { keys(%$what); };
-    }
-    elsif (UNIVERSAL::isa($what, "CGI")) {
+        # CGI automatically does what we need when method is POST
-        $getter = sub { scalar $what->param($_[0]); };
-        $enumer = sub { $what->param; };
-    }
-    elsif (ref $what eq "Apache") {
-
+
+
+
+
+
+
+
-        $getter = sub { $get{$_[0]}; };
-        $enumer = sub { keys(%get); };
-    }
-    elsif (ref $what eq "Apache::Request") {
+        # Apache::Request includes the POST and GET arguments in ->param
+        # when doing a POST request, which is close enough to what
+        # the spec requires.
-        $getter = sub { scalar $what->param($_[0]); };
-        $enumer = sub { $what->param; };
@@ -114 +126 @@
-
-    return $self->{getter}->("openid.$key");
+}
+
+sub raw_get {
+    my $self = shift;
+    my $key = shift or Carp::croak("No argument name supplied to raw_get method");
+
+    return $self->{getter}->($key);
+}
+
+sub getter {
+    my $self = shift;
+
+    return $self->{getter};
-}
-
@@ -195 +220 @@
-if you use a coderef then extension arguments are not supported.
-
+If you pass in a hashref or a coderef it is your responsibility as the caller
+to check the HTTP request method and pass in the correct set of arguments. If
+you use an Apache, Apache::Request or CGI object then this module will do
+the right thing automatically.
+
-=head1 SYNOPSIS
-

branches/release-41/extlib/Net/OpenID/Yadis.pm

@@ -222 +222 @@
-    my $self = shift;
-    my %protocols;
+    my @protocols;
-    my $code_ref;
-    my $protocol = undef;
@@ -237 +238 @@
-            $protocols{$option} = $default;
-            $protocol = $option;
+            push @protocols, $option;
-        }
-    }
@@ -242 +244 @@
-    my @servers;
-    @servers = $self->xrd_objects if (keys %protocols == 0);
-keys %
+@
-        my $regex = $protocols{$key}->{urlregex} || $key; 
-        my @ver = @{$protocols{$key}->{versionarray}};