mirror of
https://github.com/archtechx/tenancy.git
synced 2025-12-12 16:14:02 +00:00
Convert domains to lowercase, persist current domain model on resolver
This commit is contained in:
parent
cd1381eae9
commit
02e049b59e
6 changed files with 42 additions and 6 deletions
13
src/Database/Concerns/ConvertsDomainsToLowercase.php
Normal file
13
src/Database/Concerns/ConvertsDomainsToLowercase.php
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace Stancl\Tenancy\Database\Concerns;
|
||||
|
||||
trait ConvertsDomainsToLowercase
|
||||
{
|
||||
public static function bootConvertsDomainsToLowercase()
|
||||
{
|
||||
static::saving(function ($model) {
|
||||
$model->domain = strtolower($model->domain);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -20,6 +20,7 @@ class Domain extends Model implements Contracts\Domain
|
|||
{
|
||||
use Concerns\CentralConnection,
|
||||
Concerns\EnsuresDomainIsNotOccupied,
|
||||
Concerns\ConvertsDomainsToLowercase,
|
||||
Concerns\InvalidatesTenantsResolverCache;
|
||||
|
||||
protected $guarded = [];
|
||||
|
|
|
|||
|
|
@ -10,6 +10,13 @@ use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedOnDomainException;
|
|||
|
||||
class DomainTenantResolver extends Contracts\CachedTenantResolver
|
||||
{
|
||||
/**
|
||||
* The model representing the domain that the tenant was identified on.
|
||||
*
|
||||
* @var Domain
|
||||
*/
|
||||
public static $currentDomain;
|
||||
|
||||
/** @var bool */
|
||||
public static $shouldCache = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use Illuminate\Cache\CacheManager;
|
|||
use Illuminate\Support\ServiceProvider;
|
||||
use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper;
|
||||
use Stancl\Tenancy\Contracts\Tenant;
|
||||
use Stancl\Tenancy\Resolvers\DomainTenantResolver;
|
||||
|
||||
class TenancyServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
|
@ -39,6 +40,10 @@ class TenancyServiceProvider extends ServiceProvider
|
|||
return $app[Tenancy::class]->tenant;
|
||||
});
|
||||
|
||||
$this->app->bind(Domain::class, function () {
|
||||
return DomainTenantResolver::$currentDomain;
|
||||
});
|
||||
|
||||
// Make sure bootstrappers are stateful (singletons).
|
||||
foreach ($this->app['config']['tenancy.bootstrappers'] ?? [] as $bootstrapper) {
|
||||
if (method_exists($bootstrapper, '__constructStatic')) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue