From 919db39b7a2bcf3fab275b3e095edf6aa96a9826 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 8 Apr 2023 04:36:25 +0200
Subject: [PATCH] fix billing process

---
 .github/user_bug_report.md             | 14 ++++++++++----
 Controller/ApiController.php           | 14 +++++++-------
 Controller/BackendController.php       |  6 +++---
 tests/Controller/ApiControllerTest.php |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md
index 9e5f2a5..4b92a8e 100755
--- a/.github/user_bug_report.md
+++ b/.github/user_bug_report.md
@@ -8,9 +8,11 @@ assignees: ''
 ---
 
 # Bug Description
+
 A clear and concise description of what the bug is.
 
 # How to Reproduce
+
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -19,16 +21,20 @@ Steps to reproduce the behavior:
 4. See error
 
 # Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 # Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 # System Information
- - System: [e.g. PC or iPhone11, ...]
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - KarakaVersion [e.g. 22]
+
+- System: [e.g. PC or iPhone11, ...]
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- KarakaVersion [e.g. 22]
 
 # Additional Information
+
 Add any other context about the problem here.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 04dd933..367f7f4 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -61,7 +61,7 @@ final class ApiController extends Controller
     private function validateEditorDocTypeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['name'] = empty($request->getData('name')))
+        if (($val['name'] = !$request->hasData('name'))
         ) {
             return $val;
         }
@@ -111,7 +111,7 @@ final class ApiController extends Controller
         $type       = new EditorDocType();
         $type->name = $request->getDataString('name') ?? '';
 
-        if (!empty($request->getData('title'))) {
+        if ($request->hasData('title')) {
             $type->setL11n(
                 $request->getDataString('title') ?? '',
                 $request->getDataString('lang') ?? $request->getLanguage()
@@ -133,8 +133,8 @@ final class ApiController extends Controller
     private function validateEditorDocTypeL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['type'] = empty($request->getData('type')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['type'] = !$request->hasData('type'))
         ) {
             return $val;
         }
@@ -203,8 +203,8 @@ final class ApiController extends Controller
     private function validateEditorCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['plain'] = empty($request->getData('plain')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['plain'] = !$request->hasData('plain'))
         ) {
             return $val;
         }
@@ -618,7 +618,7 @@ final class ApiController extends Controller
     private function validateEditorFileCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['doc'] = empty($request->getData('doc')))) {
+        if (($val['doc'] = !$request->hasData('doc'))) {
             return $val;
         }
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c131bb2..96d7f07 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -144,7 +144,7 @@ final class BackendController extends Controller
 
         if ($doc->createdBy->getId() !== $accountId
             && !$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::DOC, $doc->getId())
+                PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::DOC, $doc->getId())
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->header->status = RequestStatusCode::R_403;
@@ -162,7 +162,7 @@ final class BackendController extends Controller
         $view->addData('tagSelector', $tagSelector);
 
         $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission(
-            PermissionType::MODIFY, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::DOC, $doc->getId())
+            PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::DOC, $doc->getId())
         );
 
         return $view;
@@ -190,7 +190,7 @@ final class BackendController extends Controller
 
         if ($doc->createdBy->getId() !== $accountId
             && !$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::DOC, $doc->getId())
+                PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::DOC, $doc->getId())
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->header->status = RequestStatusCode::R_403;
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 098e205..0189b4f 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -72,7 +72,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $permission = new AccountPermission();
         $permission->setUnit(1);
-        $permission->setApp('backend');
+        $permission->setApp(2);
         $permission->setPermission(
             PermissionType::READ
             | PermissionType::CREATE