Merge pull request #19 from FBNKCMaster/develop

Fix: Bug fix for unknown getDomain method & getRootDomain's args

Author: FBNKCMaster

src/Middleware/SelectTenant.php

@@ -56,7 +56,7 @@ public function handle($request, Closure $next)
                         'xtenant.database.default' => $defaultDatabase,
                         'xtenant.database.current' => $database,
 
-                        'xtenant.domain' => XTenantSetting::getDomain(),
+                        'xtenant.domain' => XTenantSetting::getRootDomain(),
                         'xtenant.super_admin_subdomain' => $xTenantSettings->super_admin_subdomain,
                         'xtenant.subdomain' => $subdomain,
                         'xtenant.allow_www' => $xTenantSettings->allow_www,

src/Models/XTenantSetting.php

@@ -42,7 +42,7 @@ public static function isRootDomain(Request $request)
             $host = str_replace('www.', '', $host);
         }
 
-        $rootDomain = self::getRootDomain($host);
+        $rootDomain = self::getRootDomain();
 
         return $host == $rootDomain;
     }
@@ -59,9 +59,9 @@ public static function getSettings()
         return self::first();
     }
 
-    public static function getRootDomain($host)
+    public static function getRootDomain()
     {
-        $parts = explode('.', $host);
+        $parts = explode('.', request()->getHost());
 
         return implode('.', array_slice($parts, -2, 2));
     }