jjkiers/OAuth
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Have the Server use RequestInterface.

Browse Source
This commit is contained in:
Jacob Kiers 2013-02-08 15:14:38 +00:00
parent 74fd426e45
commit e8edc17196
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/JacobKiers/OAuth/Server.php
View File

@ -81,7 +81,7 @@ class Server
* *
* @return JacobKiers\OAuth\Token * @return JacobKiers\OAuth\Token
*/ */
public function fetchRequestToken(Request &$request) public function fetchRequestToken(RequestInterface &$request)
{ {
$this->getVersion($request); $this->getVersion($request);
@ -107,7 +107,7 @@ class Server
* *
* @return JacobKiers\OAuth\Token * @return JacobKiers\OAuth\Token
*/ */
public function fetchAccessToken(Request &$request) public function fetchAccessToken(RequestInterface &$request)
{ {
$this->getVersion($request); $this->getVersion($request);
@ -131,7 +131,7 @@ class Server
* *
* @return array Client and Token * @return array Client and Token
*/ */
public function verifyRequest(Request &$request) public function verifyRequest(RequestInterface &$request)
{ {
$this->getVersion($request); $this->getVersion($request);
$client = $this->getClient($request); $client = $this->getClient($request);
@ -151,7 +151,7 @@ class Server
* *
* @throws JacobKiers\OAuth\OAuthException * @throws JacobKiers\OAuth\OAuthException
*/ */
private function getVersion(Request &$request) private function getVersion(RequestInterface &$request)
{ {
$version = $request->getOAuthVersion(); $version = $request->getOAuthVersion();
if (!$version) { if (!$version) {
@ -176,7 +176,7 @@ class Server
*/ */
private function getSignatureMethod(RequestInterface $request) private function getSignatureMethod(RequestInterface $request)
{ {
$signature_method = $request instanceof Request ? $request->getOAuthSignatureMethod() : null; $signature_method = $request instanceof RequestInterface ? $request->getOAuthSignatureMethod() : null;
if (!$signature_method) { if (!$signature_method) {
// According to chapter 7 ("Accessing Protected Resources") the signature-method // According to chapter 7 ("Accessing Protected Resources") the signature-method
@ -204,7 +204,7 @@ class Server
*/ */
private function getClient(RequestInterface $request) private function getClient(RequestInterface $request)
{ {
$client_key = $request instanceof Request ? $request->getOAuthConsumerKey() : null; $client_key = $request instanceof RequestInterface ? $request->getOAuthConsumerKey() : null;
if (!$client_key) { if (!$client_key) {
throw new OAuthException('Invalid client key'); throw new OAuthException('Invalid client key');
@ -231,7 +231,7 @@ class Server
*/ */
private function getToken(RequestInterface $request, Client $client, $token_type = 'access') private function getToken(RequestInterface $request, Client $client, $token_type = 'access')
{ {
$token_field = $request instanceof Request ? $request->getOAuthToken() : null; $token_field = $request instanceof RequestInterface ? $request->getOAuthToken() : null;
$token = $this->data_store->lookupToken($client, $token_type, $token_field); $token = $this->data_store->lookupToken($client, $token_type, $token_field);
if (!$token) { if (!$token) {
@ -254,8 +254,8 @@ class Server
private function checkSignature(RequestInterface $request, Client $client, Token $token) private function checkSignature(RequestInterface $request, Client $client, Token $token)
{ {
// this should probably be in a different method // this should probably be in a different method
$timestamp = $request instanceof Request ? $request->getOAuthTimestamp() : null; $timestamp = $request instanceof RequestInterface ? $request->getOAuthTimestamp() : null;
$nonce = $request instanceof Request ? $request->getOAuthNonce() : null; $nonce = $request instanceof RequestInterface ? $request->getOAuthNonce() : null;
$this->checkTimestamp($timestamp); $this->checkTimestamp($timestamp);
$this->checkNonce($client, $token, $nonce, $timestamp); $this->checkNonce($client, $token, $nonce, $timestamp);