Merge pull request #23 from erguenyogurtcu/patch-3

Transfering the GET/POST parameters during redirection
urbantrout · Jan 26, 2022 · dab4191 · dab4191
2 parents f3599e6 + 2e4497d
commit dab4191
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/Classes/Middleware/RedirectionMiddleware.php b/Classes/Middleware/RedirectionMiddleware.php
@@ -180,13 +180,18 @@ function ($language) use ($siteLanguages, $siteLanguagesFallbacks) {
             return null;
         }
 
+        /** @var array $parameters Array in the form of: ['utm_source' => 'google', 'utm_medium' => 'social'] */
+        $parameters = $request->getQueryParams();
+
+        $parameters['_language'] = $matchingSiteLanguage;
+
         $uri = $site->getRouter()->generateUri(
             $pageArguments->getPageId(),
-            ['_language' => $matchingSiteLanguage]
+            $parameters
         );
 
         /** @var RedirectResponse $response */
-        $response = new RedirectResponse($uri, 302);
+        $response = new RedirectResponse($uri, 307);
         return $response->withAddedHeader('Set-Cookie', $cookieName . '=' . $matchingSiteLanguage->getLanguageId() . '; Path=/; Max-Age=' . (time()+60*60*24*30));
     }
 
@@ -254,13 +259,18 @@ function ($siteLanguage) use ($geocodedIsoCode) {
                 return null;
             }
 
+            /** @var array $parameters Array in the form of: ['utm_source' => 'google', 'utm_medium' => 'social'] */
+            $parameters = $request->getQueryParams();
+
+            $parameters['_language'] = $matchingSiteLanguage;
+
             $uri = $site->getRouter()->generateUri(
                 $pageArguments->getPageId(),
-                ['_language' => $matchingSiteLanguage]
+                $parameters
             );
 
             /** @var RedirectResponse $response */
-            $response = new RedirectResponse($uri, 302);
+            $response = new RedirectResponse($uri, 307);
             return $response->withAddedHeader('Set-Cookie', $cookieName . '=' . $matchingSiteLanguage->getLanguageId() . '; Path=/; Max-Age=' . (time()+60*60*24*30));
         } catch (\Throwable $e) {
             // IP address is not in database. Do not redirect.
@@ -342,11 +352,16 @@ protected function getRedirectResponseIfCookieIsSet(ServerRequestInterface $requ
                 $preferredSiteLanguage = $site->getLanguageById($languageId);
 
                 if ($preferredSiteLanguage !== $requestLanguage) {
+                    /** @var array $parameters Array in the form of: ['utm_source' => 'google', 'utm_medium' => 'social'] */
+                    $parameters = $request->getQueryParams();
+
+                    $parameters['_language'] = $preferredSiteLanguage;
+
                     $uri = $site->getRouter()->generateUri(
                         $pageArguments->getPageId(),
-                        ['_language' => $preferredSiteLanguage]
+                        $parameters
                     );
-                    return new RedirectResponse($uri, 302);
+                    return new RedirectResponse($uri, 307);
                 }
             }
         }