From b0829c71e9f63ff942fa6513a8384f0face2e02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 29 Mar 2022 12:29:32 +0200 Subject: [PATCH] build --- .env.testing | 2 +- config/vuefilemanager.php | 2 +- routes/web.php | 2 +- src/App/Users/Models/User.php | 1 - src/App/Users/Resources/UserResource.php | 4 +-- .../Dashboard/GetDashboardDataController.php | 10 +++--- .../Users/DeleteUserController.php | 1 - .../FileAccess/GetFileController.php | 4 +-- .../FileAccess/GetThumbnailController.php | 6 ++-- .../FileAccess/VisitorGetFileController.php | 4 +-- .../Controllers/FavouriteController.php | 2 +- .../Homepage/Mail/SendContactMessage.php | 3 +- .../Items/Actions/MoveFileOrFolderAction.php | 11 +++---- .../DirectlyDownloadFileController.php | 32 +++++++++---------- .../Controllers/ShareViaEmailController.php | 3 +- .../Notifications/SharedSendViaEmail.php | 3 +- .../GetFileFromUploadRequestController.php | 2 +- src/Support/errors.php | 8 +++-- tests/Domain/Admin/DashboardTest.php | 3 +- 19 files changed, 51 insertions(+), 52 deletions(-) diff --git a/.env.testing b/.env.testing index 987cc8cf..a3a55d3e 100644 --- a/.env.testing +++ b/.env.testing @@ -1,6 +1,6 @@ APP_NAME=Laravel APP_ENV=local -APP_KEY=base64:X7/vUveJtTmrC1J+UFXb9m6l1RBbAoJvNyj7sMC+GFI= +APP_KEY=base64:Rv3QVmDH6npEiVy+pKyyjWYyTJfMvsQdFZ2YA7hAclg= APP_DEBUG=true APP_URL=http://localhost APP_DEMO=false diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index 28dd84e0..b0d4ebf6 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -1,7 +1,7 @@ '2.0.8', + 'version' => '2.0.9', 'is_demo' => env('APP_DEMO', false), diff --git a/routes/web.php b/routes/web.php index 32e4635d..bfc8f5eb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,9 +4,9 @@ use Domain\Homepage\Controllers\IndexController; use Domain\Invoices\Controllers\GetInvoiceController; use Domain\Settings\Controllers\DownloadLogController; use App\Socialite\Controllers\SocialiteCallbackController; -use Domain\Sharing\Controllers\DirectlyDownloadFileController; use Domain\Sharing\Controllers\SharePublicIndexController; use Domain\Sharing\Controllers\WebCrawlerOpenGraphController; +use Domain\Sharing\Controllers\DirectlyDownloadFileController; use Domain\Localization\Controllers\CurrentLocalizationController; Route::get('/socialite/{provider}/callback', SocialiteCallbackController::class); diff --git a/src/App/Users/Models/User.php b/src/App/Users/Models/User.php index 1934c887..fe197b7f 100644 --- a/src/App/Users/Models/User.php +++ b/src/App/Users/Models/User.php @@ -223,7 +223,6 @@ class User extends Authenticatable implements MustVerifyEmail }); static::updating(function ($user) { - // Prevent to set 2fa in demo mode if (config('vuefilemanager.is_demo') && $user->email === 'howdy@hi5ve.digital') { $user->two_factor_secret = null; diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php index a68de301..853b3bcc 100644 --- a/src/App/Users/Resources/UserResource.php +++ b/src/App/Users/Resources/UserResource.php @@ -36,8 +36,8 @@ class UserResource extends JsonResource 'avatar' => $this->settings->avatar, 'email' => is_demo() ? obfuscate_email($this->email) : $this->email, 'role' => $this->role, - 'two_factor_authentication' => (bool)$this->two_factor_secret, - 'socialite_account' => !(bool)$this->password, + 'two_factor_authentication' => (bool) $this->two_factor_secret, + 'socialite_account' => ! (bool) $this->password, 'storage' => $this->storage, 'created_at' => format_date($this->created_at, 'd. M. Y'), 'updated_at' => format_date($this->updated_at, 'd. M. Y'), diff --git a/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php b/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php index 5feebcb1..5dbc4b75 100644 --- a/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php +++ b/src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php @@ -1,5 +1,4 @@ each(fn($record) => $record->date = format_date($record->date, 'd. M. Y')) + ->each(fn ($record) => $record->date = format_date($record->date, 'd. M. Y')) ->keyBy('date'); $mappedTrafficRecords = mapTrafficRecords($trafficRecords); - $upload = $mappedTrafficRecords->map(fn($record) => [ + $upload = $mappedTrafficRecords->map(fn ($record) => [ 'created_at' => $record->date, 'percentage' => intval($trafficRecords->max('upload')) !== 0 ? round(($record->upload / $trafficRecords->max('upload')) * 100, 2) : 0, 'amount' => Metric::bytes($record->upload)->format(), ]); - $download = $mappedTrafficRecords->map(fn($record) => [ + $download = $mappedTrafficRecords->map(fn ($record) => [ 'created_at' => $record->date, 'percentage' => intval($trafficRecords->max('download')) !== 0 ? round(($record->download / $trafficRecords->max('download')) * 100, 2) : 0, 'amount' => Metric::bytes($record->download)->format(), @@ -128,6 +127,7 @@ class GetDashboardDataController extends Controller $activeTranslationsCount = DB::table('language_translations') ->where('lang', 'en') ->count(); - return array($originalTranslationCount, $activeTranslationsCount); + + return [$originalTranslationCount, $activeTranslationsCount]; } } diff --git a/src/Domain/Admin/Controllers/Users/DeleteUserController.php b/src/Domain/Admin/Controllers/Users/DeleteUserController.php index 75fffb07..2c8ae299 100644 --- a/src/Domain/Admin/Controllers/Users/DeleteUserController.php +++ b/src/Domain/Admin/Controllers/Users/DeleteUserController.php @@ -7,7 +7,6 @@ use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; use Domain\Admin\Requests\DeleteUserRequest; use Domain\Admin\Actions\DeleteUserDataAction; -use Illuminate\Support\Str; class DeleteUserController extends Controller { diff --git a/src/Domain/Files/Controllers/FileAccess/GetFileController.php b/src/Domain/Files/Controllers/FileAccess/GetFileController.php index db7c45ef..cf1645db 100644 --- a/src/Domain/Files/Controllers/FileAccess/GetFileController.php +++ b/src/Domain/Files/Controllers/FileAccess/GetFileController.php @@ -2,10 +2,10 @@ namespace Domain\Files\Controllers\FileAccess; use Gate; -use Illuminate\Http\RedirectResponse; +use Domain\Files\Models\File; use Illuminate\Http\Response; use App\Http\Controllers\Controller; -use Domain\Files\Models\File; +use Illuminate\Http\RedirectResponse; use Domain\Files\Actions\DownloadFileAction; use Domain\Traffic\Actions\RecordDownloadAction; use Symfony\Component\HttpFoundation\StreamedResponse; diff --git a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php index 734b30d0..6987cbe5 100644 --- a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php +++ b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php @@ -4,9 +4,9 @@ namespace Domain\Files\Controllers\FileAccess; use Gate; use Illuminate\Http\Request; use Domain\Files\Models\File; +use Illuminate\Http\Response; use App\Http\Controllers\Controller; use Domain\Files\Actions\DownloadThumbnailAction; -use Illuminate\Http\Response; use Symfony\Component\HttpFoundation\StreamedResponse; use Illuminate\Contracts\Filesystem\FileNotFoundException; @@ -14,13 +14,13 @@ class GetThumbnailController extends Controller { public function __construct( private DownloadThumbnailAction $downloadThumbnail, - ) {} + ) { + } public function __invoke( Request $request, string $filename, ): FileNotFoundException | StreamedResponse | Response { - // Get requested thumbnail $file = File::withTrashed() ->where('basename', substr($filename, 3)) diff --git a/src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php b/src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php index 2188a617..fe868516 100644 --- a/src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php +++ b/src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php @@ -2,15 +2,15 @@ namespace Domain\Files\Controllers\FileAccess; use Domain\Files\Models\File; -use Illuminate\Http\RedirectResponse; use Illuminate\Http\Response; use Domain\Sharing\Models\Share; use App\Http\Controllers\Controller; +use Illuminate\Http\RedirectResponse; use Domain\Files\Actions\DownloadFileAction; use Domain\Traffic\Actions\RecordDownloadAction; use Domain\Sharing\Actions\ProtectShareRecordAction; -use Domain\Sharing\Actions\VerifyAccessToItemWithinAction; use Symfony\Component\HttpFoundation\StreamedResponse; +use Domain\Sharing\Actions\VerifyAccessToItemWithinAction; /** * Get file public diff --git a/src/Domain/Folders/Controllers/FavouriteController.php b/src/Domain/Folders/Controllers/FavouriteController.php index e055e2b9..736dde19 100644 --- a/src/Domain/Folders/Controllers/FavouriteController.php +++ b/src/Domain/Folders/Controllers/FavouriteController.php @@ -3,8 +3,8 @@ namespace Domain\Folders\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; -use App\Http\Controllers\Controller; use Illuminate\Support\Collection; +use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; class FavouriteController extends Controller diff --git a/src/Domain/Homepage/Mail/SendContactMessage.php b/src/Domain/Homepage/Mail/SendContactMessage.php index ee1d5203..b1f68dfb 100644 --- a/src/Domain/Homepage/Mail/SendContactMessage.php +++ b/src/Domain/Homepage/Mail/SendContactMessage.php @@ -11,7 +11,8 @@ class SendContactMessage extends Mailable public function __construct( private array $request - ) {} + ) { + } /** * Build the message. diff --git a/src/Domain/Items/Actions/MoveFileOrFolderAction.php b/src/Domain/Items/Actions/MoveFileOrFolderAction.php index 075f6147..88abdbf0 100644 --- a/src/Domain/Items/Actions/MoveFileOrFolderAction.php +++ b/src/Domain/Items/Actions/MoveFileOrFolderAction.php @@ -1,17 +1,17 @@ input('to_id')) ? false diff --git a/src/Domain/Sharing/Controllers/DirectlyDownloadFileController.php b/src/Domain/Sharing/Controllers/DirectlyDownloadFileController.php index 31f86d35..e219251c 100644 --- a/src/Domain/Sharing/Controllers/DirectlyDownloadFileController.php +++ b/src/Domain/Sharing/Controllers/DirectlyDownloadFileController.php @@ -1,32 +1,30 @@ type !== 'file') { return response('This content is not downloadable'); @@ -36,7 +34,7 @@ class DirectlyDownloadFileController extends Controller ($this->protectShareRecord)($share); // Check if user can download file - if (!$share->user->canDownload()) { + if (! $share->user->canDownload()) { return response([ 'type' => 'error', 'message' => 'This user action is not allowed.', @@ -59,4 +57,4 @@ class DirectlyDownloadFileController extends Controller return ($this->downloadFile)($file); } -} \ No newline at end of file +} diff --git a/src/Domain/Sharing/Controllers/ShareViaEmailController.php b/src/Domain/Sharing/Controllers/ShareViaEmailController.php index 1f16d384..cd4a5bdc 100644 --- a/src/Domain/Sharing/Controllers/ShareViaEmailController.php +++ b/src/Domain/Sharing/Controllers/ShareViaEmailController.php @@ -11,7 +11,8 @@ class ShareViaEmailController extends Controller { public function __construct( private SendViaEmailAction $sendLinkToEmailAction, - ) {} + ) { + } public function __invoke( Request $request, diff --git a/src/Domain/Sharing/Notifications/SharedSendViaEmail.php b/src/Domain/Sharing/Notifications/SharedSendViaEmail.php index 3df54877..81cf7733 100644 --- a/src/Domain/Sharing/Notifications/SharedSendViaEmail.php +++ b/src/Domain/Sharing/Notifications/SharedSendViaEmail.php @@ -16,7 +16,8 @@ class SharedSendViaEmail extends Notification public function __construct( public string $token, public User $user, - ) {} + ) { + } /** * Get the notification's delivery channels. diff --git a/src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php b/src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php index f88da1ec..855143f6 100644 --- a/src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php +++ b/src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php @@ -2,8 +2,8 @@ namespace Domain\UploadRequest\Controllers\FileAccess; use Domain\Files\Models\File; -use Illuminate\Http\RedirectResponse; use Illuminate\Http\Response; +use Illuminate\Http\RedirectResponse; use Domain\Files\Actions\DownloadFileAction; use Domain\UploadRequest\Models\UploadRequest; use Domain\Traffic\Actions\RecordDownloadAction; diff --git a/src/Support/errors.php b/src/Support/errors.php index fd61cac1..5eb7db27 100644 --- a/src/Support/errors.php +++ b/src/Support/errors.php @@ -1,15 +1,17 @@ 'error', 'message' => 'Access Denied', ]; } -function userActionNotAllowedError(): array { +function userActionNotAllowedError(): array +{ return [ 'type' => 'error', 'message' => 'This user action is not allowed.', ]; -} \ No newline at end of file +} diff --git a/tests/Domain/Admin/DashboardTest.php b/tests/Domain/Admin/DashboardTest.php index 9f2b972d..d505e815 100644 --- a/tests/Domain/Admin/DashboardTest.php +++ b/tests/Domain/Admin/DashboardTest.php @@ -1,5 +1,4 @@ create(['role' => 'admin']); $users->each( - fn($user) => $this + fn ($user) => $this ->actingAs($admin) ->getJson('/api/admin/dashboard/newbies') ->assertStatus(200)