Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-11 10:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use credential mapper

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-18 19:51:11 +01:00
parent b1be45f365
commit aa1122b91d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Controller/ApiController.php
View File

@ -16,6 +16,7 @@ namespace Modules\Admin\Controller;
use Model\SettingsEnum; use Model\SettingsEnum;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use Modules\Admin\Models\AccountCredentialMapper;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermission;
use Modules\Admin\Models\AccountPermissionMapper; use Modules\Admin\Models\AccountPermissionMapper;
@ -1028,7 +1029,7 @@ final class ApiController extends Controller
$account = $this->createAccountFromRequest($request); $account = $this->createAccountFromRequest($request);
$this->createModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin()); $this->createModel($request->header->account, $account, AccountCredentialMapper::class, 'account', $request->getOrigin());
$this->createProfileForAccount($account, $request); $this->createProfileForAccount($account, $request);
$this->createMediaDirForAccount($account->getId(), $account->login ?? '', $request->header->account); $this->createMediaDirForAccount($account->getId(), $account->login ?? '', $request->header->account);
@ -1597,7 +1598,7 @@ final class ApiController extends Controller
$permission->setUnit(empty($request->getData('permissionunit')) ? null : (int) $request->getData('permissionunit')); $permission->setUnit(empty($request->getData('permissionunit')) ? null : (int) $request->getData('permissionunit'));
$permission->setApp(empty($request->getData('permissionapp')) ? null : (string) $request->getData('permissionapp')); $permission->setApp(empty($request->getData('permissionapp')) ? null : (string) $request->getData('permissionapp'));
$permission->setModule(empty($request->getData('permissionmodule')) ? null : (string) $request->getData('permissionmodule')); $permission->setModule(empty($request->getData('permissionmodule')) ? null : (string) $request->getData('permissionmodule'));
$permission->setType(empty($request->getData('permissiontype')) ? null : (int) $request->getData('permissiontype')); $permission->setCategory(empty($request->getData('permissiontype')) ? null : (int) $request->getData('permissiontype'));
$permission->setElement(empty($request->getData('permissionelement')) ? null : (int) $request->getData('permissionelement')); $permission->setElement(empty($request->getData('permissionelement')) ? null : (int) $request->getData('permissionelement'));
$permission->setComponent(empty($request->getData('permissioncomponent')) ? null : (int) $request->getData('permissioncomponent')); $permission->setComponent(empty($request->getData('permissioncomponent')) ? null : (int) $request->getData('permissioncomponent'));
$permission->setPermission( $permission->setPermission(
@ -1683,7 +1684,7 @@ final class ApiController extends Controller
$permission->setUnit(empty($request->getData('permissionunit')) ? $permission->getUnit() : (int) $request->getData('permissionunit')); $permission->setUnit(empty($request->getData('permissionunit')) ? $permission->getUnit() : (int) $request->getData('permissionunit'));
$permission->setApp(empty($request->getData('permissionapp')) ? $permission->getApp() : (string) $request->getData('permissionapp')); $permission->setApp(empty($request->getData('permissionapp')) ? $permission->getApp() : (string) $request->getData('permissionapp'));
$permission->setModule(empty($request->getData('permissionmodule')) ? $permission->getModule() : (string) $request->getData('permissionmodule')); $permission->setModule(empty($request->getData('permissionmodule')) ? $permission->getModule() : (string) $request->getData('permissionmodule'));
$permission->setType(empty($request->getData('permissiontype')) ? $permission->getType() : (int) $request->getData('permissiontype')); $permission->setCategory(empty($request->getData('permissiontype')) ? $permission->getCategory() : (int) $request->getData('permissiontype'));
$permission->setElement(empty($request->getData('permissionelement')) ? $permission->getElement() : (int) $request->getData('permissionelement')); $permission->setElement(empty($request->getData('permissionelement')) ? $permission->getElement() : (int) $request->getData('permissionelement'));
$permission->setComponent(empty($request->getData('permissioncomponent')) ? $permission->getComponent() : (int) $request->getData('permissioncomponent')); $permission->setComponent(empty($request->getData('permissioncomponent')) ? $permission->getComponent() : (int) $request->getData('permissioncomponent'));
$permission->setPermission((int) ($request->getData('permissioncreate') ?? 0) $permission->setPermission((int) ($request->getData('permissioncreate') ?? 0)

2
Models/AccountMapper.php
View File

@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Query\Builder;
* @link https://karaka.app * @link https://karaka.app
* @since 1.0.0 * @since 1.0.0
*/ */
final class AccountMapper extends DataMapperFactory class AccountMapper extends DataMapperFactory
{ {
/** /**
* Columns. * Columns.