X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapioauthaccesstoken.php;h=76b06c28a22cc7cb8e9a124127f3ec474a0a6917;hb=a0e107f17f27bc1dfc49de2a4493a461213e782e;hp=d4bd493ee22f81757ddc525d2776e1fd9104168c;hpb=e56385a7bb25336a72c1d37ad43d51ba8e238231;p=quix0rs-gnu-social.git diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index d4bd493ee2..76b06c28a2 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/lib/apioauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiOauthAccessTokenAction extends ApiOauthAction { protected $reqToken = null; @@ -73,7 +72,6 @@ class ApiOauthAccessTokenAction extends ApiOauthAction // Spec doesn't say they MUST be. try { - $req = OAuthRequest::from_request(); $this->reqToken = $req->get_parameter('oauth_token'); @@ -81,16 +79,15 @@ class ApiOauthAccessTokenAction extends ApiOauthAction $app = $datastore->getAppByRequestToken($this->reqToken); $atok = $server->fetch_access_token($req); - } catch (Exception $e) { common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage()); common_debug(var_export($req, true)); $code = $e->getCode(); $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text'); + return; } if (empty($atok)) { - // Token exchange failed -- log it $msg = sprintf( @@ -101,8 +98,8 @@ class ApiOauthAccessTokenAction extends ApiOauthAction ); common_log(LOG_WARNING, $msg); - $this->clientError(_("Invalid request token or verifier.", 400, 'text')); - + // TRANS: Client error given from the OAuth API when the request token or verifier is invalid. + $this->clientError(_('Invalid request token or verifier.'), 400, 'text'); } else { common_log( LOG_INFO, @@ -122,7 +119,6 @@ class ApiOauthAccessTokenAction extends ApiOauthAction * * @param OAuthToken token the access token */ - function showAccessToken($token) { header('Content-Type: application/x-www-form-urlencoded');