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

Allow manual override of accept/reject when there are no valid tokens (check to make sure this doesn't cause issues elsewhere...)

Browse Source
This commit is contained in:
Craig Williams
2022-02-28 11:15:02 +00:00
parent 0aeebffdc7
commit 1c4a71410d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controller/OrganisationMembersController.php
View File

@@ -444,7 +444,7 @@ class OrganisationMembersController extends SimpleController
->first(); ->first();
// Process the acceptance emails etc // Process the acceptance emails etc
if (!$this->processAcceptToken($tokenOwner)) { if (!$this->processAcceptToken($tokenOwner, true)) {
return $response->withJson([], 400); return $response->withJson([], 400);
} }
@@ -586,7 +586,7 @@ class OrganisationMembersController extends SimpleController
->first(); ->first();
// Process the acceptance emails etc // Process the acceptance emails etc
if (!$this->processRejectToken($tokenOwner)) { if (!$this->processRejectToken($tokenOwner, true)) {
return $response->withJson([], 400); return $response->withJson([], 400);
} }
@@ -1049,7 +1049,7 @@ class OrganisationMembersController extends SimpleController
} }
protected function processAcceptToken($tokenOwner) protected function processAcceptToken($tokenOwner, $manual = false)
{ {
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */ /** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser; $currentUser = $this->ci->currentUser;
@@ -1060,7 +1060,7 @@ class OrganisationMembersController extends SimpleController
// Try and complete the token, bail if not found // Try and complete the token, bail if not found
$verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => true, 'approver_id' => $currentUser->id]); $verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => true, 'approver_id' => $currentUser->id]);
if (!$verification) { if (!$verification && !$manual) {
$ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND');
return false; return false;
} }
@@ -1083,7 +1083,7 @@ class OrganisationMembersController extends SimpleController
return true; return true;
} }
protected function processRejectToken($tokenOwner) protected function processRejectToken($tokenOwner, $manual = false)
{ {
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */ /** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser; $currentUser = $this->ci->currentUser;
@@ -1094,7 +1094,7 @@ class OrganisationMembersController extends SimpleController
// Try and complete the token, bail if not found // Try and complete the token, bail if not found
$verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => false, 'approver_id' => $currentUser->id]); $verification = $this->ci->repoOrganisationMembershipApproval->completeForOwner($tokenOwner, ['approved' => false, 'approver_id' => $currentUser->id]);
if (!$verification) { if (!$verification && !$manual) {
$ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND');
return false; return false;
} }