esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

feature/fix-oauth-audience #16

Merged
bence merged 4 commits from feature/fix-oauth-audience into master 2023-04-12 02:11:53 +02:00
Conversation 0 Commits 4 Files Changed 6 +2 -17
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 31ff9b287d - Show all commits

4
src/Controller/OAuthAuthController.php
View File

@ -49,8 +49,7 @@ class OAuthAuthController implements ISecured
} }
$redirectUriParsed = parse_url($redirectUri); $redirectUriParsed = parse_url($redirectUri);
$redirectUriHost = $redirectUriParsed['scheme'] . '://' . $redirectUriParsed['host']; $redirectUriBase = $redirectUriParsed['scheme'] . '://' . $redirectUriParsed['host'] . $redirectUriParsed['path'];
$redirectUriBase = $redirectUriHost . $redirectUriParsed['path'];
$redirectUriQuery = []; $redirectUriQuery = [];
if (isset($redirectUriParsed['query'])) { if (isset($redirectUriParsed['query'])) {
parse_str($redirectUriParsed['query'], $redirectUriQuery); parse_str($redirectUriParsed['query'], $redirectUriQuery);
@ -73,7 +72,6 @@ class OAuthAuthController implements ISecured
$token->setUser($user); $token->setUser($user);
$token->setCode($code); $token->setCode($code);
$token->setAccessToken($accessToken); $token->setAccessToken($accessToken);
$token->setAudience($redirectUriHost);
$token->setCreatedDate(new DateTime()); $token->setCreatedDate(new DateTime());
$token->setExpiresDate(new DateTime('+5 minutes')); $token->setExpiresDate(new DateTime('+5 minutes'));
$this->pdm->saveToDb($token); $this->pdm->saveToDb($token);

1
src/Controller/OAuthController.php
View File

@ -59,7 +59,6 @@ class OAuthController
'iat' => (int)$token->getCreatedDate()->getTimestamp(), 'iat' => (int)$token->getCreatedDate()->getTimestamp(),
'nbf' => (int)$token->getCreatedDate()->getTimestamp(), 'nbf' => (int)$token->getCreatedDate()->getTimestamp(),
'exp' => (int)$token->getExpiresDate()->getTimestamp(), 'exp' => (int)$token->getExpiresDate()->getTimestamp(),
'aud' => $token->getAudience(),
'nonce' => $token->getNonce() 'nonce' => $token->getNonce()
], $this->getUserInfoInternal( ], $this->getUserInfoInternal(
$this->userRepository->getById($token->getUserId()), $this->userRepository->getById($token->getUserId()),

14
src/PersistentData/Model/OAuthToken.php
View File

@ -7,7 +7,7 @@ class OAuthToken extends Model
{ {
protected static string $table = 'oauth_tokens'; protected static string $table = 'oauth_tokens';
protected static array $fields = ['scope', 'nonce', 'user_id', 'code', 'access_token', 'audience', 'created', 'expires']; protected static array $fields = ['scope', 'nonce', 'user_id', 'code', 'access_token', 'created', 'expires'];
protected static array $relations = ['user' => User::class]; protected static array $relations = ['user' => User::class];
@ -25,8 +25,6 @@ class OAuthToken extends Model
private string $accessToken = ''; private string $accessToken = '';
private string $audience = '';
private DateTime $created; private DateTime $created;
private DateTime $expires; private DateTime $expires;
@ -66,11 +64,6 @@ class OAuthToken extends Model
$this->accessToken = $accessToken; $this->accessToken = $accessToken;
} }
public function setAudience(string $audience): void
{
$this->audience = $audience;
}
public function setCreatedDate(DateTime $created): void public function setCreatedDate(DateTime $created): void
{ {
$this->created = $created; $this->created = $created;
@ -126,11 +119,6 @@ class OAuthToken extends Model
return $this->accessToken; return $this->accessToken;
} }
public function getAudience(): string
{
return $this->audience;
}
public function getCreatedDate(): DateTime public function getCreatedDate(): DateTime
{ {
return $this->created; return $this->created;