Skip to content

Commit

Permalink
Merge pull request #895 from laravel/revert-892-patch-team-invitation…
Browse files Browse the repository at this point in the history
…-model

Revert "Use custom TeamInvitation model in TeamInvitationController"
  • Loading branch information
driesvints authored Sep 30, 2021
2 parents bfa1337 + 220787a commit a5f4ec0
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions src/Http/Controllers/TeamInvitationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,19 @@
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Gate;
use Laravel\Jetstream\Contracts\AddsTeamMembers;
use Laravel\Jetstream\Jetstream;
use Laravel\Jetstream\TeamInvitation;

class TeamInvitationController extends Controller
{
/**
* Accept a team invitation.
*
* @param \Illuminate\Http\Request $request
* @param int $invitationId
* @param \Laravel\Jetstream\TeamInvitation $invitation
* @return \Illuminate\Http\RedirectResponse
*/
public function accept(Request $request, $invitationId)
public function accept(Request $request, TeamInvitation $invitation)
{
$model = Jetstream::teamInvitationModel();

$invitation = $model::whereKey($invitationId)->firstOrFail();

app(AddsTeamMembers::class)->add(
$invitation->team->owner,
$invitation->team,
Expand All @@ -42,15 +38,11 @@ public function accept(Request $request, $invitationId)
* Cancel the given team invitation.
*
* @param \Illuminate\Http\Request $request
* @param int $invitationId
* @param \Laravel\Jetstream\TeamInvitation $invitation
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(Request $request, $invitationId)
public function destroy(Request $request, TeamInvitation $invitation)
{
$model = Jetstream::teamInvitationModel();

$invitation = $model::whereKey($invitationId)->firstOrFail();

if (! Gate::forUser($request->user())->check('removeTeamMember', $invitation->team)) {
throw new AuthorizationException;
}
Expand Down

0 comments on commit a5f4ec0

Please sign in to comment.