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

Refactored the organisation members controller - includes a permissions fix

Browse Source
This commit is contained in:
Craig Williams
2022-02-15 17:43:24 +00:00
parent 800ac93ecf
commit 2dbd11ef28
1 changed files with 133 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
src/Controller/OrganisationMembersController.php
View File

@@ -52,26 +52,33 @@ class OrganisationMembersController extends SimpleController
*/ */
public function join(Request $request, Response $response, $args) public function join(Request $request, Response $response, $args)
{ {
$organisation = $this->getOrganisationFromParams($args);
// If the organisation doesn't exist, return 404
if (!$organisation) {
throw new NotFoundException();
}
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer; $authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @var \UserFrosting\Support\Repository\Repository $config */
$config = $this->ci->config;
/** @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;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'join_organisation')) { if (!$authorizer->checkAccess($currentUser, 'join_organisation')) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ $organisation = $this->getOrganisationFromParams($args);
$ms = $this->ci->alerts;
// If the organisation doesn't exist, return 404
if (!$organisation) {
throw new NotFoundException();
}
// Check if the user is a member of the organisation, pending or no relation at all // Check if the user is a member of the organisation, pending or no relation at all
$memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first(); $memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
@@ -88,15 +95,9 @@ class OrganisationMembersController extends SimpleController
return $response->withJson([], 400); return $response->withJson([], 400);
} }
/** @var \UserFrosting\Support\Repository\Repository $config */
$config = $this->ci->config;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
// All checks passed! log events/activities and create organisation // All checks passed! log events/activities and create organisation
// 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 ($classMapper, $ms, $organisation, $currentUser, $config) { Capsule::transaction(function () use ($organisation, $currentUser, $classMapper, $config) {
$organisation->members()->attach($currentUser->id, [ $organisation->members()->attach($currentUser->id, [
'flag_admin' => false, 'flag_admin' => false,
'flag_approved' => !$config['organisation']['membership']['require_approval'], 'flag_approved' => !$config['organisation']['membership']['require_approval'],
@@ -123,23 +124,25 @@ class OrganisationMembersController extends SimpleController
$approval = $this->ci->repoOrganisationMembershipApproval->create($tokenOwner, $timeout); $approval = $this->ci->repoOrganisationMembershipApproval->create($tokenOwner, $timeout);
$this->sendApprovalEmail($currentUser, $organisation, $approval->getToken()); $this->sendApprovalEmail($currentUser, $organisation, $approval->getToken());
$ms->addMessageTranslated('success', 'ORGANISATION.JOIN_REQUEST.SUBMIT_SUCCESSFUL', [
'name' => $organisation->name
]);
} else { } else {
$this->ci->userActivityLogger->info("User {$currentUser->user_name} has joined organisation {$organisation->name}.", [ $this->ci->userActivityLogger->info("User {$currentUser->user_name} has joined organisation {$organisation->name}.", [
'type' => 'organisation_join', 'type' => 'organisation_join',
'user_id' => $currentUser->id, 'user_id' => $currentUser->id,
]); ]);
$ms->addMessageTranslated('success', 'ORGANISATION.JOIN_SUCCESSFUL', [
'name' => $organisation->name
]);
} }
}); });
if ($config['organisation']['membership']['require_approval']) {
$ms->addMessageTranslated('success', 'ORGANISATION.JOIN_REQUEST.SUBMIT_SUCCESSFUL', [
'name' => $organisation->name
]);
} else {
$ms->addMessageTranslated('success', 'ORGANISATION.JOIN_SUCCESSFUL', [
'name' => $organisation->name
]);
}
return $response->withJson([], 200); return $response->withJson([], 200);
} }
@@ -163,13 +166,6 @@ class OrganisationMembersController extends SimpleController
*/ */
public function cancel(Request $request, Response $response, $args) public function cancel(Request $request, Response $response, $args)
{ {
$organisation = $this->getOrganisationFromParams($args);
// If the organisation doesn't exist, return 404
if (!$organisation) {
throw new NotFoundException();
}
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer; $authorizer = $this->ci->authorizer;
@@ -185,6 +181,13 @@ class OrganisationMembersController extends SimpleController
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts; $ms = $this->ci->alerts;
$organisation = $this->getOrganisationFromParams($args);
// If the organisation doesn't exist, return 404
if (!$organisation) {
throw new NotFoundException();
}
// Check if the user is a member of the organisation, pending or no relation at all // Check if the user is a member of the organisation, pending or no relation at all
$memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first(); $memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
if ($memberCheck) { if ($memberCheck) {
@@ -202,7 +205,7 @@ class OrganisationMembersController extends SimpleController
} }
// 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, $classMapper, $config) {
$organisation->members()->detach($currentUser->id); $organisation->members()->detach($currentUser->id);
if ($config['organisation']['membership']['require_approval']) { if ($config['organisation']['membership']['require_approval']) {
@@ -250,6 +253,16 @@ class OrganisationMembersController extends SimpleController
*/ */
public function leave(Request $request, Response $response, $args) public function leave(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
$organisation = $this->getOrganisationFromParams($args); $organisation = $this->getOrganisationFromParams($args);
// If the organisation doesn't exist, return 404 // If the organisation doesn't exist, return 404
@@ -257,12 +270,6 @@ class OrganisationMembersController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'leave_organisation', [ if (!$authorizer->checkAccess($currentUser, 'leave_organisation', [
'organisation' => $organisation, 'organisation' => $organisation,
@@ -270,12 +277,6 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Support\Repository\Repository $config */
$config = $this->ci->config;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
// Check if the user is a member of the organisation, pending or no relation at all // Check if the user is a member of the organisation, pending or no relation at all
$memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first(); $memberCheck = $organisation->members()->where('user_id', $currentUser->id)->withPivot('flag_approved')->first();
if (!$memberCheck || !$memberCheck->pivot->flag_approved) { if (!$memberCheck || !$memberCheck->pivot->flag_approved) {
@@ -296,9 +297,6 @@ class OrganisationMembersController extends SimpleController
]); ]);
}); });
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
$ms->addMessageTranslated('success', 'ORGANISATION.LEAVE_SUCCESSFUL', [ $ms->addMessageTranslated('success', 'ORGANISATION.LEAVE_SUCCESSFUL', [
'name' => $organisationName, 'name' => $organisationName,
]); ]);
@@ -328,6 +326,16 @@ class OrganisationMembersController extends SimpleController
*/ */
public function accept(Request $request, Response $response, $args) public function accept(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Fetch the organisation from the params // Fetch the organisation from the params
$organisation = $this->getOrganisationFromParams($args); $organisation = $this->getOrganisationFromParams($args);
@@ -339,8 +347,12 @@ class OrganisationMembersController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ // Access-controlled page
$classMapper = $this->ci->classMapper; if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [
'organisation' => $organisation
])) {
throw new ForbiddenException();
}
// Find the mapping // Find the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query() $tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
@@ -381,13 +393,16 @@ class OrganisationMembersController extends SimpleController
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer; $authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @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;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts; $ms = $this->ci->alerts;
// GET parameters // GET parameters
$params = $request->getQueryParams(); $params = $request->getQueryParams();
@@ -407,12 +422,16 @@ class OrganisationMembersController extends SimpleController
// Find the token owner if valid // Find the token owner if valid
$owner_id = $this->ci->repoOrganisationMembershipApproval->findOwner($data['token']); $owner_id = $this->ci->repoOrganisationMembershipApproval->findOwner($data['token']);
if (!$owner_id) { // Fetch the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
->where('map_id', $owner_id)
->first();
if (!$tokenOwner) {
$ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND');
return $response->withRedirect($this->ci->router->pathFor('uri_organisations')); return $response->withRedirect($this->ci->router->pathFor('uri_organisations'));
} }
$organisation = $classMapper->getClassMapping('organisation')::findUnique($owner_id, 'id', false); $organisation = $tokenOwner->organisation()->first();
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [ if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [
@@ -421,19 +440,8 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
// Fetch the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
->where('map_id', $owner_id)
->first();
// Process the acceptance emails etc // Process the acceptance emails etc
if (!$this->processAcceptToken($tokenOwner)) { $this->processAcceptToken($tokenOwner);
return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
}
// Forward to organisation page // Forward to organisation page
return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug])); return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
@@ -460,6 +468,16 @@ class OrganisationMembersController extends SimpleController
*/ */
public function reject(Request $request, Response $response, $args) public function reject(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Fetch the organisation from the params // Fetch the organisation from the params
$organisation = $this->getOrganisationFromParams($args); $organisation = $this->getOrganisationFromParams($args);
@@ -471,8 +489,12 @@ class OrganisationMembersController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ // Access-controlled page
$classMapper = $this->ci->classMapper; if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [
'organisation' => $organisation
])) {
throw new ForbiddenException();
}
// Find the mapping // Find the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query() $tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
@@ -513,13 +535,16 @@ class OrganisationMembersController extends SimpleController
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer; $authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @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;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */ /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts; $ms = $this->ci->alerts;
// GET parameters // GET parameters
$params = $request->getQueryParams(); $params = $request->getQueryParams();
@@ -539,12 +564,16 @@ class OrganisationMembersController extends SimpleController
// Find the token owner if valid // Find the token owner if valid
$owner_id = $this->ci->repoOrganisationMembershipApproval->findOwner($data['token']); $owner_id = $this->ci->repoOrganisationMembershipApproval->findOwner($data['token']);
// Fetch the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
->where('map_id', $owner_id)
->first();
if (!$owner_id) { if (!$owner_id) {
$ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND'); $ms->addMessageTranslated('danger', 'ORGANISATION.JOIN_REQUEST.TOKEN_NOT_FOUND');
return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug])); return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
} }
$organisation = $classMapper->getClassMapping('organisation')::findUnique($owner_id, 'id', false); $organisation = $tokenOwner->organisation()->first();
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [ if (!$authorizer->checkAccess($currentUser, 'approve_organisation_membership', [
@@ -553,20 +582,8 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
// Fetch the mapping
$tokenOwner = $classMapper->getClassMapping('organisation_member')::query()
->where('map_id', $owner_id)
->first();
// Process the rejectance emails etc // Process the rejectance emails etc
if (!$this->processRejectToken($tokenOwner)) { $this->processRejectToken($tokenOwner);
return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
}
// Forward to organisation page // Forward to organisation page
return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug])); return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
@@ -589,6 +606,16 @@ class OrganisationMembersController extends SimpleController
*/ */
public function getList(Request $request, Response $response, $args) public function getList(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
$organisation = $this->getOrganisationFromParams($args); $organisation = $this->getOrganisationFromParams($args);
// If the organisation no longer exists, forward to main organisation listing page // If the organisation no longer exists, forward to main organisation listing page
@@ -599,12 +626,6 @@ class OrganisationMembersController extends SimpleController
// GET parameters // GET parameters
$params = $request->getQueryParams(); $params = $request->getQueryParams();
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'view_organisation_field', [ if (!$authorizer->checkAccess($currentUser, 'view_organisation_field', [
'organisation' => $organisation, 'organisation' => $organisation,
@@ -613,9 +634,6 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
$sprunje = $classMapper->createInstance('user_sprunje', $classMapper, $params); $sprunje = $classMapper->createInstance('user_sprunje', $classMapper, $params);
$sprunje->extendQuery(function ($query) use ($classMapper, $organisation) { $sprunje->extendQuery(function ($query) use ($classMapper, $organisation) {
return $query->where('organisation_id', $organisation->id); return $query->where('organisation_id', $organisation->id);
@@ -639,6 +657,16 @@ class OrganisationMembersController extends SimpleController
*/ */
public function getModalConfirmLeave(Request $request, Response $response, $args) public function getModalConfirmLeave(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
$organisation = $this->getOrganisationFromParams($args); $organisation = $this->getOrganisationFromParams($args);
// If the organisation no longer exists, forward to main organisation listing page // If the organisation no longer exists, forward to main organisation listing page
@@ -646,12 +674,6 @@ class OrganisationMembersController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'leave_organisation', [ if (!$authorizer->checkAccess($currentUser, 'leave_organisation', [
'organisation' => $organisation, 'organisation' => $organisation,
@@ -659,9 +681,6 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
return $this->ci->view->render($response, 'modals/confirm-leave-organisation.html.twig', [ return $this->ci->view->render($response, 'modals/confirm-leave-organisation.html.twig', [
'organisation' => $organisation, 'organisation' => $organisation,
'form' => [ 'form' => [
@@ -683,6 +702,13 @@ class OrganisationMembersController extends SimpleController
*/ */
public function getModalConfirmCancel(Request $request, Response $response, $args) public function getModalConfirmCancel(Request $request, Response $response, $args)
{ {
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// GET parameters // GET parameters
$params = $request->getQueryParams(); $params = $request->getQueryParams();
@@ -693,12 +719,6 @@ class OrganisationMembersController extends SimpleController
throw new NotFoundException(); throw new NotFoundException();
} }
/** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
$authorizer = $this->ci->authorizer;
/** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
$currentUser = $this->ci->currentUser;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'join_organisation', [ if (!$authorizer->checkAccess($currentUser, 'join_organisation', [
'organisation' => $organisation, 'organisation' => $organisation,
@@ -706,9 +726,6 @@ class OrganisationMembersController extends SimpleController
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
return $this->ci->view->render($response, 'modals/confirm-cancel-organisation-join.html.twig', [ return $this->ci->view->render($response, 'modals/confirm-cancel-organisation-join.html.twig', [
'organisation' => $organisation, 'organisation' => $organisation,
'form' => [ 'form' => [
@@ -809,16 +826,16 @@ class OrganisationMembersController extends SimpleController
/** @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;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'accept_organisation_membership')) { if (!$authorizer->checkAccess($currentUser, 'accept_organisation_membership')) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
// 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) {
@@ -826,9 +843,6 @@ class OrganisationMembersController extends SimpleController
return false; return false;
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
$organisation = $tokenOwner->organisation()->first(); $organisation = $tokenOwner->organisation()->first();
$requester = $tokenOwner->user()->first(); $requester = $tokenOwner->user()->first();
@@ -855,15 +869,15 @@ class OrganisationMembersController extends SimpleController
/** @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;
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
// Access-controlled page // Access-controlled page
if (!$authorizer->checkAccess($currentUser, 'accept_organisation_membership')) { if (!$authorizer->checkAccess($currentUser, 'accept_organisation_membership')) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
/** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
$ms = $this->ci->alerts;
// 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) {
@@ -871,9 +885,6 @@ class OrganisationMembersController extends SimpleController
return false; return false;
} }
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = $this->ci->classMapper;
$organisation = $tokenOwner->organisation()->first(); $organisation = $tokenOwner->organisation()->first();
$requester = $tokenOwner->user()->first(); $requester = $tokenOwner->user()->first();