[project @ Add getDisplayIdentifier() to SuccessResponse]

2 files changed, 18 insertions, 0 deletions

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 565f3d6..0d6f9d7 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -1950,6 +1950,14 @@ class Auth_OpenID_ConsumerResponse {
             $this->identity_url = $endpoint->claimed_id;
         }
     }
+
+    function getDisplayIdentifier()
+    {
+        if ($this->endpoint !== null) {
+            return $this->endpoint->getDisplayIdentifier();
+        }
+        return null;
+    }
 }
 
 /**
diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php
index 8f4c80b..b8f4d56 100644
--- a/Auth/OpenID/Discover.php
+++ b/Auth/OpenID/Discover.php
@@ -44,6 +44,15 @@ class Auth_OpenID_ServiceEndpoint {
         $this->local_id = null;
         $this->canonicalID = null;
         $this->used_yadis = false; // whether this came from an XRDS
+        $this->display_identifier = null;
+    }
+
+    function getDisplayIdentifier()
+    {
+        if ($this->display_identifier) {
+            return $this->display_identifier;
+        }
+        return $this->claimed_id;
     }
 
     function usesExtension($extension_uri)
@@ -496,6 +505,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher)
     for ($i = 0; $i < count($openid_services); $i++) {
         $openid_services[$i]->canonicalID = $canonicalID;
         $openid_services[$i]->claimed_id = $canonicalID;
+        $openid_services[$i]->display_identifier = $iname;
     }
 
     // FIXME: returned xri should probably be in some normal form