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

Use $tenant->database()->getUsername(), default to $tenant->getTenantKey()

Browse source
This commit is contained in:
lukinovec 2023-05-24 10:50:03 +02:00
parent 57df6e2b30
commit 2461f76e59
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Bootstrappers/Integrations/PostgresTenancyBootstrapper.php
View file

@ -28,8 +28,9 @@ class PostgresTenancyBootstrapper implements TenancyBootstrapper
/** @var TenantWithDatabase $tenant */ /** @var TenantWithDatabase $tenant */
$this->database->purge('central'); $this->database->purge('central');
$this->config->set('database.connections.pgsql.username', $tenant->getTenantKey()); $this->config->set('database.connections.pgsql.username', $tenant->database()->getUsername() ?? $tenant->getTenantKey());
$this->config->set('database.connections.pgsql.password', $tenant->database()->getPassword() ?? 'password'); $this->config->set('database.connections.pgsql.password', $tenant->database()->getPassword() ?? 'password');
$this->config->set('database.connections.central', $this->config->get('database.connections.pgsql')); $this->config->set('database.connections.central', $this->config->get('database.connections.pgsql'));
} }

2
src/Jobs/CreatePostgresUserForTenant.php
View file

@ -34,7 +34,7 @@ class CreatePostgresUserForTenant implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
$name = $this->tenant->getTenantKey(); $name = $this->tenant->database()->getUsername() ?? $this->tenant->getTenantKey();
$password = $this->tenant->database()->getPassword() ?? 'password'; $password = $this->tenant->database()->getPassword() ?? 'password';
// Create the user only if it doesn't already exist // Create the user only if it doesn't already exist

2
src/Jobs/DeleteTenantsPostgresUser.php
View file

@ -34,7 +34,7 @@ class DeleteTenantsPostgresUser implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
$name = $this->tenant->getTenantKey(); $name = $this->tenant->database()->getUsername() ?? $this->tenant->getTenantKey();
// Revoke all permissions of a Postgres user before dropping it // Revoke all permissions of a Postgres user before dropping it
// Skip dropping permissions if the user doesn't exist // Skip dropping permissions if the user doesn't exist