Compare commits
2 Commits
c9a06e5ada
...
6af7813e3d
Author | SHA1 | Date | |
---|---|---|---|
6af7813e3d | |||
31ff9b287d |
@ -0,0 +1,2 @@
|
||||
ALTER TABLE `oauth_tokens`
|
||||
DROP `audience`;
|
@ -49,8 +49,7 @@ class OAuthAuthController implements ISecured
|
||||
}
|
||||
|
||||
$redirectUriParsed = parse_url($redirectUri);
|
||||
$redirectUriHost = $redirectUriParsed['scheme'] . '://' . $redirectUriParsed['host'];
|
||||
$redirectUriBase = $redirectUriHost . $redirectUriParsed['path'];
|
||||
$redirectUriBase = $redirectUriParsed['scheme'] . '://' . $redirectUriParsed['host'] . $redirectUriParsed['path'];
|
||||
$redirectUriQuery = [];
|
||||
if (isset($redirectUriParsed['query'])) {
|
||||
parse_str($redirectUriParsed['query'], $redirectUriQuery);
|
||||
@ -73,7 +72,6 @@ class OAuthAuthController implements ISecured
|
||||
$token->setUser($user);
|
||||
$token->setCode($code);
|
||||
$token->setAccessToken($accessToken);
|
||||
$token->setAudience($redirectUriHost);
|
||||
$token->setCreatedDate(new DateTime());
|
||||
$token->setExpiresDate(new DateTime('+5 minutes'));
|
||||
$this->pdm->saveToDb($token);
|
||||
|
@ -59,7 +59,6 @@ class OAuthController
|
||||
'iat' => (int)$token->getCreatedDate()->getTimestamp(),
|
||||
'nbf' => (int)$token->getCreatedDate()->getTimestamp(),
|
||||
'exp' => (int)$token->getExpiresDate()->getTimestamp(),
|
||||
'aud' => $token->getAudience(),
|
||||
'nonce' => $token->getNonce()
|
||||
], $this->getUserInfoInternal(
|
||||
$this->userRepository->getById($token->getUserId()),
|
||||
|
@ -7,7 +7,7 @@ class OAuthToken extends Model
|
||||
{
|
||||
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];
|
||||
|
||||
@ -25,8 +25,6 @@ class OAuthToken extends Model
|
||||
|
||||
private string $accessToken = '';
|
||||
|
||||
private string $audience = '';
|
||||
|
||||
private DateTime $created;
|
||||
|
||||
private DateTime $expires;
|
||||
@ -66,11 +64,6 @@ class OAuthToken extends Model
|
||||
$this->accessToken = $accessToken;
|
||||
}
|
||||
|
||||
public function setAudience(string $audience): void
|
||||
{
|
||||
$this->audience = $audience;
|
||||
}
|
||||
|
||||
public function setCreatedDate(DateTime $created): void
|
||||
{
|
||||
$this->created = $created;
|
||||
@ -126,11 +119,6 @@ class OAuthToken extends Model
|
||||
return $this->accessToken;
|
||||
}
|
||||
|
||||
public function getAudience(): string
|
||||
{
|
||||
return $this->audience;
|
||||
}
|
||||
|
||||
public function getCreatedDate(): DateTime
|
||||
{
|
||||
return $this->created;
|
||||
|
Loading…
Reference in New Issue
Block a user