diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:43:13 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-10 15:43:13 -0500 |
| commit | aa6f7481a023c04b30ffc6aec2016e2b7b3b386f (patch) | |
| tree | 38ea74a6e58bc6f42e5b2568485f6c34e40adfda | |
| parent | a4de63ca923583b77cf2a4ad60f4893e006f90e4 (diff) | |
| download | volse-hubzilla-aa6f7481a023c04b30ffc6aec2016e2b7b3b386f.tar.gz volse-hubzilla-aa6f7481a023c04b30ffc6aec2016e2b7b3b386f.tar.bz2 volse-hubzilla-aa6f7481a023c04b30ffc6aec2016e2b7b3b386f.zip | |
Fixed access_token request bug and returned oauth2-server-php library to unmodified state.
| -rw-r--r-- | Zotlabs/Module/Oauth2testvehicle.php | 15 | ||||
| -rw-r--r-- | vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Zotlabs/Module/Oauth2testvehicle.php b/Zotlabs/Module/Oauth2testvehicle.php index 29c6ec50e..82e309f1c 100644 --- a/Zotlabs/Module/Oauth2testvehicle.php +++ b/Zotlabs/Module/Oauth2testvehicle.php @@ -145,13 +145,14 @@ class OAuth2TestVehicle extends \Zotlabs\Web\Controller { $client_id = (x($_POST, 'client_id') ? $_POST['client_id'] : ''); $code = (x($_POST, 'code') ? $_POST['code'] : ''); $client_secret = (x($_POST, 'client_secret') ? $_POST['client_secret'] : ''); - $url = z_root() . '/token/?'; - $url .= 'grant_type=' . $grant_type; - $url .= '&redirect_uri=' . urlencode($redirect_uri); - $url .= '&client_id=' . $client_id; - $url .= '&code=' . $code; - $post = z_fetch_url($url, false, 0, array( - 'custom' => 'POST', + $url = z_root() . '/token/'; + $params = http_build_query(array( + 'grant_type' => $grant_type, + 'redirect_uri' => urlencode($redirect_uri), + 'client_id' => $client_id, + 'code' => $code, + )); + $post = z_post_url($url, $params, 0, array( 'http_auth' => $client_id . ':' . $client_secret, )); logger(json_encode($post, JSON_PRETTY_PRINT), LOGGER_DEBUG); diff --git a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php index 2903e9f6c..c96cb972f 100644 --- a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php +++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php @@ -226,7 +226,7 @@ class Request implements RequestInterface $class = get_called_class(); /** @var Request $request */ - $request = new $class($_GET, $_REQUEST, array(), $_COOKIE, $_FILES, $_SERVER); + $request = new $class($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER); $contentType = $request->server('CONTENT_TYPE', ''); $requestMethod = $request->server('REQUEST_METHOD', 'GET'); |