From 220787a48ff97f1cc125b34ad19716f4edfe71d4 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Thu, 30 Sep 2021 18:10:46 +0200
Subject: [PATCH 1/2] Revert "Use custom model in controller (#892)"

This reverts commit aba641d4dd2488fc44ff98e403a5754ac1bea182.
---
 .../Controllers/TeamInvitationController.php   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Http/Controllers/TeamInvitationController.php b/src/Http/Controllers/TeamInvitationController.php
index 2331be071..2bfcb09d1 100644
--- a/src/Http/Controllers/TeamInvitationController.php
+++ b/src/Http/Controllers/TeamInvitationController.php
@@ -7,7 +7,7 @@
 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
 {
@@ -15,15 +15,11 @@ 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,
@@ -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;
         }

From 2708f1fd249c88341f7f8e2fc5ac17c35280dec8 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Thu, 30 Sep 2021 18:12:47 +0200
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afee2dabe..451cda38e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/jetstream/compare/v2.4.1...2.x)
+## [Unreleased](https://github.com/laravel/jetstream/compare/v2.4.2...2.x)
+
+
+## [v2.4.2 (2021-09-30)](https://github.com/laravel/jetstream/compare/v2.4.1...v2.4.2)
+
+### Fixed
+- Revert "Use custom TeamInvitation model in TeamInvitationController" ([#895](https://github.com/laravel/jetstream/pull/895))
 
 
 ## [v2.4.1 (2021-09-28)](https://github.com/laravel/jetstream/compare/v2.4.0...v2.4.1)