Skip to content

Extract should redirect logic to method on base middleware #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extract should redirect logic to method on base middleware #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationMiddlewareBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,16 @@ protected function shouldIgnore($request)

return false;
}

protected function shouldRedirectToLocalizedUrl($locale): bool
{
return app('laravellocalization')->checkLocaleInSupportedLocales($locale) &&
! app('laravellocalization')->isHiddenDefault($locale);
}

protected function shouldRedirectToNonLocalizedUrl($locale): bool
{
return app('laravellocalization')->checkLocaleInSupportedLocales($locale) &&
app('laravellocalization')->isHiddenDefault($locale);
}
}
12 changes: 5 additions & 7 deletions src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationRedirectFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@ public function handle($request, Closure $next)
if (\count($params) > 0) {
$locale = $params[0];

if (app('laravellocalization')->checkLocaleInSupportedLocales($locale)) {
if (app('laravellocalization')->isHiddenDefault($locale)) {
$redirection = app('laravellocalization')->getNonLocalizedURL();
if ($this->shouldRedirectToNonLocalizedUrl($locale)) {
$redirection = app('laravellocalization')->getNonLocalizedURL();

// Save any flashed data for redirect
app('session')->reflash();
// Save any flashed data for redirect
app('session')->reflash();

return new RedirectResponse($redirection, 302, ['Vary' => 'Accept-Language']);
}
return new RedirectResponse($redirection, 302, ['Vary' => 'Accept-Language']);
}
}

Expand Down
6 changes: 1 addition & 5 deletions src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ public function handle($request, Closure $next)
$locale = app('laravellocalization')->getCurrentLocale();
}

if (
$locale &&
app('laravellocalization')->checkLocaleInSupportedLocales($locale) &&
!(app('laravellocalization')->isHiddenDefault($locale))
) {
if ($this->shouldRedirectToLocalizedUrl($locale)) {
$redirection = app('laravellocalization')->getLocalizedURL($locale);
$redirectResponse = new RedirectResponse($redirection, 302, ['Vary' => 'Accept-Language']);

Expand Down
6 changes: 1 addition & 5 deletions src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ public function handle($request, Closure $next)
$locale = app('laravellocalization')->getCurrentLocale();
}

if (
$locale &&
app('laravellocalization')->checkLocaleInSupportedLocales($locale) &&
!(app('laravellocalization')->isHiddenDefault($locale))
) {
if ($this->shouldRedirectToLocalizedUrl($locale)) {
app('session')->reflash();
$redirection = app('laravellocalization')->getLocalizedURL($locale);

Expand Down