From 34289ae0e2e8c0d971ce1ad64845754f799615fc Mon Sep 17 00:00:00 2001
From: Artem Vasilev <kern.usr@gmail.com>
Date: Tue, 12 Mar 2024 11:57:28 +0300
Subject: [PATCH] Switch to format `json`

---
 .../src/Extension/Plugin.php                  | 94 ++++++++++---------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/plg_system_oauthserver/src/Extension/Plugin.php b/plg_system_oauthserver/src/Extension/Plugin.php
index e28499d..bbcd1a1 100644
--- a/plg_system_oauthserver/src/Extension/Plugin.php
+++ b/plg_system_oauthserver/src/Extension/Plugin.php
@@ -22,57 +22,61 @@ use Joomla\Event\SubscriberInterface;
 
 class Plugin extends CMSPlugin implements SubscriberInterface
 {
-	public static function getSubscribedEvents(): array
-	{
-		return ['onAfterInitialise' => 'attachOauthRouter'];
-	}
+    public static function getSubscribedEvents(): array
+    {
+        return ['onAfterInitialise' => 'attachOauthRouter'];
+    }
 
-	/**
-	 * @return void
-	 * @since version
-	 */
-	public function attachOauthRouter(): void
-	{
-		/** @var \Joomla\CMS\Application\SiteApplication $app */
-		$app = $this->getApplication();
+    /**
+     * @return void
+     * @since version
+     */
+    public function attachOauthRouter(): void
+    {
+        /** @var \Joomla\CMS\Application\SiteApplication $app */
+        $app = $this->getApplication();
 
-		if (!$app->isClient('site'))
-		{
-			return;
-		}
+        if (!$app->isClient('site'))
+        {
+            return;
+        }
 
-		/** @var \Joomla\CMS\Router\SiteRouter $siteRouter */
-		$siteRouter = Factory::getContainer()->get(SiteRouter::class);
-		$siteRouter->attachParseRule([$this, 'parseOauthRoute'], $siteRouter::PROCESS_BEFORE);
-	}
+        /** @var \Joomla\CMS\Router\SiteRouter $siteRouter */
+        $siteRouter = Factory::getContainer()->get(SiteRouter::class);
+        $siteRouter->attachParseRule([$this, 'parseOauthRoute'], $siteRouter::PROCESS_BEFORE);
+    }
 
-	/**
-	 * @param   \Joomla\CMS\Router\SiteRouter  $router
-	 * @param   \Joomla\CMS\Uri\Uri            $uri
-	 *
-	 * @return void
-	 * @since version
-	 */
-	public function parseOauthRoute(SiteRouter &$router, Uri &$uri): void
-	{
-		$route = trim($uri->getPath(), '/');
+    /**
+     * @param   \Joomla\CMS\Router\SiteRouter  $router
+     * @param   \Joomla\CMS\Uri\Uri            $uri
+     *
+     * @return void
+     * @since version
+     */
+    public function parseOauthRoute(SiteRouter &$router, Uri &$uri): void
+    {
+        $route = trim($uri->getPath(), '/');
 
-		if (empty($route))
-		{
-			return;
-		}
+        if (empty($route))
+        {
+            return;
+        }
 
-		if (!str_starts_with($route, 'login/oauth'))
-		{
-			return;
-		}
+        if (!str_starts_with($route, 'login/oauth'))
+        {
+            return;
+        }
 
-		$segments = explode('/', $route);
+        $segments = explode('/', $route);
 
-		$uri->setVar('option', 'com_oauthserver');
-		$uri->setVar('task', 'login.' . $segments[2]);
-		$uri->setVar('view', 'default');
+        $uri->setVar('option', 'com_oauthserver');
+        $uri->setVar('task', 'login.' . $segments[2]);
+        if ($segments[2] !== 'authorize')
+        {
+            $uri->setVar('format', 'json');
+        }
+        $uri->setVar('view', 'default');
 
-		$uri->setPath('');
-	}
-}
\ No newline at end of file
+        $uri->setPath('');
+    }
+}