ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-26 23:10:17 +05:30
Code Issues Packages Projects Releases Wiki Activity

Scope delimiter is no longer a required parameter

Browse Source
This commit is contained in:
Alex Bilbie 2016-01-17 13:51:56 +00:00
parent e6cc6c35ec
commit ad05a5cae6
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Grant/ClientCredentialsGrant.php
View File

@ -34,12 +34,11 @@ class ClientCredentialsGrant extends AbstractGrant
public function respondToRequest( public function respondToRequest(
ServerRequestInterface $request, ServerRequestInterface $request,
ResponseTypeInterface $responseType, ResponseTypeInterface $responseType,
\DateInterval $tokenTTL, \DateInterval $tokenTTL
$scopeDelimiter = ' '
) { ) {
// Validate request // Validate request
$client = $this->validateClient($request); $client = $this->validateClient($request);
$scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $scopeDelimiter, $client); $scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $client);
// Issue and persist access token // Issue and persist access token
$accessToken = $this->issueAccessToken($tokenTTL, $client, $client->getIdentifier(), $scopes); $accessToken = $this->issueAccessToken($tokenTTL, $client, $client->getIdentifier(), $scopes);

4
src/Grant/GrantTypeInterface.php
View File

@ -41,15 +41,13 @@ interface GrantTypeInterface
* @param \Psr\Http\Message\ServerRequestInterface $request * @param \Psr\Http\Message\ServerRequestInterface $request
* @param \League\OAuth2\Server\ResponseTypes\ResponseTypeInterface $responseType * @param \League\OAuth2\Server\ResponseTypes\ResponseTypeInterface $responseType
* @param \DateInterval $tokenTTL * @param \DateInterval $tokenTTL
* @param string $scopeDelimiter
* *
* @return \League\OAuth2\Server\ResponseTypes\ResponseTypeInterface * @return \League\OAuth2\Server\ResponseTypes\ResponseTypeInterface
*/ */
public function respondToRequest( public function respondToRequest(
ServerRequestInterface $request, ServerRequestInterface $request,
ResponseTypeInterface $responseType, ResponseTypeInterface $responseType,
DateInterval $tokenTTL, DateInterval $tokenTTL
$scopeDelimiter = ' '
); );
/** /**

5
src/Grant/PasswordGrant.php
View File

@ -59,13 +59,12 @@ class PasswordGrant extends AbstractGrant
public function respondToRequest( public function respondToRequest(
ServerRequestInterface $request, ServerRequestInterface $request,
ResponseTypeInterface $responseType, ResponseTypeInterface $responseType,
\DateInterval $tokenTTL, \DateInterval $tokenTTL
$scopeDelimiter = ' '
) { ) {
// Validate request // Validate request
$client = $this->validateClient($request); $client = $this->validateClient($request);
$user = $this->validateUser($request); $user = $this->validateUser($request);
$scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $scopeDelimiter, $client); $scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $client);
// Issue and persist new tokens // Issue and persist new tokens
$accessToken = $this->issueAccessToken($tokenTTL, $client, $user->getIdentifier(), $scopes); $accessToken = $this->issueAccessToken($tokenTTL, $client, $user->getIdentifier(), $scopes);

5
src/Grant/RefreshTokenGrant.php
View File

@ -58,12 +58,11 @@ class RefreshTokenGrant extends AbstractGrant
public function respondToRequest( public function respondToRequest(
ServerRequestInterface $request, ServerRequestInterface $request,
ResponseTypeInterface $responseType, ResponseTypeInterface $responseType,
\DateInterval $tokenTTL, \DateInterval $tokenTTL
$scopeDelimiter = ' '
) { ) {
$client = $this->validateClient($request); $client = $this->validateClient($request);
$oldRefreshToken = $this->validateOldRefreshToken($request, $client->getIdentifier()); $oldRefreshToken = $this->validateOldRefreshToken($request, $client->getIdentifier());
$scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $scopeDelimiter, $client); $scopes = $this->validateScopes($this->getRequestParameter('scope', $request), $client);
// If no new scopes are requested then give the access token the original session scopes // If no new scopes are requested then give the access token the original session scopes
if (count($scopes) === 0) { if (count($scopes) === 0) {