Skip to content

Commit 9e1db16

Browse files
committed
Update tenant switch route to check and use redirect params if set in request
1 parent b898364 commit 9e1db16

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/Http/Controllers/TenantSwitchController.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55
use Illuminate\Http\Request;
66
use Illuminate\Routing\Controller;
7-
use Miracuthbert\Multitenancy\TenantStore;
7+
use Illuminate\Support\Arr;
88

99
class TenantSwitchController extends Controller
1010
{
1111
/**
1212
* Handle the incoming request.
1313
*
14-
* @param \Illuminate\Http\Request $request
15-
* @param mixed $tenant
14+
* @param mixed $tenant
1615
* @return \Illuminate\Http\Response
1716
*/
1817
public function __invoke(Request $request, $tenant)
@@ -27,8 +26,8 @@ public function __invoke(Request $request, $tenant)
2726
$key = tenancy()->config()->getOption('routes.subdomain_key', 'domain');
2827

2928
return redirect()->route(
30-
config('tenancy.redirect.route'),
31-
$tenant->{$key}
29+
$request->redirect_to ?? config('tenancy.redirect.route'),
30+
array_merge([$tenant->{$key}], Arr::wrap($request->redirect_params))
3231
);
3332
}
3433

0 commit comments

Comments
 (0)