Skip to content

Commit ef3382d

Browse files
committedOct 23, 2020
allow redirect responses to be returned
1 parent 6449631 commit ef3382d

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed
 

‎src/Http/Controllers/Inertia/TeamController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function store(Request $request)
6969

7070
$creator->create($request->user(), $request->all());
7171

72-
return redirect($this->redirectPath($creator));
72+
return $this->redirectPath($creator);
7373
}
7474

7575
/**
@@ -105,6 +105,6 @@ public function destroy(Request $request, $teamId)
105105

106106
$deleter->delete($team);
107107

108-
return redirect($this->redirectPath($deleter));
108+
return $this->redirectPath($deleter);
109109
}
110110
}

‎src/Http/Livewire/CreateTeamForm.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function createTeam(CreatesTeams $creator)
3030

3131
$creator->create(Auth::user(), $this->state);
3232

33-
return redirect($this->redirectPath($creator));
33+
return $this->redirectPath($creator);
3434
}
3535

3636
/**

‎src/Http/Livewire/DeleteTeamForm.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function deleteTeam(ValidateTeamDeletion $validator, DeletesTeams $delete
4747

4848
$deleter->delete($this->team);
4949

50-
return redirect($this->redirectPath($deleter));
50+
return $this->redirectPath($deleter);
5151
}
5252

5353
/**

‎src/RedirectsActions.php

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,26 @@
22

33
namespace Laravel\Jetstream;
44

5+
use Illuminate\Http\RedirectResponse;
6+
57
trait RedirectsActions
68
{
79
/**
8-
* Get the redirect path for the action.
10+
* Get the redirect response for the given action.
911
*
10-
* @param $action
11-
* @return string
12+
* @param mixed $action
13+
* @return \Illuminate\Http\RedirectResponse
1214
*/
1315
public function redirectPath($action)
1416
{
1517
if (method_exists($action, 'redirectTo')) {
16-
return $action->redirectTo();
18+
$response = $action->redirectTo();
19+
} else {
20+
$response = property_exists($action, 'redirectTo')
21+
? $action->redirectTo
22+
: config('fortify.home');
1723
}
1824

19-
return property_exists($action, 'redirectTo') ? $action->redirectTo : config('fortify.home');
25+
return $response instanceof RedirectResponse ? $response : redirect($response);
2026
}
2127
}

0 commit comments

Comments
 (0)