mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 09:14:08 +00:00
Move global admin controllers from Admin to SuperAdmin namespace
Backup, Update, Modules, and global Settings controllers (mail config, PDF config, disk management, global settings) are application-wide features not scoped to a company. Move them from Admin/ to SuperAdmin/ to match the v3.0 UI structure where these live under Administration. Company-scoped settings controllers remain in Admin/Settings/.
This commit is contained in:
Darko Gjorgjijoski
@@ -1,195 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V1\Admin\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\DiskEnvironmentRequest;
|
||||
use App\Http\Resources\FileDiskResource;
|
||||
use App\Models\FileDisk;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class DiskController extends Controller
|
||||
{
|
||||
/**
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$limit = $request->has('limit') ? $request->limit : 5;
|
||||
$disks = FileDisk::applyFilters($request->all())
|
||||
->latest()
|
||||
->paginateData($limit);
|
||||
|
||||
return FileDiskResource::collection($disks);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(DiskEnvironmentRequest $request)
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
if (! FileDisk::validateCredentials($request->credentials, $request->driver)) {
|
||||
return respondJson('invalid_credentials', 'Invalid Credentials.');
|
||||
}
|
||||
|
||||
$disk = FileDisk::createDisk($request);
|
||||
|
||||
return new FileDiskResource($disk);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param FileDisk $file_disk
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(FileDisk $disk, Request $request)
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$credentials = $request->credentials;
|
||||
$driver = $request->driver;
|
||||
|
||||
if ($credentials && $driver && $disk->type !== 'SYSTEM') {
|
||||
if (! FileDisk::validateCredentials($credentials, $driver)) {
|
||||
return respondJson('invalid_credentials', 'Invalid Credentials.');
|
||||
}
|
||||
|
||||
$disk->updateDisk($request);
|
||||
} elseif ($request->set_as_default) {
|
||||
$disk->setAsDefaultDisk();
|
||||
}
|
||||
|
||||
return new FileDiskResource($disk);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function show($disk)
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$diskData = [];
|
||||
switch ($disk) {
|
||||
case 'local':
|
||||
$diskData = [
|
||||
'root' => config('filesystems.disks.local.root'),
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
case 's3':
|
||||
$diskData = [
|
||||
'key' => '',
|
||||
'secret' => '',
|
||||
'region' => '',
|
||||
'bucket' => '',
|
||||
'root' => '',
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
case 's3compat':
|
||||
$diskData = [
|
||||
'endpoint' => '',
|
||||
'key' => '',
|
||||
'secret' => '',
|
||||
'region' => '',
|
||||
'bucket' => '',
|
||||
'root' => '',
|
||||
];
|
||||
|
||||
case 'doSpaces':
|
||||
$diskData = [
|
||||
'key' => '',
|
||||
'secret' => '',
|
||||
'region' => '',
|
||||
'bucket' => '',
|
||||
'endpoint' => '',
|
||||
'root' => '',
|
||||
];
|
||||
|
||||
break;
|
||||
|
||||
case 'dropbox':
|
||||
$diskData = [
|
||||
'token' => '',
|
||||
'key' => '',
|
||||
'secret' => '',
|
||||
'app' => '',
|
||||
'root' => '',
|
||||
];
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
$data = array_merge($diskData);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param FileDisk $taxType
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(FileDisk $disk)
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
if ($disk->setAsDefault() && $disk->type === 'SYSTEM') {
|
||||
return respondJson('not_allowed', 'Not Allowed');
|
||||
}
|
||||
|
||||
$disk->delete();
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function getDiskDrivers()
|
||||
{
|
||||
$this->authorize('manage file disk');
|
||||
|
||||
$drivers = [
|
||||
[
|
||||
'name' => 'Local',
|
||||
'value' => 'local',
|
||||
],
|
||||
[
|
||||
'name' => 'Amazon S3',
|
||||
'value' => 's3',
|
||||
],
|
||||
[
|
||||
'name' => 'S3 Compatible Storage',
|
||||
'value' => 's3compat',
|
||||
],
|
||||
[
|
||||
'name' => 'Digital Ocean Spaces',
|
||||
'value' => 'doSpaces',
|
||||
],
|
||||
[
|
||||
'name' => 'Dropbox',
|
||||
'value' => 'dropbox',
|
||||
],
|
||||
];
|
||||
|
||||
$default = config('filesystems.default');
|
||||
|
||||
return response()->json([
|
||||
'drivers' => $drivers,
|
||||
'default' => $default,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V1\Admin\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\GetSettingRequest;
|
||||
use App\Models\Setting;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class GetSettingsController extends Controller
|
||||
{
|
||||
/**
|
||||
* Handle the incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function __invoke(GetSettingRequest $request)
|
||||
{
|
||||
$this->authorize('manage settings');
|
||||
|
||||
$setting = Setting::getSetting($request->key);
|
||||
|
||||
return response()->json([
|
||||
$request->key => $setting,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -1,257 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V1\Admin\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\MailEnvironmentRequest;
|
||||
use App\Mail\TestMail;
|
||||
use App\Models\Setting;
|
||||
use App\Services\Installation\EnvironmentManager;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the mail environment variables
|
||||
*
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public function saveMailEnvironment(MailEnvironmentRequest $request)
|
||||
{
|
||||
$this->authorize('manage email config');
|
||||
|
||||
$setting = Setting::getSetting('profile_complete');
|
||||
|
||||
// Prepare mail settings for database storage
|
||||
$mailSettings = $this->prepareMailSettingsForDatabase($request);
|
||||
|
||||
// Save mail settings to database
|
||||
Setting::setSettings($mailSettings);
|
||||
|
||||
if ($setting !== 'COMPLETED') {
|
||||
Setting::setSetting('profile_complete', 4);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'success' => 'mail_variables_save_successfully',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare mail settings for database storage
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function prepareMailSettingsForDatabase(MailEnvironmentRequest $request)
|
||||
{
|
||||
$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
|
||||
*
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public function getMailEnvironment()
|
||||
{
|
||||
$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 the available mail drivers
|
||||
*
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public function getMailDrivers()
|
||||
{
|
||||
$this->authorize('manage email config');
|
||||
|
||||
$drivers = [
|
||||
'smtp',
|
||||
'mail',
|
||||
'sendmail',
|
||||
'mailgun',
|
||||
'ses',
|
||||
];
|
||||
|
||||
return response()->json($drivers);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the email configuration
|
||||
*
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function testEmailConfig(Request $request)
|
||||
{
|
||||
$this->authorize('manage email config');
|
||||
|
||||
$this->validate($request, [
|
||||
'to' => 'required|email',
|
||||
'subject' => 'required',
|
||||
'message' => 'required',
|
||||
]);
|
||||
|
||||
Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V1\Admin\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\PDFConfigurationRequest;
|
||||
use App\Models\Setting;
|
||||
use App\Services\Installation\EnvironmentManager;
|
||||
|
||||
class PDFConfigurationController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var EnvironmentManager
|
||||
*/
|
||||
protected $environmentManager;
|
||||
|
||||
public function __construct(EnvironmentManager $environmentManager)
|
||||
{
|
||||
$this->environmentManager = $environmentManager;
|
||||
}
|
||||
|
||||
public function getDrivers()
|
||||
{
|
||||
$this->authorize('manage pdf config');
|
||||
|
||||
$drivers = [
|
||||
'dompdf',
|
||||
'gotenberg',
|
||||
];
|
||||
|
||||
return response()->json($drivers);
|
||||
}
|
||||
|
||||
public function getEnvironment()
|
||||
{
|
||||
$this->authorize('manage pdf config');
|
||||
|
||||
// Get PDF settings from database
|
||||
$pdfSettings = Setting::getSettings([
|
||||
'pdf_driver',
|
||||
'gotenberg_host',
|
||||
'gotenberg_papersize',
|
||||
'gotenberg_margins',
|
||||
]);
|
||||
|
||||
$config = [
|
||||
'pdf_driver' => $pdfSettings['pdf_driver'] ?? config('pdf.driver'),
|
||||
'gotenberg_host' => $pdfSettings['gotenberg_host'] ?? config('pdf.connections.gotenberg.host'),
|
||||
'gotenberg_margins' => $pdfSettings['gotenberg_margins'] ?? config('pdf.connections.gotenberg.margins'),
|
||||
'gotenberg_papersize' => $pdfSettings['gotenberg_papersize'] ?? config('pdf.connections.gotenberg.papersize'),
|
||||
];
|
||||
|
||||
return response()->json($config);
|
||||
}
|
||||
|
||||
public function saveEnvironment(PDFConfigurationRequest $request)
|
||||
{
|
||||
$this->authorize('manage pdf config');
|
||||
|
||||
// Prepare PDF settings for database storage
|
||||
$pdfSettings = $this->preparePDFSettingsForDatabase($request);
|
||||
|
||||
// Save PDF settings to database
|
||||
Setting::setSettings($pdfSettings);
|
||||
|
||||
return response()->json([
|
||||
'success' => 'pdf_variables_save_successfully',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare PDF settings for database storage
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function preparePDFSettingsForDatabase(PDFConfigurationRequest $request)
|
||||
{
|
||||
$driver = $request->get('pdf_driver');
|
||||
|
||||
// Base settings that are always saved
|
||||
$settings = [
|
||||
'pdf_driver' => $driver,
|
||||
];
|
||||
|
||||
// Driver-specific settings
|
||||
switch ($driver) {
|
||||
case 'gotenberg':
|
||||
$settings = array_merge($settings, [
|
||||
'gotenberg_host' => $request->get('gotenberg_host'),
|
||||
'gotenberg_papersize' => $request->get('gotenberg_papersize'),
|
||||
'gotenberg_margins' => $request->get('gotenberg_margins'),
|
||||
]);
|
||||
break;
|
||||
|
||||
case 'dompdf':
|
||||
// dompdf doesn't have additional configuration in the current setup
|
||||
break;
|
||||
}
|
||||
|
||||
return $settings;
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\V1\Admin\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\SettingRequest;
|
||||
use App\Models\Setting;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class UpdateSettingsController extends Controller
|
||||
{
|
||||
/**
|
||||
* Handle the incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function __invoke(SettingRequest $request)
|
||||
{
|
||||
$this->authorize('manage settings');
|
||||
|
||||
Setting::setSettings($request->settings);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
$request->settings,
|
||||
]);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user