add www. prefix for already https as well when previous uri doesnot has

www. prefix for configured add_www_prefix
samsonasik · Oct 11, 2017 · ec92719 · ec92719
1 parent 0dbdd29
commit ec92719
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/src/HttpsTrait.php b/src/HttpsTrait.php
@@ -61,23 +61,6 @@ private function isSkippedHttpStrictTransportSecurity($uriScheme, $match, $respo
             );
     }
 
-    /**
-     * Validate Scheme and Forced Https Config
-     *
-     * @param  string                 $uriScheme
-     * @param  RouteMatch|RouteResult $match
-     *
-     * @return bool
-     */
-    private function validateSchemeAndToBeForcedHttpsConfig($uriScheme, $match)
-    {
-        if ($this->isSchemeHttps($uriScheme) || ! $this->isGoingToBeForcedToHttps($match)) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Add www. prefix when required in the config
      *

diff --git a/src/Listener/ForceHttps.php b/src/Listener/ForceHttps.php
@@ -87,10 +87,18 @@ public function forceHttpsScheme(MvcEvent $e)
 
         $routeMatch = $e->getRouteMatch();
         $response   = $this->setHttpStrictTransportSecurity($uriScheme, $routeMatch, $response);
-        if (! $this->validateSchemeAndToBeForcedHttpsConfig($uriScheme, $routeMatch)) {
+        if (! $this->isGoingToBeForcedToHttps($routeMatch)) {
             return;
         }
 
+        if ($this->isSchemeHttps($uriScheme)) {
+            $uriString       = $uri->toString();
+            $httpsRequestUri = $this->withWwwPrefixWhenRequired($uriString);
+            if ($uriString === $httpsRequestUri) {
+                return;
+            }
+        }
+
         $httpsRequestUri = $this->withWwwPrefixWhenRequired($uri->setScheme('https')->toString());
 
         // 307 keeps headers, request method, and request body

diff --git a/src/Middleware/ForceHttps.php b/src/Middleware/ForceHttps.php
@@ -62,10 +62,18 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $uriScheme = $uri->getScheme();
 
         $response = $this->setHttpStrictTransportSecurity($uriScheme, $match, $response);
-        if (! $this->validateSchemeAndToBeForcedHttpsConfig($uriScheme, $match)) {
+        if (! $this->isGoingToBeForcedToHttps($match)) {
             return $next($request, $response);
         }
 
+        if ($this->isSchemeHttps($uriScheme)) {
+            $uriString = $uri->__toString();
+            $httpsRequestUri = $this->withWwwPrefixWhenRequired($uriString);
+            if ($uriString === $httpsRequestUri) {
+                return $next($request, $response);
+            }
+        }
+
         $newUri          = $uri->withScheme('https');
         $httpsRequestUri = $this->withWwwPrefixWhenRequired($newUri->__toString());