added activate subdomains method

MasoniteFramework · Jun 12, 2018 · 3d7ae8d · 3d7ae8d
1 parent b1717cc
commit 3d7ae8d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/masonite/request.py b/masonite/request.py
@@ -32,6 +32,7 @@ def __init__(self, environ=None):
         self.redirect_route = False
         self.user_model = None
         self.subdomain = None
+        self._activate_subdomains = False
         self._status = '404 Not Found'
 
         if environ:
@@ -362,14 +363,18 @@ def compile_route_to_url(self, route, params={}):
             compiled_url = compiled_url.replace('//', '/')
 
         return compiled_url
+
+    def activate_subdomains(self):
+        self._activate_subdomains = True
 
     def has_subdomain(self):
-        url = tldextract.extract(self.environ['HTTP_HOST'])
+        if self._activate_subdomains:
+            url = tldextract.extract(self.environ['HTTP_HOST'])
 
-        if url.subdomain:
-            self.subdomain = url.subdomain
-            self.url_params.update({'subdomain': self.subdomain})
-            return True
+            if url.subdomain:
+                self.subdomain = url.subdomain
+                self.url_params.update({'subdomain': self.subdomain})
+                return True
 
         return False
 

diff --git a/tests/providers/test_route_provider.py b/tests/providers/test_route_provider.py
@@ -86,10 +86,13 @@ def test_route_subdomain_ignores_routes(self):
         self.app.make('Environ')['HTTP_HOST'] = 'subb.domain.com'
         self.app.bind('WebRoutes', [get('/test', Controller.show)])
 
+        request = self.app.make('Request')
+        request.activate_subdomains()
+
         self.provider.boot(
             self.app.make('WebRoutes'),
             self.app.make('Route'),
-            self.app.make('Request'),
+            request,
             self.app.make('Environ'),
             self.app.make('Headers'),
         )

diff --git a/tests/test_request_routes.py b/tests/test_request_routes.py
@@ -8,6 +8,8 @@ class TestRequestRoutes:
     def setup_method(self):
         self.request = Request(generate_wsgi()).key(
             'NCTpkICMlTXie5te9nJniMj9aVbPM6lsjeq5iDZ0dqY=')
+
+        self.request.activate_subdomains()
 
     def test_get_initialized(self):
         assert callable(Get)
@@ -67,6 +69,8 @@ def test_method_type_has_required_subdomain_with_asterick(self):
 
         request.environ['HTTP_HOST'] = 'test.localhost:8000'
 
+        request.activate_subdomains()
+
         get = Get().domain('*')
         post = Get().domain('*')
 
@@ -83,6 +87,8 @@ def test_request_sets_subdomain_on_get(self):
 
         request.environ['HTTP_HOST'] = 'test.localhost:8000'
 
+        request.activate_subdomains()
+
         get = Get().domain('*')
         post = Get().domain('*')