From 6289f90cb3f74ef2160733c777b4ad68149027b4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 8 Apr 2023 04:36:25 +0200 Subject: [PATCH] fix billing process --- .github/user_bug_report.md | 14 ++++++++++---- Controller/ApiController.php | 10 +++++----- tests/Controller/ApiControllerTest.php | 2 +- 3 files changed, 16 insertions(+), 10 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 b9a22cd..b9ccc2f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -113,7 +113,7 @@ final class ApiController extends Controller require_once $path; $remoteConnection = new NullConnection(); - if (!empty($request->getData('dbtype'))) { + if ($request->hasData('dbtype')) { $remoteConnection = ConnectionFactory::create([ 'db' => (string) $request->getData('dbtype'), 'host' => $request->getDataString('dbhost'), @@ -150,7 +150,7 @@ final class ApiController extends Controller private function validateInterfaceInstall(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) + if (($val['title'] = !$request->hasData('title')) || ($val['files'] = empty($request->getFiles())) ) { return $val; @@ -404,9 +404,9 @@ final class ApiController extends Controller private function validateSettingCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) - || ($val['id'] = empty($request->getData('id'))) - || ($val['data'] = empty($request->getData('data'))) + if (($val['title'] = !$request->hasData('title')) + || ($val['id'] = !$request->hasData('id')) + || ($val['data'] = !$request->hasData('data')) ) { return $val; } diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index a2a29d7..1413e84 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -71,7 +71,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