archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 18:54:03 +00:00
Code Activity

Move RLS toggling and model directories config to tenancy.rls

Browse source
This commit is contained in:
lukinovec 2023-06-15 10:27:18 +02:00
parent 6b19a26d2c
commit f859a5da06
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Database/Concerns/BelongsToTenant.php
View file

@ -21,9 +21,9 @@ trait BelongsToTenant
public static function bootBelongsToTenant(): void
{
// If tenancy.database.rls is true or this model implements RlsModel
// If tenancy.rls.enabled is true or this model implements RlsModel
// Scope queries using Postgres RLS instead of TenantScope
if (! (config('tenancy.database.rls') || (new static) instanceof RLSModel)) {
if (! (config('tenancy.rls.enabled') || (new static) instanceof RLSModel)) {
static::addGlobalScope(new TenantScope);
}

4
src/Database/Concerns/DealsWithModels.php
View file

@ -12,8 +12,6 @@ use Symfony\Component\Finder\SplFileInfo;
trait DealsWithModels
{
public static array $modelDirectories = ['App/Models'];
public static Closure|null $modelDiscoveryOverride = null;
public static function getModels(): Collection
@ -22,7 +20,7 @@ trait DealsWithModels
return (static::$modelDiscoveryOverride)();
}
$modelFiles = Finder::create()->files()->name('*.php')->in(static::$modelDirectories);
$modelFiles = Finder::create()->files()->name('*.php')->in(config('tenancy.rls.model_directories'));
$classes = collect($modelFiles)->map(function (SplFileInfo $file) {
$fileContents = str($file->getContents());