Improve installed database detection

This commit is contained in:
Darko Gjorgjijoski
2024-02-04 19:37:09 +01:00
parent 8981066b27
commit aa68332cf6
13 changed files with 161 additions and 49 deletions

View File

@@ -4,6 +4,7 @@ namespace InvoiceShelf\Http\Middleware;
use Closure;
use InvoiceShelf\Models\Setting;
use InvoiceShelf\Space\InstallUtils;
class InstallationMiddleware
{
@@ -15,14 +16,12 @@ class InstallationMiddleware
*/
public function handle($request, Closure $next)
{
if (! \Storage::disk('local')->has('database_created')) {
return redirect('/installation');
}
if (\Storage::disk('local')->has('database_created')) {
if (Setting::getSetting('profile_complete') !== 'COMPLETED') {
return redirect('/installation');
if (! InstallUtils::isDbCreated() || Setting::getSetting('profile_complete') !== 'COMPLETED') {
if (InstallUtils::dbMarkerExists()) {
InstallUtils::deleteDbMarker();
}
return redirect('/installation');
}
return $next($request);