diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index e44c4cd30..fc2c5a0f4 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -64,10 +64,10 @@ class ServerSetting extends Model static::creating(function ($setting) { try { if (str($setting->sentinel_token)->isEmpty()) { - $setting->generateSentinelToken(save: false, shouldExecuteEvent: false); + $setting->generateSentinelToken(save: false, ignoreEvent: true); } if (str($setting->sentinel_custom_url)->isEmpty()) { - $setting->generateSentinelUrl(save: false, shouldExecuteEvent: false); + $setting->generateSentinelUrl(save: false, ignoreEvent: true); } } catch (\Throwable $e) { Log::error('Error creating server setting: '.$e->getMessage()); @@ -89,7 +89,7 @@ class ServerSetting extends Model }); } - public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true) + public function generateSentinelToken(bool $save = true, bool $ignoreEvent = false) { $data = [ 'server_uuid' => $this->server->uuid, @@ -98,7 +98,7 @@ class ServerSetting extends Model $encrypted = encrypt($token); $this->sentinel_token = $encrypted; if ($save) { - if ($shouldExecuteEvent) { + if ($ignoreEvent) { $this->saveQuietly(); } else { $this->save(); @@ -108,7 +108,7 @@ class ServerSetting extends Model return $token; } - public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true) + public function generateSentinelUrl(bool $save = true, bool $ignoreEvent = false) { $domain = null; $settings = InstanceSettings::get(); @@ -123,7 +123,7 @@ class ServerSetting extends Model } $this->sentinel_custom_url = $domain; if ($save) { - if ($shouldExecuteEvent) { + if ($ignoreEvent) { $this->saveQuietly(); } else { $this->save(); diff --git a/database/seeders/SentinelSeeder.php b/database/seeders/SentinelSeeder.php index 3f506edac..3cf913933 100644 --- a/database/seeders/SentinelSeeder.php +++ b/database/seeders/SentinelSeeder.php @@ -14,10 +14,10 @@ class SentinelSeeder extends Seeder foreach ($servers as $server) { try { if (str($server->settings->sentinel_token)->isEmpty()) { - $server->settings->generateSentinelToken(shouldExecuteEvent: false); + $server->settings->generateSentinelToken(ignoreEvent: true); } if (str($server->settings->sentinel_custom_url)->isEmpty()) { - $url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false); + $url = $server->settings->generateSentinelUrl(ignoreEvent: true); if (str($url)->isEmpty()) { $server->settings->is_sentinel_enabled = false; $server->settings->save();