From 39a878f2c880b35aaa21520806055bf29900ff09 Mon Sep 17 00:00:00 2001
From: Artem Vasilev <kern.usr@gmial.com>
Date: Sun, 3 Mar 2024 01:41:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=20=D1=81=20oauth=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../administrator/forms/client.xml            |  46 ++++++--
 .../language/ru-RU/ru-RU.com_oauthserver.ini  |   4 +
 .../administrator/src/Model/ClientsModel.php  |   2 +-
 .../src/View/Clients/HtmlView.php             |   3 +-
 .../administrator/tmpl/clients/default.php    | 105 ++++++++++++++++++
 5 files changed, 149 insertions(+), 11 deletions(-)

diff --git a/com_oauthserver/administrator/forms/client.xml b/com_oauthserver/administrator/forms/client.xml
index f904869..f8688c6 100644
--- a/com_oauthserver/administrator/forms/client.xml
+++ b/com_oauthserver/administrator/forms/client.xml
@@ -4,20 +4,48 @@
         <inlinehelp button="show"/>
     </config>
     <fieldset name="global">
-        <field name="client_name" type="text"
-               label="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_NAME_LABEL"
-               description="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_NAME_DESCRIPTION"
+        <field name="name"
+               type="text"
+               label="COM_OAUTHSERVER_CLIENT_NAME_LABEL"
+               description="COM_OAUTHSERVER_NAME_DESCRIPTION"
                required="1"
         />
-        <field name="client_token"
+        <field name="public"
+               type="radio"
+               layout="joomla.form.field.radio.switcher"
+               label="COM_OAUTHSERVER_CLIENT_PUBLIC_LABEL"
+               description="COM_OAUTHSERVER_CLIENT_PUBLIC_DESCRIPTION"
+               filter="boolean"
+               default="0">
+            <option value="1">JYES</option>
+            <option value="0">JNO</option>
+        </field>
+        <field name="redirect_uri"
+               type="url"
+               filter="url"
+               validate="url"
+               label="COM_OAUTHSERVER_CLIENT_REDIRECT_URI_LABEL"
+               description="COM_OAUTHSERVER_CLIENT_REDIRECT_URI_DESCRIPTION"/>
+
+        <field name="allow_plain_text_pkce"
+               type="radio"
+               layout="joomla.form.field.radio.switcher"
+               label="COM_OAUTHSERVER_CLIENT_ALLOW_PLAIN_TEXT_PKCE_LABEL"
+               description="COM_OAUTHSERVER_CLIENT_ALLOW_PLAIN_TEXT_PKCE_DESCRIPTION"
+               filter="boolean"
+               default="1">
+            <option value="1">JYES</option>
+            <option value="0">JNO</option>
+        </field>
+        <field name="identifier"
                type="text"
                readonly="1"
-               label="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_TOKEN_LABEL"
-               description="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_TOKEN_DESCRIPTION"/>
-        <field name="client_id"
+               label="COM_OAUTHSERVER_CLIENT_IDENTIFIER_LABEL"
+               description="COM_OAUTHSERVER_CLIENT_IDENTIFIER_DESCRIPTION"/>
+        <field name="secret"
                type="text"
                readonly="1"
-               label="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_ID_LABEL"
-               description="COM_OAUTHSERVER_CLIENT_FORM_CLIENT_ID_DESCRIPTION"/>
+               label="COM_OAUTHSERVER_CLIENT_SECRET_LABEL"
+               description="COM_OAUTHSERVER_CLIENT_SECRET_DESCRIPTION"/>
     </fieldset>
 </form>
\ No newline at end of file
diff --git a/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini b/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
index e69de29..c541565 100644
--- a/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
+++ b/com_oauthserver/administrator/language/ru-RU/ru-RU.com_oauthserver.ini
@@ -0,0 +1,4 @@
+COM_OAUTHSERVER_CLIENTS_HEADING_NAME = "Клиент"
+COM_OAUTHSERVER_CLIENTS_HEADING_IDENTIFIER = "ID клиента"
+COM_OAUTHSERVER_CLIENTS_HEADING_SECRET = "Ключ"
+COM_OAUTHSERVER_CLIENTS_HEADING_PUBLIC = "Публичный"
\ No newline at end of file
diff --git a/com_oauthserver/administrator/src/Model/ClientsModel.php b/com_oauthserver/administrator/src/Model/ClientsModel.php
index b857a80..d78cfa3 100644
--- a/com_oauthserver/administrator/src/Model/ClientsModel.php
+++ b/com_oauthserver/administrator/src/Model/ClientsModel.php
@@ -96,7 +96,7 @@ class ClientsModel extends ListModel
 
         $query = $db->getQuery(true);
 
-        $query->select(['client.id', 'client.client_name', 'client.client_token', 'client.client_id',])
+        $query->select(['client.id', 'client.name', 'client.secret', 'client.identifier', 'client.public', 'client.redirect_uri', 'client.allow_plain_text_pkce'])
             ->from($db->qn('#__webmasterskaya_oauthserver_clients', 'client'));
 
         // Filter by search state
diff --git a/com_oauthserver/administrator/src/View/Clients/HtmlView.php b/com_oauthserver/administrator/src/View/Clients/HtmlView.php
index 6bd8052..0914812 100644
--- a/com_oauthserver/administrator/src/View/Clients/HtmlView.php
+++ b/com_oauthserver/administrator/src/View/Clients/HtmlView.php
@@ -9,6 +9,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarFactoryInterface;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -117,7 +118,7 @@ class HtmlView extends \Joomla\CMS\MVC\View\HtmlView
         $canDo = ContentHelper::getActions('com_oauthserver', 'clients');
 
         $user = $this->getCurrentUser();
-        $toolbar = Factory::getContainer()->get(ToolbarFactoryInterface::class)->createToolbar('toolbar');
+        $toolbar = Toolbar::getInstance('toolbar');
 
         // Set page title
         ToolbarHelper::title(Text::_('COM_OAUTHSERVER') . ': ' . Text::_('COM_OAUTHSERVER_CLIENTS'));
diff --git a/com_oauthserver/administrator/tmpl/clients/default.php b/com_oauthserver/administrator/tmpl/clients/default.php
index a4abe2d..19cc05d 100644
--- a/com_oauthserver/administrator/tmpl/clients/default.php
+++ b/com_oauthserver/administrator/tmpl/clients/default.php
@@ -1,2 +1,107 @@
 <?php
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
+defined('_JEXEC') or die;
+
+/**
+ * @var \Webmasterskaya\Component\OauthServer\Administrator\View\Clients\HtmlView $this
+ */
+
+$wa = $this->document->getWebAssetManager();
+$wa->useScript('table.columns')
+    ->useScript('multiselect');
+$user = Factory::getApplication()->getIdentity();
+$userId = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo Route::_('index.php?option=com_oauthserver&view=clients'); ?>" method="post" name="adminForm"
+      id="adminForm">
+
+    <div class="row">
+        <div class="col-md-12">
+            <div id="j-main-container" class="j-main-container">
+                <?php
+                // Search tools bar
+                echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]);
+                ?>
+                <?php if (empty($this->items)) : ?>
+                    <div class="alert alert-info">
+                        <span class="icon-info-circle" aria-hidden="true"></span><span
+                                class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
+                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+                    </div>
+                <?php else : ?>
+                    <table class="table" id="clientList">
+                        <caption class="visually-hidden">
+                            <?php echo Text::_('COM_OAUTHSERVER_CLIENTS_TABLE_CAPTION'); ?>,
+                            <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+                            <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
+                        </caption>
+                        <thead>
+                        <tr>
+                            <td class="w-1 text-center">
+                                <?php echo HTMLHelper::_('grid.checkall'); ?>
+                            </td>
+                            <th scope="col">
+                                <?php echo HTMLHelper::_('searchtools.sort', 'COM_OAUTHSERVER_CLIENTS_HEADING_NAME', 'client.name', $listDirn, $listOrder); ?>
+                            </th>
+                            <th scope="col">
+                                <?php echo Text::_('COM_OAUTHSERVER_CLIENTS_HEADING_IDENTIFIER'); ?>
+                            </th>
+                            <th scope="col">
+                                <?php echo Text::_('COM_OAUTHSERVER_CLIENTS_HEADING_SECRET'); ?>
+                            </th>
+                            <th scope="col">
+                                <?php echo HTMLHelper::_('searchtools.sort', 'COM_OAUTHSERVER_CLIENTS_HEADING_PUBLIC', 'client.public', $listDirn, $listOrder); ?>
+                            </th>
+                            <th scope="col" class="w-5 d-none d-md-table-cell">
+                                <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'client.id', $listDirn, $listOrder); ?>
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($this->items as $i => $item) : ?>
+
+                            <?php $canCreate = $user->authorise('core.create', 'com_oauthserver.clients');
+                            $canEdit = $user->authorise('core.edit', 'com_oauthserver.clients');
+                            $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out);
+                            $canChange = $user->authorise('core.edit.state', 'com_oauthserver.clients') && $canCheckin; ?>
+                            <tr class="row<?php echo $i % 2; ?>">
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->name); ?>
+                                </td>
+                                <td class="small text-start">
+                                    <?php echo $item->name; ?>
+                                </td>
+                                <td class="small text-center d-none d-md-table-cell">
+                                    <?php echo $item->identifier; ?>
+                                </td>
+                                <td class="small d-none d-md-table-cell">
+                                    <?php echo $item->secret; ?>
+                                </td>
+                                <td class="small d-none d-md-table-cell">
+                                    <?php echo Text::_((bool) $item->public ? 'JYES' : 'JNO'); ?>
+                                </td>
+                                <td class="small text-center">
+                                    <?php echo $item->id; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+                <?php endif; ?>
+            </div>
+        </div>
+    </div>
+
+    <input type="hidden" name="task" value="">
+    <input type="hidden" name="boxchecked" value="0">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
\ No newline at end of file