From 31ff9b287d6fc3512f875a9742f82c1ce890c6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Wed, 12 Apr 2023 02:03:15 +0200
Subject: [PATCH] Revert "add aud to jwt"

This reverts commit 97780eb0797a1b05ff0314c64fd1093806ad745d.
---
 src/Controller/OAuthAuthController.php  |  4 +---
 src/Controller/OAuthController.php      |  1 -
 src/PersistentData/Model/OAuthToken.php | 14 +-------------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/Controller/OAuthAuthController.php b/src/Controller/OAuthAuthController.php
index 34236e3..7dd983a 100644
--- a/src/Controller/OAuthAuthController.php
+++ b/src/Controller/OAuthAuthController.php
@@ -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);
diff --git a/src/Controller/OAuthController.php b/src/Controller/OAuthController.php
index c7a263f..abd7a70 100644
--- a/src/Controller/OAuthController.php
+++ b/src/Controller/OAuthController.php
@@ -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()),
diff --git a/src/PersistentData/Model/OAuthToken.php b/src/PersistentData/Model/OAuthToken.php
index 2cc3553..e82242c 100644
--- a/src/PersistentData/Model/OAuthToken.php
+++ b/src/PersistentData/Model/OAuthToken.php
@@ -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;