AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Allow approving/denying organisations without tokens (admin override)

Browse Source
This commit is contained in:
Craig Williams
2022-03-02 15:35:39 +00:00
parent 868cd1a9ae
commit f210f4d101
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Controller/OrganisationRegistrationController.php
View File

@@ -262,6 +262,9 @@ class OrganisationRegistrationController extends SimpleController
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts; $ms = $this->ci->alerts;
/** @var \UserFrosting\Sprinkle\Organisations\Repository\OrganisationApprovalRepository */
$tokenRepo = $this->ci->repoOrganisationApproval;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'approve_organisation')) { if (!$authorizer->checkAccess($currentUser, 'approve_organisation')) {
@@ -276,15 +279,14 @@ class OrganisationRegistrationController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
$approval = $this->ci->repoOrganisationApproval->exists($organisation); // If a token can't be found, create one
if (!$approval) { if (!$tokenRepo->exists($organisation)) {
$ms->addMessageTranslated('danger', 'ORGANISATION.REGISTRATION.TOKEN_NOT_FOUND'); $tokenRepo->create($organisation, 1);
return $response->withJson([], 400);
} }
// Begin transaction - DB will be rolled back if an exception occurs // Begin transaction - DB will be rolled back if an exception occurs
Capsule::transaction(function () use ($organisation, $currentUser) { Capsule::transaction(function () use ($organisation, $currentUser, $tokenRepo) {
$this->ci->repoOrganisationApproval->completeForOwner($organisation, [ $tokenRepo->completeForOwner($organisation, [
'approver_id' => $currentUser->id, 'approver_id' => $currentUser->id,
'approved' => true 'approved' => true
]); ]);
@@ -426,6 +428,9 @@ class OrganisationRegistrationController extends SimpleController
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts; $ms = $this->ci->alerts;
/** @var \UserFrosting\Sprinkle\Organisations\Repository\OrganisationApprovalRepository */
$tokenRepo = $this->ci->repoOrganisationApproval;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'approve_organisation')) { if (!$authorizer->checkAccess($currentUser, 'approve_organisation')) {
@@ -440,15 +445,14 @@ class OrganisationRegistrationController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
$approval = $this->ci->repoOrganisationApproval->exists($organisation); // If a token can't be found, create one
if (!$approval) { if (!$tokenRepo->exists($organisation)) {
$ms->addMessageTranslated('danger', 'ORGANISATION.REGISTRATION.TOKEN_NOT_FOUND'); $tokenRepo->create($organisation, 1);
return $response->withJson([], 400);
} }
// Begin transaction - DB will be rolled back if an exception occurs // Begin transaction - DB will be rolled back if an exception occurs
Capsule::transaction(function () use ($organisation, $currentUser) { Capsule::transaction(function () use ($organisation, $currentUser, $tokenRepo) {
$this->ci->repoOrganisationApproval->completeForOwner($organisation, [ $tokenRepo->completeForOwner($organisation, [
'approver_id' => $currentUser->id, 'approver_id' => $currentUser->id,
'approved' => false 'approved' => false
]); ]);