mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-17 02:04:03 +00:00
Refactor install wizard and mail configuration
This commit is contained in:
Darko Gjorgjijoski
@@ -6,29 +6,16 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\MailEnvironmentRequest;
|
||||
use App\Mail\TestMail;
|
||||
use App\Models\Setting;
|
||||
use App\Services\Setup\EnvironmentManager;
|
||||
use App\Services\MailConfigurationService;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Mail;
|
||||
|
||||
class MailConfigurationController extends Controller
|
||||
{
|
||||
/**
|
||||
* The environment manager
|
||||
*
|
||||
* @var EnvironmentManager
|
||||
*/
|
||||
protected $environmentManager;
|
||||
|
||||
/**
|
||||
* The constructor
|
||||
*/
|
||||
public function __construct(EnvironmentManager $environmentManager)
|
||||
{
|
||||
$this->environmentManager = $environmentManager;
|
||||
}
|
||||
public function __construct(private readonly MailConfigurationService $mailConfigurationService) {}
|
||||
|
||||
/**
|
||||
* Save the mail environment variables
|
||||
@@ -43,11 +30,7 @@ class MailConfigurationController extends Controller
|
||||
|
||||
$setting = Setting::getSetting('profile_complete');
|
||||
|
||||
// Prepare mail settings for database storage
|
||||
$mailSettings = $this->prepareMailSettingsForDatabase($request);
|
||||
|
||||
// Save mail settings to database
|
||||
Setting::setSettings($mailSettings);
|
||||
$this->mailConfigurationService->saveGlobalConfig($request->validated());
|
||||
|
||||
if ($setting !== 'COMPLETED') {
|
||||
Setting::setSetting('profile_complete', 4);
|
||||
@@ -58,63 +41,6 @@ class MailConfigurationController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare mail settings for database storage
|
||||
*/
|
||||
private function prepareMailSettingsForDatabase(MailEnvironmentRequest $request): array
|
||||
{
|
||||
$driver = $request->get('mail_driver');
|
||||
|
||||
// Base settings that are always saved
|
||||
$settings = [
|
||||
'mail_driver' => $driver,
|
||||
'from_name' => $request->get('from_name'),
|
||||
'from_mail' => $request->get('from_mail'),
|
||||
];
|
||||
|
||||
// Driver-specific settings
|
||||
switch ($driver) {
|
||||
case 'smtp':
|
||||
$settings = array_merge($settings, [
|
||||
'mail_host' => $request->get('mail_host'),
|
||||
'mail_port' => $request->get('mail_port'),
|
||||
'mail_username' => $request->get('mail_username'),
|
||||
'mail_password' => $request->get('mail_password'),
|
||||
'mail_encryption' => $request->get('mail_encryption', 'none'),
|
||||
'mail_scheme' => $request->get('mail_scheme'),
|
||||
'mail_url' => $request->get('mail_url'),
|
||||
'mail_timeout' => $request->get('mail_timeout'),
|
||||
'mail_local_domain' => $request->get('mail_local_domain'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'mailgun':
|
||||
$settings = array_merge($settings, [
|
||||
'mail_mailgun_domain' => $request->get('mail_mailgun_domain'),
|
||||
'mail_mailgun_secret' => $request->get('mail_mailgun_secret'),
|
||||
'mail_mailgun_endpoint' => $request->get('mail_mailgun_endpoint', 'api.mailgun.net'),
|
||||
'mail_mailgun_scheme' => $request->get('mail_mailgun_scheme', 'https'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'ses':
|
||||
$settings = array_merge($settings, [
|
||||
'mail_ses_key' => $request->get('mail_ses_key'),
|
||||
'mail_ses_secret' => $request->get('mail_ses_secret'),
|
||||
'mail_ses_region' => $request->get('mail_ses_region', 'us-east-1'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'sendmail':
|
||||
$settings = array_merge($settings, [
|
||||
'mail_sendmail_path' => $request->get('mail_sendmail_path', '/usr/sbin/sendmail -bs -i'),
|
||||
]);
|
||||
break;
|
||||
}
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the mail environment variables
|
||||
*
|
||||
@@ -125,84 +51,7 @@ class MailConfigurationController extends Controller
|
||||
{
|
||||
$this->authorize('manage email config');
|
||||
|
||||
// Get mail settings from database
|
||||
$mailSettings = Setting::getSettings([
|
||||
'mail_driver',
|
||||
'mail_host',
|
||||
'mail_port',
|
||||
'mail_username',
|
||||
'mail_password',
|
||||
'mail_encryption',
|
||||
'mail_scheme',
|
||||
'mail_url',
|
||||
'mail_timeout',
|
||||
'mail_local_domain',
|
||||
'from_name',
|
||||
'from_mail',
|
||||
'mail_mailgun_domain',
|
||||
'mail_mailgun_secret',
|
||||
'mail_mailgun_endpoint',
|
||||
'mail_mailgun_scheme',
|
||||
'mail_ses_key',
|
||||
'mail_ses_secret',
|
||||
'mail_ses_region',
|
||||
'mail_sendmail_path',
|
||||
]);
|
||||
|
||||
$driver = $mailSettings['mail_driver'] ?? config('mail.default');
|
||||
|
||||
// Base data that's always available
|
||||
$MailData = [
|
||||
'mail_driver' => $driver,
|
||||
'from_name' => $mailSettings['from_name'] ?? config('mail.from.name'),
|
||||
'from_mail' => $mailSettings['from_mail'] ?? config('mail.from.address'),
|
||||
];
|
||||
|
||||
// Driver-specific configuration
|
||||
switch ($driver) {
|
||||
case 'smtp':
|
||||
$MailData = array_merge($MailData, [
|
||||
'mail_host' => $mailSettings['mail_host'] ?? config('mail.mailers.smtp.host', ''),
|
||||
'mail_port' => $mailSettings['mail_port'] ?? config('mail.mailers.smtp.port', ''),
|
||||
'mail_username' => $mailSettings['mail_username'] ?? config('mail.mailers.smtp.username', ''),
|
||||
'mail_password' => $mailSettings['mail_password'] ?? config('mail.mailers.smtp.password', ''),
|
||||
'mail_encryption' => $mailSettings['mail_encryption'] ?? config('mail.mailers.smtp.encryption', 'none'),
|
||||
'mail_scheme' => $mailSettings['mail_scheme'] ?? '',
|
||||
'mail_url' => $mailSettings['mail_url'] ?? '',
|
||||
'mail_timeout' => $mailSettings['mail_timeout'] ?? '',
|
||||
'mail_local_domain' => $mailSettings['mail_local_domain'] ?? '',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'mailgun':
|
||||
$MailData = array_merge($MailData, [
|
||||
'mail_mailgun_domain' => $mailSettings['mail_mailgun_domain'] ?? '',
|
||||
'mail_mailgun_secret' => $mailSettings['mail_mailgun_secret'] ?? '',
|
||||
'mail_mailgun_endpoint' => $mailSettings['mail_mailgun_endpoint'] ?? 'api.mailgun.net',
|
||||
'mail_mailgun_scheme' => $mailSettings['mail_mailgun_scheme'] ?? 'https',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'ses':
|
||||
$MailData = array_merge($MailData, [
|
||||
'mail_ses_key' => $mailSettings['mail_ses_key'] ?? '',
|
||||
'mail_ses_secret' => $mailSettings['mail_ses_secret'] ?? '',
|
||||
'mail_ses_region' => $mailSettings['mail_ses_region'] ?? 'us-east-1',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'sendmail':
|
||||
$MailData = array_merge($MailData, [
|
||||
'mail_sendmail_path' => $mailSettings['mail_sendmail_path'] ?? '/usr/sbin/sendmail -bs -i',
|
||||
]);
|
||||
break;
|
||||
|
||||
default:
|
||||
// For unknown drivers, return minimal configuration
|
||||
break;
|
||||
}
|
||||
|
||||
return response()->json($MailData);
|
||||
return response()->json($this->mailConfigurationService->getGlobalConfig());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -215,15 +64,7 @@ class MailConfigurationController extends Controller
|
||||
{
|
||||
$this->authorize('manage email config');
|
||||
|
||||
$drivers = [
|
||||
'smtp',
|
||||
'mail',
|
||||
'sendmail',
|
||||
'mailgun',
|
||||
'ses',
|
||||
];
|
||||
|
||||
return response()->json($drivers);
|
||||
return response()->json($this->mailConfigurationService->getAvailableDrivers());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -3,135 +3,38 @@
|
||||
namespace App\Http\Controllers\Company\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\CompanyMailConfigurationRequest;
|
||||
use App\Mail\TestMail;
|
||||
use App\Models\CompanySetting;
|
||||
use App\Services\CompanyMailConfigService;
|
||||
use App\Services\MailConfigurationService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Mail;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class CompanyMailConfigurationController extends Controller
|
||||
{
|
||||
public function __construct(private readonly MailConfigurationService $mailConfigurationService) {}
|
||||
|
||||
public function getDefaultConfig(Request $request): JsonResponse
|
||||
{
|
||||
$mailConfig = [
|
||||
'from_name' => config('mail.from.name'),
|
||||
'from_mail' => config('mail.from.address'),
|
||||
];
|
||||
|
||||
return response()->json($mailConfig);
|
||||
return response()->json($this->mailConfigurationService->getDefaultConfig());
|
||||
}
|
||||
|
||||
public function getMailConfig(Request $request): JsonResponse
|
||||
{
|
||||
$companyId = $request->header('company');
|
||||
|
||||
$useCustom = CompanySetting::getSetting('use_custom_mail_config', $companyId) ?? 'NO';
|
||||
$driver = CompanySetting::getSetting('company_mail_driver', $companyId) ?? '';
|
||||
|
||||
$data = [
|
||||
'use_custom_mail_config' => $useCustom,
|
||||
'mail_driver' => $driver,
|
||||
'from_name' => CompanySetting::getSetting('company_from_name', $companyId) ?? '',
|
||||
'from_mail' => CompanySetting::getSetting('company_from_mail', $companyId) ?? '',
|
||||
];
|
||||
|
||||
switch ($driver) {
|
||||
case 'smtp':
|
||||
$data = array_merge($data, [
|
||||
'mail_host' => CompanySetting::getSetting('company_mail_host', $companyId) ?? '',
|
||||
'mail_port' => CompanySetting::getSetting('company_mail_port', $companyId) ?? '',
|
||||
'mail_username' => CompanySetting::getSetting('company_mail_username', $companyId) ?? '',
|
||||
'mail_password' => CompanySetting::getSetting('company_mail_password', $companyId) ?? '',
|
||||
'mail_encryption' => CompanySetting::getSetting('company_mail_encryption', $companyId) ?? 'none',
|
||||
'mail_scheme' => CompanySetting::getSetting('company_mail_scheme', $companyId) ?? '',
|
||||
'mail_url' => CompanySetting::getSetting('company_mail_url', $companyId) ?? '',
|
||||
'mail_timeout' => CompanySetting::getSetting('company_mail_timeout', $companyId) ?? '',
|
||||
'mail_local_domain' => CompanySetting::getSetting('company_mail_local_domain', $companyId) ?? '',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'mailgun':
|
||||
$data = array_merge($data, [
|
||||
'mail_mailgun_domain' => CompanySetting::getSetting('company_mail_mailgun_domain', $companyId) ?? '',
|
||||
'mail_mailgun_secret' => CompanySetting::getSetting('company_mail_mailgun_secret', $companyId) ?? '',
|
||||
'mail_mailgun_endpoint' => CompanySetting::getSetting('company_mail_mailgun_endpoint', $companyId) ?? 'api.mailgun.net',
|
||||
'mail_mailgun_scheme' => CompanySetting::getSetting('company_mail_mailgun_scheme', $companyId) ?? 'https',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'ses':
|
||||
$data = array_merge($data, [
|
||||
'mail_ses_key' => CompanySetting::getSetting('company_mail_ses_key', $companyId) ?? '',
|
||||
'mail_ses_secret' => CompanySetting::getSetting('company_mail_ses_secret', $companyId) ?? '',
|
||||
'mail_ses_region' => CompanySetting::getSetting('company_mail_ses_region', $companyId) ?? 'us-east-1',
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'sendmail':
|
||||
$data = array_merge($data, [
|
||||
'mail_sendmail_path' => CompanySetting::getSetting('company_mail_sendmail_path', $companyId) ?? '/usr/sbin/sendmail -bs -i',
|
||||
]);
|
||||
break;
|
||||
}
|
||||
|
||||
return response()->json($data);
|
||||
return response()->json(
|
||||
$this->mailConfigurationService->getCompanyConfig($request->header('company'))
|
||||
);
|
||||
}
|
||||
|
||||
public function saveMailConfig(Request $request): JsonResponse
|
||||
public function saveMailConfig(CompanyMailConfigurationRequest $request): JsonResponse
|
||||
{
|
||||
$this->authorize('owner only');
|
||||
|
||||
$companyId = $request->header('company');
|
||||
$driver = $request->get('mail_driver', '');
|
||||
|
||||
$settings = [
|
||||
'use_custom_mail_config' => $request->get('use_custom_mail_config', 'NO'),
|
||||
'company_mail_driver' => $driver,
|
||||
'company_from_name' => $request->get('from_name', ''),
|
||||
'company_from_mail' => $request->get('from_mail', ''),
|
||||
];
|
||||
|
||||
switch ($driver) {
|
||||
case 'smtp':
|
||||
$settings = array_merge($settings, [
|
||||
'company_mail_host' => $request->get('mail_host', ''),
|
||||
'company_mail_port' => $request->get('mail_port', ''),
|
||||
'company_mail_username' => $request->get('mail_username', ''),
|
||||
'company_mail_password' => $request->get('mail_password', ''),
|
||||
'company_mail_encryption' => $request->get('mail_encryption', 'none'),
|
||||
'company_mail_scheme' => $request->get('mail_scheme', ''),
|
||||
'company_mail_url' => $request->get('mail_url', ''),
|
||||
'company_mail_timeout' => $request->get('mail_timeout', ''),
|
||||
'company_mail_local_domain' => $request->get('mail_local_domain', ''),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'mailgun':
|
||||
$settings = array_merge($settings, [
|
||||
'company_mail_mailgun_domain' => $request->get('mail_mailgun_domain', ''),
|
||||
'company_mail_mailgun_secret' => $request->get('mail_mailgun_secret', ''),
|
||||
'company_mail_mailgun_endpoint' => $request->get('mail_mailgun_endpoint', 'api.mailgun.net'),
|
||||
'company_mail_mailgun_scheme' => $request->get('mail_mailgun_scheme', 'https'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'ses':
|
||||
$settings = array_merge($settings, [
|
||||
'company_mail_ses_key' => $request->get('mail_ses_key', ''),
|
||||
'company_mail_ses_secret' => $request->get('mail_ses_secret', ''),
|
||||
'company_mail_ses_region' => $request->get('mail_ses_region', 'us-east-1'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'sendmail':
|
||||
$settings = array_merge($settings, [
|
||||
'company_mail_sendmail_path' => $request->get('mail_sendmail_path', '/usr/sbin/sendmail -bs -i'),
|
||||
]);
|
||||
break;
|
||||
}
|
||||
|
||||
CompanySetting::setSettings($settings, $companyId);
|
||||
$this->mailConfigurationService->saveCompanyConfig(
|
||||
$request->header('company'),
|
||||
$request->validated()
|
||||
);
|
||||
|
||||
return response()->json(['success' => true]);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ class DatabaseConfigurationController extends Controller
|
||||
case 'sqlite':
|
||||
$databaseData = [
|
||||
'database_connection' => 'sqlite',
|
||||
'database_name' => config('database.connections.sqlite.database', storage_path('database.sqlite')),
|
||||
'database_name' => config('database.connections.sqlite.database') ?: 'storage/app/database.sqlite',
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
@@ -4,26 +4,47 @@ namespace App\Http\Controllers\Setup;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\User;
|
||||
use Auth;
|
||||
use App\Support\InstallWizardAuth;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class LoginController extends Controller
|
||||
{
|
||||
/**
|
||||
* Handle the incoming request.
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function __invoke(Request $request)
|
||||
public function __invoke(Request $request): JsonResponse
|
||||
{
|
||||
$user = User::where('role', 'super admin')->first();
|
||||
Auth::login($user);
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'message' => 'Super admin user not found.',
|
||||
], 404);
|
||||
}
|
||||
|
||||
$company = $user->companies()->first();
|
||||
if (! $company) {
|
||||
return response()->json([
|
||||
'message' => 'Super admin company not found.',
|
||||
], 422);
|
||||
}
|
||||
|
||||
Auth::guard('web')->logout();
|
||||
if ($request->hasSession()) {
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
}
|
||||
|
||||
$user->tokens()->where('name', InstallWizardAuth::TOKEN_NAME)->delete();
|
||||
$token = $user->createToken(
|
||||
InstallWizardAuth::TOKEN_NAME,
|
||||
[InstallWizardAuth::TOKEN_ABILITY],
|
||||
)->plainTextToken;
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'type' => 'Bearer',
|
||||
'token' => $token,
|
||||
'user' => $user,
|
||||
'company' => $user->companies()->first(),
|
||||
'company' => $company,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
35
app/Http/Controllers/Setup/SessionLoginController.php
Normal file
35
app/Http/Controllers/Setup/SessionLoginController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Setup;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class SessionLoginController extends Controller
|
||||
{
|
||||
public function __invoke(Request $request): JsonResponse
|
||||
{
|
||||
$user = $request->user();
|
||||
|
||||
if (Auth::guard('web')->check()) {
|
||||
Auth::guard('web')->logout();
|
||||
}
|
||||
|
||||
if ($request->hasSession()) {
|
||||
$request->session()->invalidate();
|
||||
$request->session()->regenerateToken();
|
||||
}
|
||||
|
||||
Auth::guard('web')->login($user);
|
||||
|
||||
if ($request->hasSession()) {
|
||||
$request->session()->regenerate();
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user