mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-05 18:23:48 +00:00
ftp setup added
This commit is contained in:
@@ -86,6 +86,7 @@ class UploadFileAction
|
||||
match (config('filesystems.default')) {
|
||||
's3' => ($this->moveFileToExternalStorage)($fileName, $user->id),
|
||||
'ftp', 'azure' => ($this->moveFileToFTPStorage)($fileName, $user->id),
|
||||
default => null
|
||||
};
|
||||
|
||||
// Create new file
|
||||
|
||||
43
src/Domain/Settings/Actions/TestFTPConnectionAction.php
Normal file
43
src/Domain/Settings/Actions/TestFTPConnectionAction.php
Normal file
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
namespace Domain\Settings\Actions;
|
||||
|
||||
use ErrorException;
|
||||
use League\Flysystem\Ftp\UnableToAuthenticate;
|
||||
use League\Flysystem\UnableToWriteFile;
|
||||
use Storage;
|
||||
|
||||
class TestFTPConnectionAction
|
||||
{
|
||||
public function __invoke(array $credentials)
|
||||
{
|
||||
try {
|
||||
// Set temporary ftp connection
|
||||
config([
|
||||
'filesystems.disks.ftp' => [
|
||||
'driver' => 'ftp',
|
||||
'host' => $credentials['host'],
|
||||
'username' => $credentials['user'],
|
||||
'password' => $credentials['password'],
|
||||
],
|
||||
]);
|
||||
|
||||
// Try to get files
|
||||
Storage::disk('ftp')->allFiles();
|
||||
|
||||
// Try to create folder
|
||||
Storage::disk('ftp')->makeDirectory('ftp-test');
|
||||
|
||||
// Delete test folder
|
||||
Storage::disk('ftp')->deleteDirectory('ftp-test');
|
||||
} catch (ErrorException | UnableToWriteFile | UnableToAuthenticate $error) {
|
||||
abort(
|
||||
response()->json([
|
||||
'type' => 'ftp-connection-error',
|
||||
'title' => 'FTP Connection Error',
|
||||
'message' => $error->getMessage(),
|
||||
], 401)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@ class TestS3ConnectionAction
|
||||
abort(
|
||||
response()->json([
|
||||
'type' => 's3-connection-error',
|
||||
'title' => 'S3 Connection Error',
|
||||
'title' => 'S3 Connection Error - Wrong Credentials or Not Permitted',
|
||||
'message' => $error->getMessage(),
|
||||
], 401)
|
||||
);
|
||||
|
||||
@@ -39,7 +39,7 @@ class TestSMTPConnectionAction
|
||||
abort(
|
||||
response()->json([
|
||||
'type' => 'mailer-connection-error',
|
||||
'title' => 'Mail Connection Error',
|
||||
'title' => 'Mailer Connection Error - Wrong Credentials',
|
||||
'message' => $error->getMessage(),
|
||||
], 401)
|
||||
);
|
||||
|
||||
@@ -2,9 +2,8 @@
|
||||
namespace Domain\Settings\Controllers;
|
||||
|
||||
use Artisan;
|
||||
use Domain\Settings\Actions\TestFTPConnectionAction;
|
||||
use Illuminate\Http\Response;
|
||||
use Aws\S3\Exception\S3Exception;
|
||||
use League\Flysystem\UnableToWriteFile;
|
||||
use Domain\Settings\DTO\S3CredentialsData;
|
||||
use Domain\Settings\Actions\TestS3ConnectionAction;
|
||||
use Domain\Settings\Requests\StoreStorageCredentialsRequest;
|
||||
@@ -12,9 +11,9 @@ use Domain\Settings\Requests\StoreStorageCredentialsRequest;
|
||||
class StoreStorageCredentialsController
|
||||
{
|
||||
public function __construct(
|
||||
private TestFTPConnectionAction $testFTPConnection,
|
||||
private TestS3ConnectionAction $testS3Connection,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Set new email credentials to .env file
|
||||
@@ -24,20 +23,27 @@ class StoreStorageCredentialsController
|
||||
// Abort in demo mode
|
||||
abort_if(is_demo(), 204, 'Done.');
|
||||
|
||||
// Get storage driver from request
|
||||
$driver = match ($request->input('storage.driver')) {
|
||||
's3', 'storj', 'spaces', 'wasabi', 'backblaze', 'oss', 'other' => 's3',
|
||||
'local' => 'local',
|
||||
'ftp' => 'ftp',
|
||||
};
|
||||
|
||||
if (! app()->runningUnitTests()) {
|
||||
// Test s3 credentials
|
||||
if ($request->input('storage.driver') !== 'local') {
|
||||
try {
|
||||
// connect to the s3
|
||||
($this->testS3Connection)(S3CredentialsData::fromRequest($request));
|
||||
} catch (S3Exception | UnableToWriteFile $error) {
|
||||
return response([
|
||||
'type' => 's3-connection-error',
|
||||
'title' => 'S3 Connection Error',
|
||||
'message' => $error->getMessage(),
|
||||
], 401);
|
||||
}
|
||||
}
|
||||
|
||||
// Test driver connection
|
||||
match ($driver) {
|
||||
's3' => ($this->testS3Connection)(
|
||||
S3CredentialsData::fromRequest($request)
|
||||
),
|
||||
'ftp' => ($this->testFTPConnection)([
|
||||
'host' => $request->input('storage.ftp.host'),
|
||||
'user' => $request->input('storage.ftp.user'),
|
||||
'password' => $request->input('storage.ftp.password'),
|
||||
]),
|
||||
default => null
|
||||
};
|
||||
|
||||
$drivers = [
|
||||
'local' => [
|
||||
@@ -45,17 +51,20 @@ class StoreStorageCredentialsController
|
||||
],
|
||||
's3' => [
|
||||
'FILESYSTEM_DISK' => 's3',
|
||||
'S3_ACCESS_KEY_ID' => $request->input('storage.key') ?? null,
|
||||
'S3_SECRET_ACCESS_KEY' => $request->input('storage.secret') ?? null,
|
||||
'S3_DEFAULT_REGION' => $request->input('storage.region') ?? null,
|
||||
'S3_BUCKET' => $request->input('storage.bucket') ?? null,
|
||||
'S3_URL' => $request->input('storage.endpoint') ?? null,
|
||||
'S3_ACCESS_KEY_ID' => $request->input('storage.s3.key') ?? null,
|
||||
'S3_SECRET_ACCESS_KEY' => $request->input('storage.s3.secret') ?? null,
|
||||
'S3_DEFAULT_REGION' => $request->input('storage.s3.region') ?? null,
|
||||
'S3_BUCKET' => $request->input('storage.s3.bucket') ?? null,
|
||||
'S3_URL' => $request->input('storage.s3.endpoint') ?? null,
|
||||
],
|
||||
'ftp' => [
|
||||
'FILESYSTEM_DISK' => 'ftp',
|
||||
'FTP_HOST' => $request->input('storage.ftp.host') ?? null,
|
||||
'FTP_USERNAME' => $request->input('storage.ftp.user') ?? null,
|
||||
'FTP_PASSWORD' => $request->input('storage.ftp.password') ?? null,
|
||||
],
|
||||
];
|
||||
|
||||
// Get storage driver from request
|
||||
$driver = 'local' === $request->input('storage.driver') ? 'local' : 's3';
|
||||
|
||||
// Storage credentials for storage
|
||||
setEnvironmentValue($drivers[$driver]);
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@ class S3CredentialsData extends DataTransferObject
|
||||
public static function fromRequest($request): self
|
||||
{
|
||||
return new self([
|
||||
'key' => $request->input('storage.key'),
|
||||
'secret' => $request->input('storage.secret'),
|
||||
'region' => $request->input('storage.region'),
|
||||
'bucket' => $request->input('storage.bucket'),
|
||||
'endpoint' => $request->input('storage.endpoint'),
|
||||
'key' => $request->input('storage.s3.key'),
|
||||
'secret' => $request->input('storage.s3.secret'),
|
||||
'region' => $request->input('storage.s3.region'),
|
||||
'bucket' => $request->input('storage.s3.bucket'),
|
||||
'endpoint' => $request->input('storage.s3.endpoint'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
namespace Domain\SetupWizard\Controllers;
|
||||
|
||||
use Artisan;
|
||||
use Domain\Settings\Actions\TestFTPConnectionAction;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Domain\Settings\DTO\S3CredentialsData;
|
||||
@@ -17,11 +18,11 @@ class StoreEnvironmentSettingsController extends Controller
|
||||
public function __construct(
|
||||
private TestS3ConnectionAction $testS3Connection,
|
||||
private TestSESConnectionAction $testSESConnection,
|
||||
private TestFTPConnectionAction $testFTPConnection,
|
||||
private TestSMTPConnectionAction $testSMTPConnection,
|
||||
private TestMailgunConnectionAction $testMailgunConnection,
|
||||
private TestPostmarkConnectionAction $testPostmarkConnection,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Store environment setup
|
||||
@@ -30,10 +31,25 @@ class StoreEnvironmentSettingsController extends Controller
|
||||
StoreEnvironmentSetupRequest $request,
|
||||
): JsonResponse {
|
||||
if (! app()->runningUnitTests()) {
|
||||
// Test s3 credentials
|
||||
if ($request->input('storage.driver') !== 'local') {
|
||||
($this->testS3Connection)(S3CredentialsData::fromRequest($request));
|
||||
}
|
||||
// Get storage driver from request
|
||||
$StorageDriver = match ($request->input('storage.driver')) {
|
||||
's3', 'storj', 'spaces', 'wasabi', 'backblaze', 'oss', 'other' => 's3',
|
||||
'local' => 'local',
|
||||
'ftp' => 'ftp',
|
||||
};
|
||||
|
||||
// Test driver connection
|
||||
match ($StorageDriver) {
|
||||
's3' => ($this->testS3Connection)(
|
||||
S3CredentialsData::fromRequest($request)
|
||||
),
|
||||
'ftp' => ($this->testFTPConnection)([
|
||||
'host' => $request->input('storage.ftp.host'),
|
||||
'user' => $request->input('storage.ftp.user'),
|
||||
'password' => $request->input('storage.ftp.password'),
|
||||
]),
|
||||
default => null
|
||||
};
|
||||
|
||||
// Test email connection
|
||||
match ($request->input('mailDriver')) {
|
||||
@@ -93,11 +109,17 @@ class StoreEnvironmentSettingsController extends Controller
|
||||
],
|
||||
's3' => [
|
||||
'FILESYSTEM_DISK' => 's3',
|
||||
'S3_ACCESS_KEY_ID' => $request->input('storage.key') ?? null,
|
||||
'S3_SECRET_ACCESS_KEY' => $request->input('storage.secret') ?? null,
|
||||
'S3_DEFAULT_REGION' => $request->input('storage.region') ?? null,
|
||||
'S3_BUCKET' => $request->input('storage.bucket') ?? null,
|
||||
'S3_URL' => $request->input('storage.endpoint') ?? null,
|
||||
'S3_ACCESS_KEY_ID' => $request->input('storage.s3.key') ?? null,
|
||||
'S3_SECRET_ACCESS_KEY' => $request->input('storage.s3.secret') ?? null,
|
||||
'S3_DEFAULT_REGION' => $request->input('storage.s3.region') ?? null,
|
||||
'S3_BUCKET' => $request->input('storage.s3.bucket') ?? null,
|
||||
'S3_URL' => $request->input('storage.s3.endpoint') ?? null,
|
||||
],
|
||||
'ftp' => [
|
||||
'FILESYSTEM_DISK' => 'ftp',
|
||||
'FTP_HOST' => $request->input('storage.ftp.host') ?? null,
|
||||
'FTP_USERNAME' => $request->input('storage.ftp.user') ?? null,
|
||||
'FTP_PASSWORD' => $request->input('storage.ftp.password') ?? null,
|
||||
],
|
||||
],
|
||||
'mail' => [
|
||||
@@ -155,15 +177,12 @@ class StoreEnvironmentSettingsController extends Controller
|
||||
],
|
||||
];
|
||||
|
||||
// Get storage driver from request
|
||||
$driver = 'local' === $request->input('storage.driver') ? 'local' : 's3';
|
||||
|
||||
// Set other environment variables
|
||||
setEnvironmentValue(array_merge(
|
||||
$setup['broadcasting'][$request->input('broadcast.driver')],
|
||||
$setup['environment'][$request->input('environment')],
|
||||
$setup['mail'][$request->input('mailDriver')],
|
||||
$setup['drivers'][$driver],
|
||||
$setup['drivers'][$StorageDriver],
|
||||
$setup['others'],
|
||||
));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user