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

---
 .github/user_bug_report.md   | 14 ++++++++++----
 Controller/ApiController.php |  8 ++++----
 Controller/CliController.php |  2 +-
 3 files changed, 15 insertions(+), 9 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 99707d8..ba6850a 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -166,7 +166,7 @@ final class ApiController extends Controller
                 PermissionType::READ, $this->app->unitId, null, self::NAME, PermissionCategory::INSTANCE, $instance->getId()
             )
             || ($isExport && !$this->app->accountManager->get($accountId)->hasPermission(
-                    PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::EXPORT
+                    PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::EXPORT
             ))
         ) {
             $response->header->status = RequestStatusCode::R_403;
@@ -198,7 +198,7 @@ final class ApiController extends Controller
     private function validateExport(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['id'] = empty($request->getData('id')))) {
+        if (($val['id'] = !$request->hasData('id'))) {
             return $val;
         }
 
@@ -531,7 +531,7 @@ final class ApiController extends Controller
     private function validateTemplateCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['name'] = empty($request->getData('name')))) {
+        if (($val['name'] = !$request->hasData('name'))) {
             return $val;
         }
 
@@ -661,7 +661,7 @@ final class ApiController extends Controller
     private function validateInstanceCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['template'] = empty($request->getData('template')))) {
+        if (($val['template'] = !$request->hasData('template'))) {
             return $val;
         }
 
diff --git a/Controller/CliController.php b/Controller/CliController.php
index ab11c6f..0d2eb10 100755
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -134,7 +134,7 @@ final class CliController extends Controller
     private function validateInstanceCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['j'] = empty($request->getData('j')))) {
+        if (($val['j'] = !$request->hasData('j'))) {
             return $val;
         }