Merge pull request #11 from tattali/redirection

Fix redirection of local url

Author: tattali

.github/workflows/main.yml

@@ -81,7 +81,7 @@ jobs:
         run: vendor/bin/phpstan analyse
 
       - name: Unit and Feature tests via PHPUnit
-        run: vendor/bin/phpunit
+        run: php vendor/bin/phpunit
 
       - name: Upload coverage file
         uses: actions/upload-artifact@v3

README.md

@@ -23,11 +23,10 @@ Documentation
 -------------
 
 ### Installation
-For Symfony legacy versions the documentation is [here](src/Resources/doc/legacy-versions.md)
 ```sh
 composer require tattali/mobile-detect-bundle
 ```
-
+*Install with Symfony legacy versions: [here](src/Resources/doc/legacy-versions.md)*
 ### Usage
 
 #### Checking device
@@ -43,6 +42,7 @@ public function someaction(MobileDetectorInterface $mobileDetector)
 }
 ```
 
+With Twig
 ```twig
 {% if is_mobile() %}
 {% if is_tablet() %}
@@ -63,6 +63,7 @@ Or using the Symfony toolbar
 #### Going further
 
 - [Symfony legacy versions](src/Resources/doc/legacy-versions.md)
+- [Redirection](src/Resources/doc/redirection.md)
 - [Full reference](src/Resources/doc/reference.md)
 
 Contribute and feedback

composer.json

@@ -3,12 +3,14 @@
     "description": "Symfony5/6 bundle for detect mobile devices, managing mobile view types, redirect to mobile version.",
     "keywords": [
         "mobile detect",
-        "mobile redirect",
+        "device detect",
+        "device detector",
         "mobile view managing",
-        "mobile",
         "mobiledetect",
         "mobiledetectbundle",
-        "symfony mobile"
+        "symfony mobile detect",
+        "symfony mobiledetect",
+        "symfony"
     ],
     "homepage": "https://github.com/tattali/MobileDetectBundle",
     "type": "symfony-bundle",

src/DataCollector/DeviceDataCollector.php

@@ -114,15 +114,9 @@ public function reset(): void
 
     protected function canUseView(string $view, ?string $host): bool
     {
-        if (!\is_array($this->redirectConfig)) {
-            return true;
-        }
-
-        if (!isset($this->redirectConfig[$view])) {
-            return true;
-        }
-
-        if (!isset($this->redirectConfig[$view]['is_enabled'])
+        if (!\is_array($this->redirectConfig)
+            || !isset($this->redirectConfig[$view])
+            || !isset($this->redirectConfig[$view]['is_enabled'])
             || false === $this->redirectConfig[$view]['is_enabled']
         ) {
             return true;
@@ -156,7 +150,7 @@ private function generateSwitchLink(
         $requestSwitchView->server->set(
             'QUERY_STRING',
             Request::normalizeQueryString(
-                http_build_query($requestSwitchView->query->all(), '', '&')
+                http_build_query($requestSwitchView->query->all())
             )
         );
 

src/DependencyInjection/Configuration.php

@@ -74,9 +74,6 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->booleanNode('save_referer_path')->defaultTrue()->end()
             ->end()
             ->end()
-            ->arrayNode('service')
-            ->addDefaultsIfNotSet()
-            ->end()
             ->scalarNode('cookie_key')->defaultValue(DeviceView::COOKIE_KEY_DEFAULT)->cannotBeEmpty()->end()
             ->scalarNode('cookie_path')->defaultValue(DeviceView::COOKIE_PATH_DEFAULT)->cannotBeEmpty()->end()
             ->scalarNode('cookie_domain')->defaultValue(DeviceView::COOKIE_DOMAIN_DEFAULT)->cannotBeEmpty()->end()

src/DependencyInjection/MobileDetectExtension.php

@@ -58,10 +58,8 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('mobile_detect.switch_param', $config['switch_param']);
     }
 
-    protected function validHost(string $url): bool
+    protected function validHost(?string $url): bool
     {
-        $pattern = '/^(?:(http|https):\\/\\/)([A-Z0-9][A-Z0-9_-]*(?:\\.[A-Z0-9][A-Z0-9_-]*)+):?(\\d+)?\\/?/i';
-
-        return (bool) preg_match($pattern, $url);
+        return (bool) filter_var($url, \FILTER_VALIDATE_URL);
     }
 }

src/EventListener/RequestResponseListener.php

@@ -178,7 +178,7 @@ protected function getRedirectResponseBySwitchParam(Request $request): RedirectR
                     $redirectUrl .= '?'.Request::normalizeQueryString(http_build_query($queryParams, '', '&'));
                 }
             } else {
-                $redirectUrl = $this->getCurrentHost($request);
+                $redirectUrl = $request->getSchemeAndHttpHost();
             }
         }
 
