diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index e72c8c444..995c52041 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -89,7 +89,7 @@ class ServerSetting extends Model }); } - public function generateSentinelToken(bool $save = true) + public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true) { $data = [ 'server_uuid' => $this->server->uuid, @@ -98,13 +98,17 @@ class ServerSetting extends Model $encrypted = encrypt($token); $this->sentinel_token = $encrypted; if ($save) { - $this->save(); + if ($shouldExecuteEvent) { + $this->saveQuietly(); + } else { + $this->save(); + } } return $token; } - public function generateSentinelUrl(bool $save = true) + public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true) { $domain = null; $settings = InstanceSettings::get(); @@ -119,7 +123,11 @@ class ServerSetting extends Model } $this->sentinel_custom_url = $domain; if ($save) { - $this->save(); + if ($shouldExecuteEvent) { + $this->saveQuietly(); + } else { + $this->save(); + } } return $domain; diff --git a/database/seeders/SentinelSeeder.php b/database/seeders/SentinelSeeder.php index d61c2f55d..3f506edac 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(); + $server->settings->generateSentinelToken(shouldExecuteEvent: false); } if (str($server->settings->sentinel_custom_url)->isEmpty()) { - $url = $server->settings->generateSentinelUrl(); + $url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false); if (str($url)->isEmpty()) { $server->settings->is_sentinel_enabled = false; $server->settings->save();