chore: Do not apply condition from scopes when outside multitenanted …

…context
sprout-laravel · Nov 18, 2024 · 4329fa8 · 4329fa8
1 parent 11834a8
commit 4329fa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Database/Eloquent/Scopes/BelongsToManyTenantsScope.php b/src/Database/Eloquent/Scopes/BelongsToManyTenantsScope.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Sprout\Exceptions\TenantMissing;
+use function Sprout\sprout;
 
 /**
  * Belongs to many Tenants Scope
@@ -38,6 +39,10 @@ final class BelongsToManyTenantsScope extends TenantChildScope
      */
     public function apply(Builder $builder, Model $model): void
     {
+        if (! sprout()->withinContext()) {
+            return;
+        }
+
         /** @phpstan-ignore-next-line */
         $tenancy = $model->getTenancy();
 

diff --git a/src/Database/Eloquent/Scopes/BelongsToTenantScope.php b/src/Database/Eloquent/Scopes/BelongsToTenantScope.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Sprout\Exceptions\TenantMissing;
+use function Sprout\sprout;
 
 /**
  * Belongs to Tenant Scope
@@ -38,6 +39,10 @@ final class BelongsToTenantScope extends TenantChildScope
      */
     public function apply(Builder $builder, Model $model): void
     {
+        if (! sprout()->withinContext()) {
+            return;
+        }
+
         /** @phpstan-ignore-next-line */
         $tenancy = $model->getTenancy();