This commit is contained in:
2026-05-07 21:34:43 +03:00
parent 48e32bfdcb
commit a5161cb6b4
3 changed files with 31 additions and 33 deletions
+2 -1
View File
@@ -22,7 +22,8 @@ readonly class AuthServiceLunar implements AuthService
} elseif (request()->segment(1) !== "lucent") {
return config("lucent.systemUserId");
}
return Filament::auth()->user()->id;
return Filament::auth()->user()->id ?? null;
}
public function getCurrentUser(): User
{
+28 -29
View File
@@ -2,17 +2,13 @@
namespace Lucent\Http\Controller;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Lucent\Account\AccountService;
use Lucent\Channel\ChannelService;
use Lucent\LucentException;
use Lucent\Setup\Data\SetupStep;
use Lucent\Setup\Data\SetupStepStatus;
use Lucent\Setup\Setup;
use Lucent\Setup\Step\ComposerStep;
use Lucent\Setup\Step\DatabaseSetupStep;
use Lucent\Setup\Step\IStep;
@@ -21,38 +17,44 @@ use Lucent\Setup\Step\LucentConfigStep;
use Lucent\Setup\Step\StorageLinkSetupStep;
use Lucent\Setup\Step\StorageSetupStep;
use Lucent\Svelte\Svelte;
use function Lucent\Response\fail;
use function Lucent\Response\ok;
class SetupController
{
public function __construct(
private readonly AccountService $accountService,
private readonly ChannelService $channelService,
private readonly Svelte $svelte,
)
{
}
private readonly Svelte $svelte,
) {}
public function setup(Request $request): View|RedirectResponse
{
$steps = array_reduce(
[
new ComposerStep(),
new LucentConfigStep(),
new LaravelEnvStep(),
new StorageSetupStep(),
new StorageLinkSetupStep(),
new DatabaseSetupStep(),
],
fn(array $carry, IStep $setupStep) => array_merge($carry, [
$setupStep(),
]),
[],
);
$allSuccess = array_reduce(
$steps,
fn(bool $carry, SetupStep $step) => !$carry
? false
: $step->status === SetupStepStatus::SUCCESS,
true,
);
$steps = array_reduce([
new ComposerStep,
new LucentConfigStep,
new LaravelEnvStep,
new StorageSetupStep,
new StorageLinkSetupStep,
new DatabaseSetupStep,
], fn(array $carry, IStep $setupStep) => array_merge($carry, [$setupStep()]), []);
$allSuccess = array_reduce($steps, fn(bool $carry, SetupStep $step) => !$carry ? false : $step->status === SetupStepStatus::SUCCESS, true);
if($allSuccess){
if ($allSuccess) {
if ($this->accountService->countUsers() > 0) {
return redirect($this->channelService->channel->lucentUrl . "/login");
return redirect(
$this->channelService->channel->lucentUrl . "/login",
);
}
}
@@ -63,10 +65,7 @@ class SetupController
data: [
"steps" => $steps,
"allSuccess" => $allSuccess,
]
],
);
}
}
+1 -3
View File
@@ -8,9 +8,7 @@ use Lucent\Account\AuthService;
readonly class GuestMiddleware
{
public function __construct(private AuthService $authService)
{
}
public function __construct(private AuthService $authService) {}
public function handle(Request $request, Closure $next)
{