setup wizard funcionality upgrade for v2

This commit is contained in:
Čarodej
2022-02-11 10:05:12 +01:00
parent 3867c9cd67
commit 03730b80c0
33 changed files with 517 additions and 448 deletions

View File

@@ -2,10 +2,11 @@
namespace Domain\SetupWizard\Controllers;
use App\Users\Models\User;
use Artisan;
use Illuminate\Http\Response;
use Domain\Settings\Models\Setting;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Contracts\Auth\StatefulGuard;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\SetupWizard\Requests\StoreAdminAccountRequest;
@@ -17,6 +18,7 @@ use Domain\Localization\Actions\SeedDefaultLanguageAction;
class CreateAdminAccountController extends Controller
{
public function __construct(
protected StatefulGuard $guard,
public SeedDefaultPagesAction $seedDefaultPages,
public SeedDefaultLanguageAction $seedDefaultLanguage,
public SeedDefaultSettingsAction $seedDefaultSettingsAction,
@@ -27,7 +29,7 @@ class CreateAdminAccountController extends Controller
StoreAdminAccountRequest $request
): Response {
// Create user
$user = User::forceCreate([
$admin = User::forceCreate([
'role' => 'admin',
'email' => $request->input('email'),
'password' => bcrypt($request->input('password')),
@@ -38,7 +40,7 @@ class CreateAdminAccountController extends Controller
$name = split_name($request->input('name'));
// Store user data
$user->settings()->create([
$admin->settings()->create([
'avatar' => store_avatar($request, 'avatar'),
'first_name' => $name['first_name'],
'last_name' => $name['last_name'],
@@ -58,24 +60,24 @@ class CreateAdminAccountController extends Controller
'value' => $request->input('purchase_code'),
],
])->each(function ($col) {
Setting::forceCreate([
'name' => $col['name'],
'value' => $col['value'],
Setting::updateOrCreate([
'name' => $col['name']
], [
'value' => $col['value']
]);
});
Artisan::call('key:generate', [
'--force' => true,
]);
Artisan::call('config:clear');
// Set up application
($this->seedDefaultPages)();
($this->seedDefaultSettingsAction)($request->input('license'));
($this->seedDefaultLanguage)();
// Login account
if (Auth::attempt($request->only(['email', 'password']))) {
$request->session()->regenerate();
return response('Registration was successful', 204);
}
return response('Something went wrong', 500);
return response('Registration was successful', 204);
}
}

View File

@@ -81,9 +81,10 @@ class StoreAppSettingsController extends Controller
'value' => $request->input('defaultMaxTeamMember') ?? 10,
],
])->each(function ($col) {
Setting::forceCreate([
'name' => $col['name'],
'value' => $col['value'],
Setting::updateOrCreate([
'name' => $col['name']
], [
'value' => $col['value']
]);
});

View File

@@ -2,6 +2,7 @@
namespace Domain\SetupWizard\Controllers;
use Artisan;
use DB;
use Illuminate\Http\Response;
use Domain\Settings\Models\Setting;
use App\Http\Controllers\Controller;
@@ -21,28 +22,30 @@ class StoreDatabaseCredentialsController extends Controller
try {
// Set temporary database connection
config([
'database' => [
'connections' => [
'tests' => [
'driver' => $request->input('connection'),
'host' => $request->input('host'),
'port' => $request->input('port'),
'database' => $request->input('name'),
'username' => $request->input('username'),
'password' => $request->input('password'),
],
],
'database.connections.mysql' => [
'driver' => $request->input('connection'),
'host' => $request->input('host'),
'port' => $request->input('port'),
'database' => $request->input('name'),
'username' => $request->input('username'),
'password' => $request->input('password'),
],
]);
// Refresh connection
DB::reconnect('mysql');
// Test connection
\DB::connection('test')->getPdo();
DB::connection('mysql')->getPdo();
} catch (PDOException $e) {
throw new HttpException(500, $e->getMessage());
}
// TODO: add SANCTUM_STATEFUL_DOMAINS parameter
Artisan::call('migrate:fresh', [
'--force' => true,
]);
// Set database variables
setEnvironmentValue([
'DB_CONNECTION' => $request->input('connection'),
'DB_HOST' => $request->input('host'),
@@ -53,22 +56,8 @@ class StoreDatabaseCredentialsController extends Controller
]);
Artisan::call('config:cache');
Artisan::call('key:generate', [
'--force' => true,
]);
Artisan::call('migrate:fresh', [
'--force' => true,
]);
}
// Store setup wizard progress
Setting::forceCreate([
'name' => 'setup_wizard_database',
'value' => 1,
]);
return response('Done', 204);
}
}

View File

@@ -1,4 +1,5 @@
<?php
namespace Domain\SetupWizard\Controllers;
use Artisan;
@@ -13,8 +14,9 @@ class StoreEnvironmentSettingsController extends Controller
*/
public function __invoke(
StoreEnvironmentSetupRequest $request,
): Response {
if (! app()->runningUnitTests()) {
): Response
{
if (!app()->runningUnitTests()) {
$drivers = [
'local' => [
'FILESYSTEM_DRIVER' => 'local',
@@ -38,28 +40,28 @@ class StoreEnvironmentSettingsController extends Controller
);
$mail = [
'log' => [
'log' => [
'MAIL_DRIVER' => 'log',
],
'postmark' => [
'postmark' => [
'POSTMARK_TOKEN' => $request->input('postmark.token'),
],
'smtp' => [
'smtp' => [
'MAIL_DRIVER' => 'smtp',
'MAIL_HOST' => $request->input('mail.host'),
'MAIL_PORT' => $request->input('mail.port'),
'MAIL_USERNAME' => $request->input('mail.username'),
'MAIL_PASSWORD' => $request->input('mail.password'),
'MAIL_ENCRYPTION' => $request->input('mail.encryption'),
'MAIL_HOST' => $request->input('smtp.host'),
'MAIL_PORT' => $request->input('smtp.port'),
'MAIL_USERNAME' => $request->input('smtp.username'),
'MAIL_PASSWORD' => $request->input('smtp.password'),
'MAIL_ENCRYPTION' => $request->input('smtp.encryption'),
],
'ses' => [
'ses' => [
'MAIL_DRIVER' => 'ses',
'AWS_ACCESS_KEY_ID' => $request->input('ses.access_key'),
'AWS_SECRET_ACCESS_KEY' => $request->input('ses.secret_access_key'),
'AWS_DEFAULT_REGION' => $request->input('ses.default_region'),
'AWS_SESSION_TOKEN' => $request->input('ses.session_token'),
],
'mailgun' => [
'mailgun' => [
'MAIL_DRIVER' => 'mailgun',
'MAILGUN_DOMAIN' => $request->input('mailgun.domain'),
'MAILGUN_SECRET' => $request->input('mailgun.secret'),
@@ -72,6 +74,29 @@ class StoreEnvironmentSettingsController extends Controller
$mail[$request->input('mailDriver')]
);
$environmentSetup = [
'production' => [
'APP_ENV' => 'production',
'APP_DEBUG' => 'false',
],
'local' => [
'APP_ENV' => 'local',
'APP_DEBUG' => 'true',
],
];
setEnvironmentValue(
$environmentSetup[$request->input('environment')]
);
$sanctumStatefulDomains = request()->getHost() . ',' . request()->getHost() . ':' . request()->getPort();
// Set other environment variables
setEnvironmentValue([
'APP_URL' => url('/'),
'SANCTUM_STATEFUL_DOMAINS' => $sanctumStatefulDomains,
]);
Artisan::call('config:cache');
}

View File

@@ -17,7 +17,7 @@ class VerifyPurchaseCodeController extends Controller
$response = Http::get("https://verify.vuefilemanager.com/api/verify-code/{$request->input('purchaseCode')}");
if ($response->successful()) {
return response($response, 204);
return response($response->body(), 201);
}
return response('Purchase code is invalid.', 400);

View File

@@ -1,4 +1,5 @@
<?php
namespace Domain\SetupWizard\Requests;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,6 +25,7 @@ class StoreEnvironmentSetupRequest extends FormRequest
{
return [
'storage' => 'required|array',
'environment' => 'required|string',
'storage.driver' => 'required|string',
'storage.key' => 'sometimes|nullable|string',
'storage.secret' => 'sometimes|nullable|string',