@@ -188,24 +188,18 @@ protected function getRedirectResponseBySwitchParam(Request $request): RedirectR
     /**
      * Do we have to redirect?
      *
-     * @param string $view For which view should be check?
+     * @param string $viewType The view we want to redirect to
      */
-    protected function mustRedirect(Request $request, string $view): bool
+    protected function mustRedirect(Request $request, string $viewType): bool
     {
-        if (!isset($this->redirectConf[$view])
-            || !$this->redirectConf[$view]['is_enabled']
-            || (self::NO_REDIRECT === $this->getRoutingOption($request->get('_route'), $view))
+        if (!isset($this->redirectConf[$viewType])
+            || !$this->redirectConf[$viewType]['is_enabled']
+            || (self::NO_REDIRECT === $this->getRoutingOption($request->get('_route'), $viewType))
         ) {
             return false;
         }
 
-        $isHost = ($this->getCurrentHost($request) === $this->redirectConf[$view]['host']);
-
-        if (!$isHost) {
-            return true;
-        }
-
-        return false;
+        return $request->getSchemeAndHttpHost() !== $this->redirectConf[$viewType]['host'];
     }
 
     protected function getRoutingOption(string $routeName, string $optionName): ?string
@@ -228,28 +222,23 @@ protected function getRoutingOption(string $routeName, string $optionName): ?str
         return null;
     }
 
-    protected function getCurrentHost(Request $request): string
-    {
-        return $request->getScheme().'://'.$request->getHost();
-    }
-
-    protected function getRedirectUrl(Request $request, string $platform): ?string
+    protected function getRedirectUrl(Request $request, string $view): ?string
     {
-        if (($routingOption = $this->getRoutingOption($request->get('_route'), $platform))) {
+        if (($routingOption = $this->getRoutingOption($request->get('_route'), $view))) {
             if (self::REDIRECT === $routingOption) {
                 // Make sure to hint at the device override, otherwise infinite loop
                 // redirection may occur if different device views are hosted on
                 // different domains (since the cookie can't be shared across domains)
                 $queryParams = $request->query->all();
-                $queryParams[$this->deviceView->getSwitchParam()] = $platform;
+                $queryParams[$this->deviceView->getSwitchParam()] = $view;
 
-                return rtrim($this->redirectConf[$platform]['host'], '/').$request->getPathInfo().'?'.Request::normalizeQueryString(http_build_query($queryParams, '', '&'));
+                return rtrim($this->redirectConf[$view]['host'], '/').$request->getPathInfo().'?'.Request::normalizeQueryString(http_build_query($queryParams));
             }
             if (self::REDIRECT_WITHOUT_PATH === $routingOption) {
                 // Make sure to hint at the device override, otherwise infinite loop
                 // redirections may occur if different device views are hosted on
                 // different domains (since the cookie can't be shared across domains)
-                return $this->redirectConf[$platform]['host'].'?'.$this->deviceView->getSwitchParam().'='.$platform;
+                return $this->redirectConf[$view]['host'].'?'.$this->deviceView->getSwitchParam().'='.$view;
             }
 
             return null;

src/Resources/config/services.yaml

@@ -1,9 +1,9 @@
 parameters:
-  mobile_detect.cookie_expire_datetime_modifier:
-  mobile_detect.cookie_key:
-  mobile_detect.redirect:
-  mobile_detect.switch_device_view.save_referer_path:
-  mobile_detect.switch_param:
+  mobile_detect.cookie_expire_datetime_modifier: ~
+  mobile_detect.cookie_key: ~
+  mobile_detect.redirect: ~
+  mobile_detect.switch_device_view.save_referer_path: ~
+  mobile_detect.switch_param: ~
 
 services:
   MobileDetectBundle\EventListener\RequestResponseListener: