viscous/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2026-03-03 00:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for setup routes

Browse Source
This commit is contained in:
David Bomba
2026-01-25 21:36:33 +11:00
parent 4ae7c77e15
commit 0d8cc5d352
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SetupController.php
View File

@@ -185,7 +185,7 @@ class SetupController extends Controller
try {
$status = SystemHealth::dbCheck($request);
if (is_array($status) && $status['success'] === true) {
if (is_array($status) && $status['success'] === true && \App\Models\Account::count() > 0) {
return response([], 200);
}

12
app/Http/Requests/Setup/CheckDatabaseRequest.php
View File

@@ -13,6 +13,7 @@
namespace App\Http\Requests\Setup;
use App\Http\Requests\Request;
use Illuminate\Support\Facades\Schema;
class CheckDatabaseRequest extends Request
{
@@ -23,7 +24,16 @@ class CheckDatabaseRequest extends Request
*/
public function authorize()
{
return true; /* Return something that will check if setup has been completed, like Ninja::hasCompletedSetup() */
if (!\App\Utils\Ninja::isSelfHost()) {
return false;
}
try {
return !Schema::hasTable('accounts') || \App\Models\Account::count() == 0;
} catch (\Throwable $e) {
// If database connection fails, allow the request (we're checking the DB)
return true;
}
}
/**

12
app/Http/Requests/Setup/CheckMailRequest.php
View File

@@ -13,6 +13,7 @@
namespace App\Http\Requests\Setup;
use App\Http\Requests\Request;
use Illuminate\Support\Facades\Schema;
class CheckMailRequest extends Request
{
@@ -23,7 +24,16 @@ class CheckMailRequest extends Request
*/
public function authorize()
{
return true; /* Return something that will check if setup has been completed, like Ninja::hasCompletedSetup() */
if (!\App\Utils\Ninja::isSelfHost()) {
return false;
}
try {
return !Schema::hasTable('accounts') || \App\Models\Account::count() == 0;
} catch (\Throwable $e) {
// If database connection fails, allow the request (we're checking the DB)
return true;
}
}
/**