diff options
| -rw-r--r-- | Auth/OpenID/AX.php | 13 | ||||
| -rw-r--r-- | Tests/Auth/OpenID/AX.php | 20 |
2 files changed, 19 insertions, 14 deletions
diff --git a/Auth/OpenID/AX.php b/Auth/OpenID/AX.php index d183c44..35c84c0 100644 --- a/Auth/OpenID/AX.php +++ b/Auth/OpenID/AX.php @@ -379,17 +379,18 @@ class Auth_OpenID_AX_FetchRequest extends Auth_OpenID_AX_Message { /** * Extract a FetchRequest from an OpenID message * - * @param message: The OpenID message containing the attribute + * @param request: The OpenID request containing the attribute * fetch request * * @returns mixed An Auth_OpenID_AX_Error or the - * Auth_OpenID_AX_FetchRequest extracted from the message if + * Auth_OpenID_AX_FetchRequest extracted from the request message if * successful */ - function &fromOpenIDRequest($message) + function &fromOpenIDRequest($request) { + $m = $request->message; $obj = new Auth_OpenID_AX_FetchRequest(); - $ax_args = $message->getArgs($obj->ns_uri); + $ax_args = $m->getArgs($obj->ns_uri); $result = $obj->parseExtensionArgs($ax_args); @@ -400,8 +401,8 @@ class Auth_OpenID_AX_FetchRequest extends Auth_OpenID_AX_Message { if ($obj->update_url) { // Update URL must match the openid.realm of the // underlying OpenID 2 message. - $realm = $message->getArg(Auth_OpenID_OPENID_NS, 'realm', - $message->getArg( + $realm = $m->getArg(Auth_OpenID_OPENID_NS, 'realm', + $m->getArg( Auth_OpenID_OPENID_NS, 'return_to')); diff --git a/Tests/Auth/OpenID/AX.php b/Tests/Auth/OpenID/AX.php index 5487fdd..9b2aa28 100644 --- a/Tests/Auth/OpenID/AX.php +++ b/Tests/Auth/OpenID/AX.php @@ -459,9 +459,10 @@ class FetchRequestTest extends PHPUnit_TestCase { 'ax.update_url' => 'http://different.site/path', 'ax.mode' => 'fetch_request', )); - + $openid_req = new Auth_OpenID_Request(); + $openid_req->message =& $openid_req_msg; $result = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest( - $openid_req_msg); + $openid_req); $this->assertTrue(Auth_OpenID_AX::isError($result)); } @@ -475,8 +476,9 @@ class FetchRequestTest extends PHPUnit_TestCase { 'ax.update_url' => 'http://different.site/path', 'ax.mode' => 'fetch_request', )); - - $result = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req_msg); + $openid_req = new Auth_OpenID_Request(); + $openid_req->message =& $openid_req_msg; + $result = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req); $this->assertTrue(Auth_OpenID_AX::isError($result)); } @@ -490,8 +492,9 @@ class FetchRequestTest extends PHPUnit_TestCase { 'ax.update_url' => 'http://example.com/realm/update_path', 'ax.mode' => 'fetch_request', )); - - $fr = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req_msg); + $openid_req = new Auth_OpenID_Request(); + $openid_req->message =& $openid_req_msg; + $fr = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req); $this->assertFalse(Auth_OpenID_AX::isError($fr)); } @@ -505,8 +508,9 @@ class FetchRequestTest extends PHPUnit_TestCase { 'ax.update_url' => 'http://example.com/realm/update_path', 'ax.mode' => 'fetch_request', )); - - $fr = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req_msg); + $openid_req = new Auth_OpenID_Request(); + $openid_req->message =& $openid_req_msg; + $fr = Auth_OpenID_AX_FetchRequest::fromOpenIDRequest($openid_req); $this->assertFalse(Auth_OpenID_AX::isError($fr)); } } |