kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Apikeys (#986)

Browse Source 
* Add QR-Code for API-Url/Key

* Show only API-Keys for current user

* Allow only admin users to create custom API-Keys

* Use a managed package of qrcode-generator instead of a copy of the JS file

* Reuse existing localization string (API key)

* Center QR-Code in popups

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
fipwmaqzufheoxq92ebc
2020-09-06 10:00:49 +02:00
committed by GitHub
parent 40f379b761
commit 85a95f1973
10 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/GenericEntityApiController.php
View File

@@ -13,6 +13,9 @@ class GenericEntityApiController extends BaseApiController
if ($this->IsValidEntity($args['entity']))
{
if($this->IsEntityWithEditRequiresAdmin($args['entity']))
User::checkPermission($request, User::PERMISSION_ADMIN);
$requestBody = $request->getParsedBody();
try
@@ -47,6 +50,8 @@ class GenericEntityApiController extends BaseApiController
if ($this->IsValidEntity($args['entity']))
{
if($this->IsEntityWithEditRequiresAdmin($args['entity']))
User::checkPermission($request, User::PERMISSION_ADMIN);
$row = $this->getDatabase()->{$args['entity']}
($args['objectId']);
$row->delete();
@@ -65,6 +70,8 @@ class GenericEntityApiController extends BaseApiController
if ($this->IsValidEntity($args['entity']))
{
if($this->IsEntityWithEditRequiresAdmin($args['entity']))
User::checkPermission($request, User::PERMISSION_ADMIN);
$requestBody = $request->getParsedBody();
try
@@ -211,6 +218,10 @@ class GenericEntityApiController extends BaseApiController
{
parent::__construct($container);
}
private function IsEntityWithEditRequiresAdmin($entity)
{
return !in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->EntityEditRequiresAdmin->enum);
}
private function IsEntityWithPreventedListing($entity)
{

7
controllers/OpenApiController.php
View File

@@ -2,12 +2,17 @@
namespace Grocy\Controllers;
use Grocy\Controllers\Users\User;
class OpenApiController extends BaseApiController
{
public function ApiKeysList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
$apiKeys = $this->getDatabase()->api_keys();
if(!User::hasPermissions(User::PERMISSION_ADMIN))
$apiKeys = $apiKeys->where('user_id', GROCY_USER_ID);
return $this->renderPage($response, 'manageapikeys', [
'apiKeys' => $this->getDatabase()->api_keys(),
'apiKeys' =>$apiKeys,
'users' => $this->getDatabase()->users()
]);
}