From e8854c3101085342627f69871ed7c5a311690786 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 22 Oct 2024 08:31:53 +0200 Subject: [PATCH] fix: sentinel start fixed --- app/Models/ServerSetting.php | 9 ++------- config/debugbar.php | 1 + resources/views/livewire/server/form.blade.php | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index b1ed92d95..d98647fce 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -64,12 +64,7 @@ class ServerSetting extends Model $setting->generateSentinelToken(save: false); } if (str($setting->sentinel_custom_url)->isEmpty()) { - $url = $setting->generateSentinelUrl(save: false); - if (str($url)->isEmpty()) { - $setting->is_sentinel_enabled = false; - } else { - $setting->is_sentinel_enabled = true; - } + $setting->generateSentinelUrl(save: false); } } catch (\Throwable $e) { loggy('Error creating server setting: '.$e->getMessage()); @@ -89,7 +84,7 @@ class ServerSetting extends Model $this->save(); } - return $encrypted; + return $token; } public function generateSentinelUrl(bool $save = true) diff --git a/config/debugbar.php b/config/debugbar.php index eae406ba7..daeea96b6 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -18,6 +18,7 @@ return [ 'except' => [ 'telescope*', 'horizon*', + 'api*', ], /* diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index f75b9762f..a184a308a 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -176,7 +176,7 @@
- + @if ($server->isSentinelEnabled())