We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit b5a19721 authored by Evan Prodromou's avatar Evan Prodromou

Upgrade included OpenID libraries to version 2.1.2

parent b1142ed3
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/** /**
* The library version string * The library version string
*/ */
define('Auth_OpenID_VERSION', '2.1.1'); define('Auth_OpenID_VERSION', '2.1.2');
/** /**
* Require the fetcher code. * Require the fetcher code.
......
...@@ -711,7 +711,9 @@ class Auth_OpenID_GenericConsumer { ...@@ -711,7 +711,9 @@ class Auth_OpenID_GenericConsumer {
return $this->_completeInvalid($message, $endpoint); return $this->_completeInvalid($message, $endpoint);
} }
return new Auth_OpenID_SetupNeededResponse($endpoint); $user_setup_url = $message->getArg(Auth_OpenID_OPENID2_NS,
'user_setup_url');
return new Auth_OpenID_SetupNeededResponse($endpoint, $user_setup_url);
} }
/** /**
......
...@@ -765,12 +765,17 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request { ...@@ -765,12 +765,17 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
function Auth_OpenID_CheckIDRequest($identity, $return_to, function Auth_OpenID_CheckIDRequest($identity, $return_to,
$trust_root = null, $immediate = false, $trust_root = null, $immediate = false,
$assoc_handle = null, $server = null) $assoc_handle = null, $server = null,
$claimed_id = null)
{ {
$this->namespace = Auth_OpenID_OPENID2_NS; $this->namespace = Auth_OpenID_OPENID2_NS;
$this->assoc_handle = $assoc_handle; $this->assoc_handle = $assoc_handle;
$this->identity = $identity; $this->identity = $identity;
$this->claimed_id = $identity; if ($claimed_id === null) {
$this->claimed_id = $identity;
} else {
$this->claimed_id = $claimed_id;
}
$this->return_to = $return_to; $this->return_to = $return_to;
$this->trust_root = $trust_root; $this->trust_root = $trust_root;
$this->server =& $server; $this->server =& $server;
...@@ -1098,7 +1103,8 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request { ...@@ -1098,7 +1103,8 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
$this->trust_root, $this->trust_root,
false, false,
$this->assoc_handle, $this->assoc_handle,
$this->server); $this->server,
$this->claimed_id);
$setup_request->message = $this->message; $setup_request->message = $this->message;
$setup_url = $setup_request->encodeToURL($server_url); $setup_url = $setup_request->encodeToURL($server_url);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment