diff --git a/Core/API/GroupsAPI.class.php b/Core/API/GroupsAPI.class.php index 23c5f67..11ffee1 100644 --- a/Core/API/GroupsAPI.class.php +++ b/Core/API/GroupsAPI.class.php @@ -4,6 +4,8 @@ namespace Core\API { use Core\Driver\SQL\Expression\Count; use Core\Objects\Context; + use Core\Objects\DatabaseEntity\Group; + use Core\Objects\DatabaseEntity\User; abstract class GroupsAPI extends Request { @@ -22,6 +24,30 @@ namespace Core\API { $this->lastError = $sql->getLastError(); return $this->success && $res[0]["count"] > 0; } + + protected function getGroup(int $groupId): Group|false { + $sql = $this->context->getSQL(); + $group = Group::find($sql, $groupId); + if ($group === false) { + return $this->createError("Error fetching group: " . $sql->getLastError()); + } else if ($group === null) { + return $this->createError("This group does not exist."); + } + + return $group; + } + + protected function getUser(int $userId): User|false { + $sql = $this->context->getSQL(); + $user = User::find($sql, $userId, true); + if ($user === false) { + return $this->createError("Error fetching user: " . $sql->getLastError()); + } else if ($user === null) { + return $this->createError("This user does not exist."); + } + + return $user; + } } } @@ -33,12 +59,14 @@ namespace Core\API\Groups { use Core\API\Traits\Pagination; use Core\Driver\SQL\Column\Column; use Core\Driver\SQL\Condition\Compare; + use Core\Driver\SQL\Condition\CondAnd; use Core\Driver\SQL\Expression\Alias; use Core\Driver\SQL\Expression\Count; use Core\Driver\SQL\Join\InnerJoin; use Core\Driver\SQL\Query\Insert; use Core\Objects\Context; use Core\Objects\DatabaseEntity\Group; + use Core\Objects\DatabaseEntity\Route; use Core\Objects\DatabaseEntity\User; class Fetch extends GroupsAPI { @@ -49,7 +77,7 @@ namespace Core\API\Groups { public function __construct(Context $context, $externalCall = false) { parent::__construct($context, $externalCall, - self::getPaginationParameters(['id', 'name', 'member_count']) + self::getPaginationParameters(['id', 'name', 'memberCount']) ); $this->groupCount = 0; @@ -97,14 +125,9 @@ namespace Core\API\Groups { } protected function _execute(): bool { - $sql = $this->context->getSQL(); $groupId = $this->getParam("id"); - $group = Group::find($sql, $groupId); - if ($group === false) { - return $this->createError("Error fetching group: " . $sql->getLastError()); - } else if ($group === null) { - return $this->createError("Group not found"); - } else { + $group = $this->getGroup($groupId); + if ($group) { $this->result["group"] = $group->jsonSerialize(); } @@ -157,10 +180,10 @@ namespace Core\API\Groups { class Create extends GroupsAPI { public function __construct(Context $context, $externalCall = false) { - parent::__construct($context, $externalCall, array( + parent::__construct($context, $externalCall, [ 'name' => new StringType('name', 32), 'color' => new StringType('color', 10), - )); + ]); } public function _execute(): bool { @@ -199,6 +222,55 @@ namespace Core\API\Groups { } } + class Update extends GroupsAPI { + public function __construct(Context $context, $externalCall = false) { + parent::__construct($context, $externalCall, [ + "id" => new Parameter("id", Parameter::TYPE_INT), + 'name' => new StringType('name', 32), + 'color' => new StringType('color', 10), + ]); + } + + public function _execute(): bool { + $sql = $this->context->getSQL(); + $groupId = $this->getParam("id"); + $name = $this->getParam("name"); + if (preg_match("/^[a-zA-Z][a-zA-Z0-9_-]*$/", $name) !== 1) { + return $this->createError("Invalid name"); + } + + $color = $this->getParam("color"); + if (preg_match("/^#[a-fA-F0-9]{3,6}$/", $color) !== 1) { + return $this->createError("Invalid color"); + } + + $group = $this->getGroup($groupId); + if ($group === false) { + return false; + } + + $otherGroup = Group::findBy(Group::createBuilder($sql, true) + ->whereNeq("id", $groupId) + ->whereEq("name", $name) + ->first()); + + if ($otherGroup) { + return $this->createError("This name is already in use"); + } + + $group->name = $name; + $group->color = $color; + $this->success = ($group->save($sql) !== FALSE); + $this->lastError = $sql->getLastError(); + + return $this->success; + } + + public static function getDefaultACL(Insert $insert): void { + $insert->addRow(self::getEndpoint(), [Group::ADMIN], "Allows users to update existing groups", true); + } + } + class Delete extends GroupsAPI { public function __construct(Context $context, $externalCall = false) { parent::__construct($context, $externalCall, array( @@ -213,16 +285,13 @@ namespace Core\API\Groups { } $sql = $this->context->getSQL(); - $group = Group::find($sql, $id); - if ($group === false) { - return $this->createError("Error fetching group: " . $sql->getLastError()); - } else if ($group === null) { - return $this->createError("This group does not exist."); - } else { + $group = $this->getGroup($id); + if ($group) { $this->success = ($group->delete($sql) !== FALSE); $this->lastError = $sql->getLastError(); - return $this->success; } + + return $this->success; } public static function getDefaultACL(Insert $insert): void { @@ -233,32 +302,31 @@ namespace Core\API\Groups { class AddMember extends GroupsAPI { public function __construct(Context $context, bool $externalCall = false) { parent::__construct($context, $externalCall, [ - new Parameter("id", Parameter::TYPE_INT), - new Parameter("userId", Parameter::TYPE_INT) + "id" => new Parameter("id", Parameter::TYPE_INT), + "userId" => new Parameter("userId", Parameter::TYPE_INT) ]); } protected function _execute(): bool { - $sql = $this->context->getSQL(); $groupId = $this->getParam("id"); - $userId = $this->getParam("userId"); - $group = Group::find($sql, $groupId); + $group = $this->getGroup($groupId); if ($group === false) { - return $this->createError("Error fetching group: " . $sql->getLastError()); - } else if ($group === null) { - return $this->createError("This group does not exist."); + return false; } - $user = User::find($sql, $userId, true); + $userId = $this->getParam("userId"); + $currentUser = $this->context->getUser(); + $user = $this->getUser($userId); if ($user === false) { - return $this->createError("Error fetching user: " . $sql->getLastError()); - } else if ($user === null) { - return $this->createError("This user does not exist."); + return false; } else if (isset($user->getGroups()[$groupId])) { return $this->createError("This user is already member of this group."); + } else if ($groupId === Group::ADMIN && !$currentUser->hasGroup(Group::ADMIN)) { + return $this->createError("You cannot add the administrator group to other users."); } $user->groups[$groupId] = $group; + $sql = $this->context->getSQL(); $this->success = $user->save($sql, ["groups"], true); if (!$this->success) { return $this->createError("Error saving user: " . $sql->getLastError()); @@ -275,32 +343,31 @@ namespace Core\API\Groups { class RemoveMember extends GroupsAPI { public function __construct(Context $context, bool $externalCall = false) { parent::__construct($context, $externalCall, [ - new Parameter("id", Parameter::TYPE_INT), - new Parameter("userId", Parameter::TYPE_INT) + "id" => new Parameter("id", Parameter::TYPE_INT), + "userId" => new Parameter("userId", Parameter::TYPE_INT) ]); } protected function _execute(): bool { - $sql = $this->context->getSQL(); $groupId = $this->getParam("id"); - $userId = $this->getParam("userId"); - $group = Group::find($sql, $groupId); + $group = $this->getGroup($groupId); if ($group === false) { - return $this->createError("Error fetching group: " . $sql->getLastError()); - } else if ($group === null) { - return $this->createError("This group does not exist."); + return false; } - $user = User::find($sql, $userId, true); + $userId = $this->getParam("userId"); + $currentUser = $this->context->getUser(); + $user = $this->getUser($userId); if ($user === false) { - return $this->createError("Error fetching user: " . $sql->getLastError()); - } else if ($user === null) { - return $this->createError("This user does not exist."); + return false; } else if (!isset($user->getGroups()[$groupId])) { return $this->createError("This user is not member of this group."); + } else if ($userId === $currentUser->getId() && $groupId === Group::ADMIN) { + return $this->createError("Cannot remove Administrator group from own user."); } unset($user->groups[$groupId]); + $sql = $this->context->getSQL(); $this->success = $user->save($sql, ["groups"], true); if (!$this->success) { return $this->createError("Error saving user: " . $sql->getLastError()); diff --git a/Core/API/LanguageAPI.class.php b/Core/API/LanguageAPI.class.php index 5c65c31..85729a4 100644 --- a/Core/API/LanguageAPI.class.php +++ b/Core/API/LanguageAPI.class.php @@ -88,13 +88,12 @@ namespace Core\API\Language { return $this->success; } - private function updateLanguage(): bool { + private function updateLanguage(): void { $sql = $this->context->getSQL(); $currentUser = $this->context->getUser(); $currentUser->language = $this->language; $this->success = $currentUser->save($sql, ["language"]); $this->lastError = $sql->getLastError(); - return $this->success; } public function _execute(): bool { @@ -141,12 +140,12 @@ namespace Core\API\Language { } $moduleFound = false; - foreach (["Site", "Core"] as $baseDir) { - $filePath = realpath(implode("/", [$baseDir, "Localization", $code, "$module.php"])); + foreach (["Core", "Site"] as $baseDir) { + $filePath = realpath(implode("/", [WEBROOT, $baseDir, "Localization", $code, "$module.php"])); if ($filePath && is_file($filePath)) { $moduleFound = true; $moduleEntries = @include_once $filePath; - $entries[$module] = $moduleEntries; + $entries[$module] = array_merge($entries[$module] ?? [], $moduleEntries); break; } } diff --git a/Core/API/Swagger.class.php b/Core/API/Swagger.class.php index 549185f..2a09455 100644 --- a/Core/API/Swagger.class.php +++ b/Core/API/Swagger.class.php @@ -106,8 +106,11 @@ class Swagger extends Request { "post" => [ "produces" => ["application/json"], "responses" => [ - "200" => ["description" => ""], + "200" => ["description" => "OK!"], + "400" => ["description" => "Parameter validation failed"], "401" => ["description" => "Login or 2FA Authorization is required"], + "403" => ["description" => "CSRF-Token validation failed or insufficient permissions"], + "503" => ["description" => "Function is disabled"], ] ] ]; diff --git a/Core/API/UserAPI.class.php b/Core/API/UserAPI.class.php index d8ea8c9..9ec70e8 100644 --- a/Core/API/UserAPI.class.php +++ b/Core/API/UserAPI.class.php @@ -136,6 +136,7 @@ namespace Core\API\User { use Core\API\UserAPI; use Core\API\VerifyCaptcha; use Core\Driver\SQL\Condition\CondBool; + use Core\Driver\SQL\Condition\CondLike; use Core\Driver\SQL\Condition\CondOr; use Core\Driver\SQL\Expression\Alias; use Core\Driver\SQL\Query\Insert; @@ -320,6 +321,39 @@ namespace Core\API\User { } } + class Search extends UserAPI { + public function __construct(Context $context, bool $externalCall = false) { + parent::__construct($context, $externalCall, [ + "query" => new StringType("query", 64) + ]); + } + + protected function _execute(): bool { + $sql = $this->context->getSQL(); + $query = $this->getParam("query"); + + $users = User::findBy(User::createBuilder($sql, false) + ->where(new CondOr( + new CondLike(new Column("name"), "%$query%"), + new CondLike(new Column("full_name"), "%$query%"), + new CondLike(new Column("email"), "%$query%"), + )) + ->whereTrue("active") + ); + + if ($users === false) { + return $this->createError($sql->getLastError()); + } + + $this->result["users"] = $users; + return true; + } + + public static function getDefaultACL(Insert $insert): void { + $insert->addRow(self::getEndpoint(), "Allows users to search other users", [Group::ADMIN, Group::SUPPORT], true); + } + } + class Info extends UserAPI { public function __construct(Context $context, $externalCall = false) { diff --git a/Core/Documents/Admin.class.php b/Core/Documents/Admin.class.php index 85c6596..c92236e 100644 --- a/Core/Documents/Admin.class.php +++ b/Core/Documents/Admin.class.php @@ -12,5 +12,6 @@ class Admin extends TemplateDocument { $this->searchable = false; $this->enableCSP(); $this->addCSPWhitelist("/react/dist/admin-panel/"); + $this->languageModules[] = "admin"; } } \ No newline at end of file diff --git a/Core/External/composer.json b/Core/External/composer.json index 9243fd5..6f51e34 100644 --- a/Core/External/composer.json +++ b/Core/External/composer.json @@ -1,14 +1,14 @@ { "require": { - "php-mqtt/client": "^1.1", - "twig/twig": "^3.0", - "chillerlan/php-qrcode": "^4.3", + "php-mqtt/client": "^2.0", + "twig/twig": "^3.8", + "chillerlan/php-qrcode": "^5.0", "christian-riesen/base32": "^1.6", - "spomky-labs/cbor-php": "2.1.0", - "web-auth/cose-lib": "3.3.12", + "spomky-labs/cbor-php": "^3.0", + "web-auth/cose-lib": "^4.0", "html2text/html2text": "^4.3" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.6" } } diff --git a/Core/External/composer.lock b/Core/External/composer.lock index d89c499..7570f8a 100644 --- a/Core/External/composer.lock +++ b/Core/External/composer.lock @@ -4,75 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc183c367dc010feed9b7ddaa7d54559", + "content-hash": "36736f230909177ae511bf6f6a7a0d8b", "packages": [ - { - "name": "beberlei/assert", - "version": "v3.3.2", - "source": { - "type": "git", - "url": "https://github.com/beberlei/assert.git", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "ext-mbstring": "*", - "ext-simplexml": "*", - "php": "^7.0 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "*", - "phpstan/phpstan": "*", - "phpunit/phpunit": ">=6.0.0", - "yoast/phpunit-polyfills": "^0.1.0" - }, - "suggest": { - "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles" - }, - "type": "library", - "autoload": { - "files": [ - "lib/Assert/functions.php" - ], - "psr-4": { - "Assert\\": "lib/Assert" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de", - "role": "Lead Developer" - }, - { - "name": "Richard Quadling", - "email": "rquadling@gmail.com", - "role": "Collaborator" - } - ], - "description": "Thin assertion library for input validation in business models.", - "keywords": [ - "assert", - "assertion", - "validation" - ], - "support": { - "issues": "https://github.com/beberlei/assert/issues", - "source": "https://github.com/beberlei/assert/tree/v3.3.2" - }, - "time": "2021-12-16T21:41:27+00:00" - }, { "name": "brick/math", "version": "0.9.3", @@ -135,31 +68,35 @@ }, { "name": "chillerlan/php-qrcode", - "version": "4.3.4", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d" + "reference": "da5bdb82c8755f54de112b271b402aaa8df53269" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", - "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/da5bdb82c8755f54de112b271b402aaa8df53269", + "reference": "da5bdb82c8755f54de112b271b402aaa8df53269", "shasum": "" }, "require": { - "chillerlan/php-settings-container": "^2.1.4", + "chillerlan/php-settings-container": "^2.1.4 || ^3.1", "ext-mbstring": "*", "php": "^7.4 || ^8.0" }, "require-dev": { - "phan/phan": "^5.3", - "phpunit/phpunit": "^9.5", - "setasign/fpdf": "^1.8.2" + "chillerlan/php-authenticator": "^4.1 || ^5.1", + "phan/phan": "^5.4", + "phpmd/phpmd": "^2.15", + "phpunit/phpunit": "^9.6", + "setasign/fpdf": "^1.8.2", + "squizlabs/php_codesniffer": "^3.8" }, "suggest": { "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", - "setasign/fpdf": "Required to use the QR FPDF output." + "setasign/fpdf": "Required to use the QR FPDF output.", + "simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code" }, "type": "library", "autoload": { @@ -169,12 +106,21 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "MIT", + "Apache-2.0" ], "authors": [ { "name": "Kazuhiko Arase", - "homepage": "https://github.com/kazuhikoarase" + "homepage": "https://github.com/kazuhikoarase/qrcode-generator" + }, + { + "name": "ZXing Authors", + "homepage": "https://github.com/zxing/zxing" + }, + { + "name": "Ashot Khanamiryan", + "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder" }, { "name": "Smiley", @@ -186,18 +132,21 @@ "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" } ], - "description": "A QR code generator. PHP 7.4+", + "description": "A QR code generator and reader with a user friendly API. PHP 7.4+", "homepage": "https://github.com/chillerlan/php-qrcode", "keywords": [ "phpqrcode", "qr", "qr code", + "qr-reader", "qrcode", - "qrcode-generator" + "qrcode-generator", + "qrcode-reader" ], "support": { + "docs": "https://php-qrcode.readthedocs.io", "issues": "https://github.com/chillerlan/php-qrcode/issues", - "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.4" + "source": "https://github.com/chillerlan/php-qrcode" }, "funding": [ { @@ -209,29 +158,31 @@ "type": "ko_fi" } ], - "time": "2022-07-25T09:12:45+00:00" + "time": "2024-02-27T14:37:26+00:00" }, { "name": "chillerlan/php-settings-container", - "version": "2.1.4", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/chillerlan/php-settings-container.git", - "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a" + "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", - "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/8f93648fac8e6bacac8e00a8d325eba4950295e6", + "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^8.1" }, "require-dev": { - "phan/phan": "^5.3", - "phpunit/phpunit": "^9.5" + "phan/phan": "^5.4", + "phpmd/phpmd": "^2.15", + "phpunit/phpunit": "^10.5", + "squizlabs/php_codesniffer": "^3.9" }, "type": "library", "autoload": { @@ -250,10 +201,9 @@ "homepage": "https://github.com/codemasher" } ], - "description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", + "description": "A container class for immutable settings objects. Not a DI container.", "homepage": "https://github.com/chillerlan/php-settings-container", "keywords": [ - "PHP7", "Settings", "configuration", "container", @@ -273,7 +223,7 @@ "type": "ko_fi" } ], - "time": "2022-07-05T22:32:14+00:00" + "time": "2024-03-02T20:07:15+00:00" }, { "name": "christian-riesen/base32", @@ -336,24 +286,24 @@ }, { "name": "fgrosse/phpasn1", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296" + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/eef488991d53e58e60c9554b09b1201ca5ba9296", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/42060ed45344789fb9f21f9f1864fc47b9e3507b", + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b", "shasum": "" }, "require": { - "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "~2.0", - "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -405,71 +355,10 @@ ], "support": { "issues": "https://github.com/fgrosse/PHPASN1/issues", - "source": "https://github.com/fgrosse/PHPASN1/tree/v2.4.0" + "source": "https://github.com/fgrosse/PHPASN1/tree/v2.5.0" }, - "time": "2021-12-11T12:41:06+00:00" - }, - { - "name": "firebase/php-jwt", - "version": "v6.3.1", - "source": { - "type": "git", - "url": "https://github.com/firebase/php-jwt.git", - "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/ddfaddcb520488b42bca3a75e17e9dd53c3667da", - "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da", - "shasum": "" - }, - "require": { - "php": "^7.1||^8.0" - }, - "require-dev": { - "guzzlehttp/guzzle": "^6.5||^7.4", - "phpspec/prophecy-phpunit": "^1.1", - "phpunit/phpunit": "^7.5||^9.5", - "psr/cache": "^1.0||^2.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0" - }, - "suggest": { - "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" - }, - "type": "library", - "autoload": { - "psr-4": { - "Firebase\\JWT\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Neuman Vong", - "email": "neuman+pear@twilio.com", - "role": "Developer" - }, - { - "name": "Anant Narayanan", - "email": "anant@php.net", - "role": "Developer" - } - ], - "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", - "homepage": "https://github.com/firebase/php-jwt", - "keywords": [ - "jwt", - "php" - ], - "support": { - "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.3.1" - }, - "time": "2022-11-01T21:20:08+00:00" + "abandoned": true, + "time": "2022-12-19T11:08:26+00:00" }, { "name": "html2text/html2text", @@ -577,21 +466,21 @@ }, { "name": "php-mqtt/client", - "version": "v1.6.0", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/php-mqtt/client.git", - "reference": "22a207edef01d5f0ed3a6a79565cc425b678d786" + "reference": "458afc0bf33075ed8a1ffad72af5e10f2b516220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mqtt/client/zipball/22a207edef01d5f0ed3a6a79565cc425b678d786", - "reference": "22a207edef01d5f0ed3a6a79565cc425b678d786", + "url": "https://api.github.com/repos/php-mqtt/client/zipball/458afc0bf33075ed8a1ffad72af5e10f2b516220", + "reference": "458afc0bf33075ed8a1ffad72af5e10f2b516220", "shasum": "" }, "require": { "myclabs/php-enum": "^1.7", - "php": "^7.4|^8.0", + "php": "^8.0", "psr/log": "^1.1|^2.0|^3.0" }, "require-dev": { @@ -628,9 +517,9 @@ ], "support": { "issues": "https://github.com/php-mqtt/client/issues", - "source": "https://github.com/php-mqtt/client/tree/v1.6.0" + "source": "https://github.com/php-mqtt/client/tree/v2.0.0" }, - "time": "2022-11-01T20:00:19+00:00" + "time": "2023-11-25T20:53:47+00:00" }, { "name": "psr/log", @@ -684,37 +573,40 @@ }, { "name": "spomky-labs/cbor-php", - "version": "v2.1.0", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/cbor-php.git", - "reference": "28e2712cfc0b48fae661a48ffc6896d7abe83684" + "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/28e2712cfc0b48fae661a48ffc6896d7abe83684", - "reference": "28e2712cfc0b48fae661a48ffc6896d7abe83684", + "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b", + "reference": "658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b", "shasum": "" }, "require": { - "brick/math": "^0.8.15|^0.9.0", + "brick/math": "^0.9|^0.10|^0.11|^0.12", "ext-mbstring": "*", - "php": ">=7.3" + "php": ">=8.0" }, "require-dev": { "ekino/phpstan-banned-code": "^1.0", "ext-json": "*", - "infection/infection": "^0.18|^0.25", + "infection/infection": "^0.27", + "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.0", "phpstan/phpstan-beberlei-assert": "^1.0", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", - "rector/rector": "^0.12", + "phpunit/phpunit": "^10.1", + "qossmic/deptrac-shim": "^1.0", + "rector/rector": "^0.19", "roave/security-advisories": "dev-latest", - "symplify/easy-coding-standard": "^10.0" + "symfony/var-dumper": "^6.0|^7.0", + "symplify/easy-coding-standard": "^12.0" }, "suggest": { "ext-bcmath": "GMP or BCMath extensions will drastically improve the library performance. BCMath extension needed to handle the Big Float and Decimal Fraction Tags", @@ -748,7 +640,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/cbor-php/issues", - "source": "https://github.com/Spomky-Labs/cbor-php/tree/v2.1.0" + "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.0.4" }, "funding": [ { @@ -760,20 +652,20 @@ "type": "patreon" } ], - "time": "2021-12-13T12:46:26+00:00" + "time": "2024-01-29T20:33:48+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -787,9 +679,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -826,7 +715,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -842,20 +731,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -869,9 +758,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -909,7 +795,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -925,37 +811,113 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { - "name": "twig/twig", - "version": "v3.4.3", + "name": "symfony/polyfill-php80", + "version": "v1.29.0", "source": { "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "twig/twig", + "version": "v3.8.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php80": "^1.22" }, "require-dev": { - "psr/container": "^1.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Twig\\": "src/" @@ -989,7 +951,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.4.3" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -1001,29 +963,47 @@ "type": "tidelift" } ], - "time": "2022-09-28T08:42:51+00:00" + "time": "2023-11-21T18:54:41+00:00" }, { "name": "web-auth/cose-lib", - "version": "v3.3.12", + "version": "4.0.13", "source": { "type": "git", "url": "https://github.com/web-auth/cose-lib.git", - "reference": "efa6ec2ba4e840bc1316a493973c9916028afeeb" + "reference": "fc733974fe12b550b54a94a08e4e184aca0015e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/efa6ec2ba4e840bc1316a493973c9916028afeeb", - "reference": "efa6ec2ba4e840bc1316a493973c9916028afeeb", + "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/fc733974fe12b550b54a94a08e4e184aca0015e5", + "reference": "fc733974fe12b550b54a94a08e4e184aca0015e5", "shasum": "" }, "require": { - "beberlei/assert": "^3.2", + "brick/math": "^0.9|^0.10", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "fgrosse/phpasn1": "^2.1", - "php": ">=7.2" + "php": ">=8.1" + }, + "require-dev": { + "ekino/phpstan-banned-code": "^1.0", + "infection/infection": "^0.26.12", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpstan/phpstan": "^1.7", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.2", + "phpunit/phpunit": "^9.5", + "qossmic/deptrac-shim": "^0.24.0", + "rector/rector": "^0.14", + "symfony/phpunit-bridge": "^6.1", + "symplify/easy-coding-standard": "^11.0" + }, + "suggest": { + "ext-bcmath": "For better performance, please install either GMP (recommended) or BCMath extension", + "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension" }, "type": "library", "autoload": { @@ -1052,7 +1032,8 @@ "RFC8152" ], "support": { - "source": "https://github.com/web-auth/cose-lib/tree/v3.3.12" + "issues": "https://github.com/web-auth/cose-lib/issues", + "source": "https://github.com/web-auth/cose-lib/tree/4.0.13" }, "funding": [ { @@ -1064,36 +1045,36 @@ "type": "patreon" } ], - "time": "2021-12-04T12:13:35+00:00" + "time": "2022-09-17T08:34:42+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -1120,7 +1101,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -1136,20 +1117,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -1187,7 +1168,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -1195,29 +1176,31 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -1225,7 +1208,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1249,26 +1232,27 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2024-03-05T20:51:40+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -1309,9 +1293,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -1366,23 +1356,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.19", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -1397,8 +1387,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -1431,7 +1421,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -1439,7 +1430,7 @@ "type": "github" } ], - "time": "2022-11-18T07:47:47+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1684,20 +1675,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.26", + "version": "9.6.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" + "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", + "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -1708,7 +1699,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -1726,8 +1717,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -1735,7 +1726,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -1766,7 +1757,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.18" }, "funding": [ { @@ -1782,20 +1774,20 @@ "type": "tidelift" } ], - "time": "2022-10-28T06:00:21+00:00" + "time": "2024-03-21T12:07:32+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -1830,7 +1822,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -1838,7 +1830,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -2027,20 +2019,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -2072,7 +2064,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -2080,20 +2072,20 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -2138,7 +2130,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -2146,20 +2138,20 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -2201,7 +2193,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -2209,20 +2201,20 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -2278,7 +2270,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -2286,20 +2278,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -2342,7 +2334,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -2350,24 +2342,24 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -2399,7 +2391,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -2407,7 +2399,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -2523,16 +2515,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -2571,10 +2563,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -2582,20 +2574,20 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -2607,7 +2599,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -2628,8 +2620,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -2637,20 +2628,20 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -2685,7 +2676,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -2693,7 +2684,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -2750,16 +2741,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -2788,7 +2779,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -2796,7 +2787,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2024-03-03T12:36:25+00:00" } ], "aliases": [], @@ -2806,5 +2797,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/Core/Templates/admin.twig b/Core/Templates/admin.twig index f803600..221aaa3 100644 --- a/Core/Templates/admin.twig +++ b/Core/Templates/admin.twig @@ -1,7 +1,7 @@ {% extends "base.twig" %} {% block head %} - {{ site.name }} - {{ L("admin.admin") }} + {{ site.name }} - {{ L("admin.title") }} {% endblock %} diff --git a/docker/php/php.ini b/docker/php/php.ini index a0d6ba7..62f4d75 100644 --- a/docker/php/php.ini +++ b/docker/php/php.ini @@ -397,7 +397,7 @@ zend.exception_string_param_max_len = 0 ; threat in any way, but it makes it possible to determine whether you use PHP ; on your server or not. ; https://php.net/expose-php -expose_php = On +expose_php = Off ;;;;;;;;;;;;;;;;;;; ; Resource Limits ; diff --git a/react/admin-panel/src/views/group/group-edit.js b/react/admin-panel/src/views/group/group-edit.js index 7386f47..1170da3 100644 --- a/react/admin-panel/src/views/group/group-edit.js +++ b/react/admin-panel/src/views/group/group-edit.js @@ -1,9 +1,15 @@ import {useCallback, useContext, useEffect, useState} from "react"; import {Link, useNavigate, useParams} from "react-router-dom"; import {LocaleContext} from "shared/locale"; -import {CircularProgress} from "@material-ui/core"; +import {Button, CircularProgress} from "@material-ui/core"; import * as React from "react"; import ColorPicker from "material-ui-color-picker"; +import {ControlsColumn, DataTable, NumericColumn, StringColumn} from "shared/elements/data-table"; +import EditIcon from "@mui/icons-material/Edit"; +import usePagination from "shared/hooks/pagination"; +import {Delete, KeyboardArrowLeft, Save} from "@material-ui/icons"; +import Dialog from "shared/elements/dialog"; +import {Box, FormControl, FormGroup, FormLabel, styled, TextField} from "@mui/material"; const defaultGroupData = { name: "", @@ -11,6 +17,12 @@ const defaultGroupData = { members: [] }; +const ButtonBar = styled(Box)((props) => ({ + "& > button": { + marginRight: props.theme.spacing(1) + } +})); + export default function EditGroupView(props) { const {translate: L, requestModules, currentLocale} = useContext(LocaleContext); @@ -18,14 +30,30 @@ export default function EditGroupView(props) { const { groupId } = useParams(); const navigate = useNavigate(); const isNewGroup = groupId === "new"; + const pagination = usePagination(); + const api = props.api; + // data const [fetchGroup, setFetchGroup] = useState(!isNewGroup); const [group, setGroup] = useState(isNewGroup ? defaultGroupData : null); + const [members, setMembers] = useState([]); + + // ui + const [dialogData, setDialogData] = useState({open: false}); + const [isSaving, setSaving] = useState(false); + + useEffect(() => { + requestModules(props.api, ["general", "account"], currentLocale).then(data => { + if (!data.success) { + props.showDialog(data.msg, "Error fetching localization"); + } + }); + }, [currentLocale]); const onFetchGroup = useCallback((force = false) => { if (force || fetchGroup) { setFetchGroup(false); - props.api.getGroup(groupId).then(res => { + api.getGroup(groupId).then(res => { if (!res.success) { props.showDialog(res.msg, "Error fetching group"); navigate("/admin/groups"); @@ -34,7 +62,51 @@ export default function EditGroupView(props) { } }); } - }, []); + }, [api, fetchGroup]); + + const onFetchMembers = useCallback(async (page, count, orderBy, sortOrder) => { + api.fetchGroupMembers(groupId, page, count, orderBy, sortOrder).then((res) => { + if (res.success) { + setMembers(res.users); + pagination.update(res.pagination); + } else { + props.showDialog(res.msg, "Error fetching group members"); + return null; + } + }); + }, [groupId, api, pagination]); + + const onRemoveMember = useCallback(userId => { + api.removeGroupMember(groupId, userId).then(data => { + if (data.success) { + let newMembers = members.filter(u => u.id !== userId); + setMembers(newMembers); + } else { + props.showDialog(data.msg, "Error removing group member"); + } + }); + }, [api, groupId, members]); + + const onSave = useCallback(() => { + setSaving(true); + if (isNewGroup) { + api.createGroup(group.name, group.color).then(data => { + if (!data.success) { + props.showDialog(data.msg, "Error creating group"); + setSaving(false); + } else { + navigate(`/admin/groups/${data.id}`) + } + }); + } else { + api.updateGroup(groupId, group.name, group.color).then(data => { + setSaving(false); + if (!data.success) { + props.showDialog(data.msg, "Error updating group"); + } + }); + } + }, [api, groupId, isNewGroup, group]); useEffect(() => { onFetchGroup(); @@ -65,43 +137,97 @@ export default function EditGroupView(props) {
-
-
this.submitForm(e)}> -
- - -
+
+ + + {L("account.group_name")} + + + setGroup({...group, name: e.target.value})}/> + + -
- -
- setGroup({...group, color: color})} - /> -
-
+ + + {L("account.color")} + + + setGroup({...group, color: color})} + /> + + - -  {L("general.go_back")} - - - -
-
-

{L("account.members")}

+ + + +
+ {!isNewGroup && api.hasPermission("groups/getMembers") ? +
+
+ navigate(`/admin/user/${entry.id}`) + }, + { + label: L("general.remove"), + element: Delete, + disabled: !api.hasPermission("groups/removeMember"), + onClick: (entry) => setDialogData({ + open: true, + title: L("Remove member"), + message: sprintf(L("Do you really want to remove user '%s' from this group?"), entry.fullName || entry.name), + onOption: (option) => option === 0 && onRemoveMember(entry.id) + }) + } + ]), + ]} + /> +
+
+ : <> + }
+ setDialogData({open: false})} + title={dialogData.title} + message={dialogData.message} + onOption={dialogData.onOption} + inputs={dialogData.inputs} + options={[L("general.ok"), L("general.cancel")]} /> } \ No newline at end of file diff --git a/react/admin-panel/src/views/group/group-list.js b/react/admin-panel/src/views/group/group-list.js index 224c243..71cd077 100644 --- a/react/admin-panel/src/views/group/group-list.js +++ b/react/admin-panel/src/views/group/group-list.js @@ -1,7 +1,7 @@ import {Link, useNavigate} from "react-router-dom"; import {useCallback, useContext, useEffect, useState} from "react"; import {LocaleContext} from "shared/locale"; -import {DataColumn, DataTable, NumericColumn, StringColumn} from "shared/elements/data-table"; +import {ControlsColumn, DataColumn, DataTable, NumericColumn, StringColumn} from "shared/elements/data-table"; import {Button, IconButton} from "@material-ui/core"; import EditIcon from '@mui/icons-material/Edit'; import AddIcon from '@mui/icons-material/Add'; @@ -28,7 +28,6 @@ export default function GroupListView(props) { }, [currentLocale]); const onFetchGroups = useCallback(async (page, count, orderBy, sortOrder) => { - api.fetchGroups(page, count, orderBy, sortOrder).then((res) => { if (res.success) { setGroups(res.groups); @@ -40,21 +39,13 @@ export default function GroupListView(props) { }); }, [api, pagination]); - const actionColumn = (() => { - let column = new DataColumn(L("general.actions"), null, false); - column.renderData = (L, entry) => <> - navigate("/admin/group/" + entry.id)}> - - - - return column; - })(); - const columnDefinitions = [ new NumericColumn(L("general.id"), "id"), new StringColumn(L("account.name"), "name"), - new NumericColumn(L("account.member_count"), "memberCount"), - actionColumn, + new NumericColumn(L("account.member_count"), "memberCount", { align: "center" }), + new ControlsColumn(L("general.controls"), [ + { label: L("general.edit"), element: EditIcon, onClick: (entry) => navigate(`/admin/group/${entry.id}`) } + ]), ]; return <> diff --git a/react/shared/api.js b/react/shared/api.js index b6bc410..52e320a 100644 --- a/react/shared/api.js +++ b/react/shared/api.js @@ -153,14 +153,6 @@ export default class API { return this.apiCall("user/fetch", { page: pageNum, count: count, orderBy: orderBy, sortOrder: sortOrder }); } - async fetchGroups(pageNum = 1, count = 20, orderBy = 'id', sortOrder = 'asc') { - return this.apiCall("groups/fetch", { page: pageNum, count: count, orderBy: orderBy, sortOrder: sortOrder }); - } - - async getGroup(id) { - return this.apiCall("groups/get", { id: id }); - } - async inviteUser(username, email) { return this.apiCall("user/invite", { username: username, email: email }); } @@ -207,6 +199,39 @@ export default class API { return res; } + /** Groups API **/ + async fetchGroups(pageNum = 1, count = 20, orderBy = 'id', sortOrder = 'asc') { + return this.apiCall("groups/fetch", { page: pageNum, count: count, orderBy: orderBy, sortOrder: sortOrder }); + } + + async fetchGroupMembers(groupId, pageNum = 1, count = 20, orderBy = 'id', sortOrder = 'asc') { + return this.apiCall("groups/getMembers", { id: groupId, page: pageNum, count: count, orderBy: orderBy, sortOrder: sortOrder }); + } + + async removeGroupMember (groupId, userId) { + return this.apiCall("groups/removeMember", { id: groupId, userId: userId }); + } + + async addGroupMember (groupId, userId) { + return this.apiCall("groups/addMember", { id: groupId, userId: userId }); + } + + async getGroup(id) { + return this.apiCall("groups/get", { id: id }); + } + + async createGroup(name, color) { + return this.apiCall("groups/create", { name: name, color: color }); + } + + async updateGroup(id, name, color) { + return this.apiCall("groups/update", { id: id, name: name, color: color }); + } + + async deleteGroup(id) { + return this.apiCall("groups/delete", { id: id }); + } + /** Stats **/ async getStats() { return this.apiCall("stats"); @@ -249,15 +274,6 @@ export default class API { return this.apiCall("routes/update", { id, pattern, type, target, extra, exact, active }); } - /** GroupAPI **/ - async createGroup(name, color) { - return this.apiCall("groups/create", { name: name, color: color }); - } - - async deleteGroup(id) { - return this.apiCall("groups/delete", { id: id }); - } - /** SettingsAPI **/ async getSettings(key = "") { return this.apiCall("settings/get", { key: key });