Fix tenant resolution to check if value is instance of tenant model

Author: miracuthbert

src/Http/Middleware/SetTenant.php

@@ -11,9 +11,8 @@ class SetTenant
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure $next
-     * @param  string|null $guard
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string|null  $guard
      * @return mixed
      */
     public function handle($request, Closure $next, $guard = null)
@@ -27,7 +26,7 @@ public function handle($request, Closure $next, $guard = null)
 
         $options = tenancy()->config()->getOption('routes.middleware.set_tenant');
 
-        list('in_tenant' => $inTenant, 'in_header' => $inHeader) = $options;
+        ['in_tenant' => $inTenant, 'in_header' => $inHeader] = $options;
 
         $subdomainSafeRoutes = tenancy()->config()->getOption('routes.subdomain_safe_routes');
 
@@ -41,7 +40,7 @@ public function handle($request, Closure $next, $guard = null)
 
         $tenant = tenancy()->resolveTenant($value, $subdomainSafeCheck);
 
-        if (!$tenant) {
+        if (! $tenant) {
             return config('tenancy.redirect.abort') ? abort(404) : redirect(config('tenancy.redirect.fallback_url'));
         }
 
@@ -63,13 +62,10 @@ public function handle($request, Closure $next, $guard = null)
     /**
      * Check if current user is authorized to access tenant.
      *
-     * @param $request
-     * @param $inTenant
-     * @param $tenant
      * @return bool
      */
     protected function cannotAccessTenant($request, $inTenant, $tenant)
     {
-        return $inTenant && !$tenant->users->contains($request->user());
+        return $inTenant && ! $tenant->users->contains($request->user());
     }
 }

src/Tenancy.php

@@ -123,14 +123,18 @@ public function subdomainSafeCheck()
     /**
      * Resolve the tenant.
      *
-     * @param  int|string $value
+     * @param  int|string|\Illuminate\Database\Eloquent\Model $value
      * @param  bool       $ignoreSubdomainCheck
      * @return \Illuminate\Database\Eloquent\Model|null
      */
     public function resolveTenant($value, $ignoreSubdomainCheck = false)
     {
         $model = $this->tenantModel();
 
+        if ($value instanceof $model) {
+            return $value;
+        }
+
         if (tenancy()->config()->getOption('routes.subdomain') && $ignoreSubdomainCheck == false) {
             $key = tenancy()->config()->getOption('routes.subdomain_key', 'domain');
         } else {