Refactor method used to resolve tenant and update its implementation in SetTenant middleware to reflect changes

Author: miracuthbert

src/Http/Middleware/SetTenant.php

@@ -31,15 +31,15 @@ public function handle($request, Closure $next, $guard = null)
 
         $subdomainSafeRoutes = tenancy()->config()->getOption('routes.subdomain_safe_routes');
 
-        $subomainSafeCheck = empty($subdomainSafeRoutes) ? false : $request->routeIs($subdomainSafeRoutes);
+        $subdomainSafeCheck = empty($subdomainSafeRoutes) ? false : $request->routeIs($subdomainSafeRoutes);
 
-        if (tenancy()->config()->getOption('routes.subdomain') && empty($subomainSafeCheck)) {
+        if (tenancy()->config()->getOption('routes.subdomain') && empty($subdomainSafeCheck)) {
             $value = ($request->{$subdomainKey});
         } else {
             $value = $inHeader ? $request->header(TenantStore::TENANT_HEADER) : tenancy()->store()->getKey($request->{$paramKey});
         }
 
-        $tenant = tenancy()->resolveTenant($value);
+        $tenant = tenancy()->resolveTenant($value, $subdomainSafeCheck);
 
         if (!$tenant) {
             return config('tenancy.redirect.abort') ? abort(404) : redirect(config('tenancy.redirect.fallback_url'));

src/Tenancy.php

@@ -70,20 +70,43 @@ public function store()
         return new TenantStore();
     }
 
+    /**
+     * Get subdomain safe routes list.
+     * 
+     * @return array|null
+     */
+    public function subdomainSafeRoutes()
+    {
+        return tenancy()->config()->getOption('routes.subdomain_safe_routes');
+    }
+
+    /**
+     * Determine if current route is a non-tenant based subdomain.
+     * 
+     * @return bool
+     */
+    public function subdomainSafeCheck()
+    {
+        $subdomainSafeRoutes = $this->subdomainSafeRoutes();
+
+        return empty($subdomainSafeRoutes) ? false : request()->routeIs($subdomainSafeRoutes);
+    }
+
     /**
      * Resolve the tenant.
      *
-     * @param $value
-     * @return mixed
+     * @param  int|string $value
+     * @param  bool       $ignoreSubdomainCheck
+     * @return \Illuminate\Database\Eloquent\Model|null
      */
-    public function resolveTenant($value, $ignoreSubdomain = false)
+    public function resolveTenant($value, $ignoreSubdomainCheck = false)
     {
         $model = $this->tenantModel();
 
-        if (tenancy()->config()->getOption('routes.subdomain') && $ignoreSubdomain == false) {
+        if (tenancy()->config()->getOption('routes.subdomain') && $ignoreSubdomainCheck == false) {
             $key = tenancy()->config()->getOption('routes.subdomain_key', 'domain');
         } else {
-            $key = (tenancy()->config()->storeDriver() === 'db') ? config('tenancy.model.db_key') : config('tenancy.model.key');
+            $key = $this->getTenantDriverStoreKey();
         }
 
         return $model->where($key, $value)->first();