controller refactoring part 7

routes/api.php

@@ -2,9 +2,8 @@
 
 use App\Users\Actions\CreateNewUserAction;
 use Domain\Pages\Controllers\PagesController;
-use Domain\Items\Controllers\EditItemsController;
 use Domain\Sharing\Controllers\ShareController;
-use Domain\Sharing\Controllers\ShareViaEmailController;
+use Domain\Items\Controllers\EditItemsController;
 use Domain\Trash\Controllers\DumpTrashController;
 use App\Users\Controllers\ResetPasswordController;
 use Domain\Zipping\Controllers\ZipFilesController;
@@ -15,11 +14,12 @@ use Domain\Plans\Controllers\ActivePlansController;
 use Domain\Settings\Controllers\SettingsController;
 use Domain\Zipping\Controllers\ZipFolderController;
 use Domain\Folders\Controllers\CreateFolderController;
+use Domain\Sharing\Controllers\ShareViaEmailController;
 use Domain\Trash\Controllers\RestoreTrashContentController;
 use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;
-use Domain\Browsing\Controllers\BrowseTrashContentController;
 use Domain\Homepage\Controllers\SendContactMessageController;
+use Domain\Browsing\Controllers\BrowseTrashContentController;
 use Domain\Browsing\Controllers\BrowseFolderContentController;
 use Domain\Folders\Controllers\NavigationFolderTreeController;
 use Domain\Browsing\Controllers\SearchFilesAndFoldersController;

routes/share.php

@@ -1,13 +1,17 @@
 <?php
 
-use Domain\Files\Controllers\EditorUploadFilesController;
-use Domain\Homepage\Controllers\AppFunctionsController;
-use Domain\Folders\Controllers\EditorCreateFolderController;
-use Domain\Sharing\Controllers\BrowseShareController;
-use Domain\Sharing\Controllers\ManipulateShareItemsController;
 use Domain\Sharing\Controllers\ShareController;
+use Domain\Sharing\Controllers\OGSiteController;
 use Domain\Zipping\Controllers\EditorZipFilesController;
+use Domain\Files\Controllers\EditorUploadFilesController;
 use Domain\Zipping\Controllers\EditorZipFolderController;
+use Domain\Folders\Controllers\EditorCreateFolderController;
+use Domain\Sharing\Controllers\ManipulateShareItemsController;
+use Domain\Files\Controllers\VisitorGetSingleFileResourceController;
+use Domain\Browsing\Controllers\VisitorBrowseFolderContentController;
+use Domain\Folders\Controllers\VisitorNavigationFolderTreeController;
+use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
+use Domain\Sharing\Controllers\AuthenticateProtectedSharedItemController;
 
 // Browse functions
 Route::group(['prefix' => 'editor'], function () {
@@ -27,12 +31,12 @@ Route::group(['prefix' => 'zip'], function () {
 
 // Browse share content
 Route::group(['prefix' => 'browse'], function () {
-    Route::post('/authenticate/{shared}', [BrowseShareController::class, 'authenticate']);
+    Route::post('/authenticate/{shared}', AuthenticateProtectedSharedItemController::class);
-    Route::get('/navigation/{shared}', [BrowseShareController::class, 'navigation_tree']);
+    Route::get('/folders/{id}/{shared}', VisitorBrowseFolderContentController::class);
-    Route::get('/folders/{id}/{shared}', [BrowseShareController::class, 'browse_folder']);
+    Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class);
-    Route::get('/file/{shared}', [BrowseShareController::class, 'get_single_file']);
+    Route::get('/file/{shared}', VisitorGetSingleFileResourceController::class);
-    Route::get('/search/{shared}', [BrowseShareController::class, 'search']);
+    Route::get('/search/{shared}', VisitorSearchFilesAndFoldersController::class);
     Route::get('/share/{shared}', [ShareController::class, 'show']);
 });
 
-Route::get('/og-site/{shared}', [AppFunctionsController::class, 'og_site']);
+Route::get('/og-site/{shared}', OGSiteController::class);

routes/web.php

@@ -2,8 +2,8 @@
 
 use Domain\Admin\Controllers\InvoiceController;
 use Domain\Homepage\Controllers\IndexController;
-use Domain\Folders\Controllers\BrowseShareController;
+use Domain\Sharing\Controllers\OGSiteController;
-use Domain\Homepage\Controllers\AppFunctionsController;
+use Domain\Sharing\Controllers\BrowseShareController;
 use Domain\SetupWizard\Controllers\SetupWizardController;
 use Domain\Subscriptions\Controllers\StripeWebhookController;
 use Domain\Localization\Controllers\CurrentLocalizationController;
@@ -18,7 +18,7 @@ Route::get('/invoice/{customer}/{token}', [InvoiceController::class, 'show'])->m
 
 // Get og site for web crawlers
 if (Crawler::isCrawler()) {
-    Route::get('/share/{shared}', [AppFunctionsController::class, 'og_site']);
+    Route::get('/share/{shared}', [OGSiteController::class, 'og_site']);
 } else {
     Route::get('/share/{shared}', [BrowseShareController::class, 'index']);
 }

src/Domain/Browsing/Controllers/VisitorBrowseFolderContentController.php

@@ -0,0 +1,40 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Domain\Sharing\Models\Share;
+use Illuminate\Support\Collection;
+use Support\Services\HelperService;
+
+/**
+ * Browse shared folder
+ */
+class VisitorBrowseFolderContentController
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {
+    }
+
+    public function __invoke(
+        string $id,
+        Share $shared,
+    ): Collection {
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check if user can get directory
+        $this->helper->check_item_access($id, $shared);
+
+        // Get files and folders
+        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
+
+        // Set thumbnail links for public files
+        $files->map(function ($file) use ($shared) {
+            $file->setPublicUrl($shared->token);
+        });
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])
+            ->collapse();
+    }
+}

src/Domain/Browsing/Controllers/VisitorSearchFilesAndFoldersController.php

@@ -0,0 +1,70 @@
+<?php
+namespace Domain\Browsing\Controllers;
+
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+use Domain\Files\Models\File;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Illuminate\Support\Collection;
+use Support\Services\HelperService;
+use App\Http\Controllers\Controller;
+
+/**
+ * Visitor search shared files
+ */
+class VisitorSearchFilesAndFoldersController extends Controller
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {
+    }
+
+    public function __invoke(
+        Request $request,
+        Share $shared,
+    ): Collection {
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        $query = remove_accents(
+            $request->input('query')
+        );
+
+        // Search files id db
+        $searched_files = File::search($query)
+            ->where('user_id', $shared->user_id)
+            ->get();
+        $searched_folders = Folder::search($query)
+            ->where('user_id', $shared->user_id)
+            ->get();
+
+        // Get all children content
+        $foldersIds = Folder::with('folders:id,parent_id,id,name')
+            ->where('user_id', $shared->user_id)
+            ->where('parent_id', $shared->item_id)
+            ->get();
+
+        // Get accessible folders
+        $accessible_folder_ids = Arr::flatten([filter_folders_ids($foldersIds), $shared->item_id]);
+
+        // Filter files
+        $files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) {
+            // Set public urls
+            $file->setPublicUrl($shared->token);
+
+            // check if item is in accessible folders
+            return in_array($file->folder_id, $accessible_folder_ids);
+        });
+
+        // Filter folders
+        $folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
+            // check if item is in accessible folders
+            return in_array($folder->id, $accessible_folder_ids);
+        });
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])
+            ->collapse();
+    }
+}

src/Domain/Files/Controllers/VisitorGetSingleFileResourceController.php

@@ -0,0 +1,36 @@
+<?php
+namespace Domain\Files\Controllers;
+
+use Domain\Files\Models\File;
+use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
+use Support\Services\HelperService;
+use Domain\Files\Resources\FileResource;
+
+/**
+ * Get shared file record
+ */
+class VisitorGetSingleFileResourceController
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {
+    }
+
+    public function __invoke(
+        Share $shared
+    ): Response {
+        // Check ability to access protected share files
+        $this->helper->check_protected_share_record($shared);
+
+        // Get file
+        $file = File::whereUserId($shared->user_id)
+            ->whereId($shared->item_id)
+            ->firstOrFail();
+
+        // Set access urls
+        $file->setPublicUrl($shared->token);
+
+        return response(new FileResource($file), 200);
+    }
+}

src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php

@@ -0,0 +1,44 @@
+<?php
+namespace Domain\Folders\Controllers;
+
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
+use Support\Services\HelperService;
+use App\Http\Controllers\Controller;
+
+/**
+ * Get navigation tree of shared folder
+ */
+class VisitorNavigationFolderTreeController extends Controller
+{
+    public function __construct(
+        public HelperService $helper,
+    ) {
+    }
+
+    public function __invoke(
+        Share $shared,
+    ): array {
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
+        // Check if user can get directory
+        $this->helper->check_item_access($shared->item_id, $shared);
+
+        // Get folders
+        $folders = Folder::with('folders:id,parent_id,name')
+            ->whereParentId($shared->item_id)
+            ->whereUserId($shared->user_id)
+            ->sortable()
+            ->get(['id', 'parent_id', 'id', 'name']);
+
+        return [
+            [
+                'id'       => $shared->item_id,
+                'name'     => __t('home'),
+                'location' => 'public',
+                'folders'  => $folders,
+            ],
+        ];
+    }
+}

src/Domain/Sharing/Actions/SendViaEmailAction.php

@@ -4,7 +4,7 @@ namespace Domain\Sharing\Actions;
 use Illuminate\Support\Facades\Notification;
 use Domain\Sharing\Notifications\SharedSendViaEmail;
 
-class SendLinkToEmailAction
+class SendViaEmailAction
 {
     public function __invoke(
         array $emails,

src/Domain/Sharing/Controllers/AuthenticateProtectedSharedItemController.php

@@ -0,0 +1,37 @@
+<?php
+namespace Domain\Sharing\Controllers;
+
+use Exception;
+use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Hash;
+use Domain\Sharing\Resources\ShareResource;
+use Domain\Sharing\Requests\AuthenticateShareRequest;
+
+class AuthenticateProtectedSharedItemController extends Controller
+{
+    /**
+     * Check Password for protected item
+     *
+     * @throws Exception
+     */
+    public function __invoke(
+        AuthenticateShareRequest $request,
+        Share $shared,
+    ): Response {
+        // Check password
+        if (Hash::check($request->input('password'), $shared->password)) {
+            $cookie = json_encode([
+                'token'         => $shared->token,
+                'authenticated' => true,
+            ]);
+
+            // Return authorize token with shared options
+            return response(new ShareResource($shared), 200)
+                ->cookie('share_session', $cookie, 43200);
+        }
+
+        return response(__t('incorrect_password'), 401);
+    }
+}

src/Domain/Sharing/Controllers/BrowseShareController.php

@@ -1,19 +1,11 @@
 <?php
 namespace Domain\Sharing\Controllers;
 
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
-use Domain\Folders\Models\Folder;
-use Illuminate\Support\Collection;
 use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
-use Domain\Files\Resources\FileResource;
-use Domain\Sharing\Resources\ShareResource;
-use Domain\Sharing\Requests\AuthenticateShareRequest;
 
 class BrowseShareController extends Controller
 {
@@ -58,164 +50,6 @@ class BrowseShareController extends Controller
             ->with('settings', get_settings_in_json() ?? null);
     }
 
-    /**
-     * Check Password for protected item
-     *
-     * @param AuthenticateShareRequest $request
-     * @param Share $shared
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
-     */
-    public function authenticate(AuthenticateShareRequest $request, Share $shared)
-    {
-        // Check password
-        if (Hash::check($request->password, $shared->password)) {
-            $cookie = json_encode([
-                'token'         => $shared->token,
-                'authenticated' => true,
-            ]);
-
-            // Return authorize token with shared options
-            return response(new ShareResource($shared), 200)
-                ->cookie('share_session', $cookie, 43200);
-        }
-
-        return response(__t('incorrect_password'), 401);
-    }
-
-    /**
-     * Browse shared folder
-     *
-     * @param $id
-     * @param Share $shared
-     * @return Collection
-     */
-    public function browse_folder($id, Share $shared)
-    {
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check if user can get directory
-        $this->helper->check_item_access($id, $shared);
-
-        // Get files and folders
-        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
-
-        // Set thumbnail links for public files
-        $files->map(function ($file) use ($shared) {
-            $file->setPublicUrl($shared->token);
-        });
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])
-            ->collapse();
-    }
-
-    /**
-     * Search shared files
-     *
-     * @param Request $request
-     * @param Share $shared
-     * @return Collection
-     */
-    public function search(Request $request, Share $shared)
-    {
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        $query = remove_accents(
-            $request->input('query')
-        );
-
-        // Search files id db
-        $searched_files = File::search($query)
-            ->where('user_id', $shared->user_id)
-            ->get();
-        $searched_folders = Folder::search($query)
-            ->where('user_id', $shared->user_id)
-            ->get();
-
-        // Get all children content
-        $foldersIds = Folder::with('folders:id,parent_id,id,name')
-            ->where('user_id', $shared->user_id)
-            ->where('parent_id', $shared->item_id)
-            ->get();
-
-        // Get accessible folders
-        $accessible_folder_ids = Arr::flatten([filter_folders_ids($foldersIds), $shared->item_id]);
-
-        // Filter files
-        $files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) {
-            // Set public urls
-            $file->setPublicUrl($shared->token);
-
-            // check if item is in accessible folders
-            return in_array($file->folder_id, $accessible_folder_ids);
-        });
-
-        // Filter folders
-        $folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
-            // check if item is in accessible folders
-            return in_array($folder->id, $accessible_folder_ids);
-        });
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])
-            ->collapse();
-    }
-
-    /**
-     * Get navigation tree of shared folder
-     *
-     * @param Share $shared
-     * @return array
-     */
-    public function navigation_tree(Share $shared)
-    {
-        // Check ability to access protected share record
-        $this->helper->check_protected_share_record($shared);
-
-        // Check if user can get directory
-        $this->helper->check_item_access($shared->item_id, $shared);
-
-        // Get folders
-        $folders = Folder::with('folders:id,parent_id,name')
-            ->whereParentId($shared->item_id)
-            ->whereUserId($shared->user_id)
-            ->sortable()
-            ->get(['id', 'parent_id', 'id', 'name']);
-
-        return [
-            [
-                'id'       => $shared->item_id,
-                'name'     => __t('home'),
-                'location' => 'public',
-                'folders'  => $folders,
-            ],
-        ];
-    }
-
-    /**
-     * Get shared file record
-     *
-     * @param Share $shared
-     * @return mixed
-     */
-    public function get_single_file(Share $shared)
-    {
-        // Check ability to access protected share files
-        $this->helper->check_protected_share_record($shared);
-
-        // Get file
-        $file = File::whereUserId($shared->user_id)
-            ->whereId($shared->item_id)
-            ->firstOrFail();
-
-        // Set access urls
-        $file->setPublicUrl($shared->token);
-
-        return response(new FileResource($file), 200);
-    }
-
     /**
      * Get image from storage and show it
      *

src/Domain/Sharing/Controllers/ManipulateShareItemsController.php

@@ -11,8 +11,6 @@ use App\Http\Controllers\Controller;
 use Support\Demo\Actions\DemoService;
 use Support\Services\FileManagerService;
 use Domain\Items\Requests\MoveItemRequest;
-use Domain\Zipping\Actions\ZipFilesAction;
-use Domain\Zipping\Actions\ZipFolderAction;
 use Domain\Items\Requests\DeleteItemRequest;
 use Domain\Items\Requests\RenameItemRequest;
 use Illuminate\Contracts\Routing\ResponseFactory;

src/Domain/Sharing/Controllers/OGSiteController.php

@@ -1,19 +1,18 @@
 <?php
-namespace Domain\Homepage\Controllers;
+namespace Domain\Sharing\Controllers;
 
+use Illuminate\View\View;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 
-class AppFunctionsController extends Controller
+class OGSiteController extends Controller
 {
     /**
      * Get og site for web crawlers
-     *
-     * @param Share $shared
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
-    public function og_site(Share $shared)
+    public function __invoke(
-    {
+        Share $shared
+    ): View {
         $namespace = match ($shared->type) {
             'folder' => 'Domain\\Folders\\Models\\Folder',
             'file'   => 'Domain\\Files\\Models\\File',

src/Domain/Sharing/Controllers/ShareController.php

@@ -10,7 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Domain\Sharing\Resources\ShareResource;
 use Domain\Sharing\Requests\CreateShareRequest;
 use Domain\Sharing\Requests\UpdateShareRequest;
-use Domain\Sharing\Actions\SendLinkToEmailAction;
+use Domain\Sharing\Actions\SendViaEmailAction;
 
 class ShareController extends Controller
 {
@@ -28,7 +28,7 @@ class ShareController extends Controller
      */
     public function store(
         CreateShareRequest $request,
-        SendLinkToEmailAction $sendLinkToEmailAction,
+        SendViaEmailAction $sendLinkToEmailAction,
     ): ShareResource {
         $shared = Share::create([
             'password'     => $request->has('password')

src/Domain/Sharing/Controllers/ShareViaEmailController.php

@@ -4,15 +4,16 @@ namespace Domain\Sharing\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
-use Domain\Sharing\Actions\SendLinkToEmailAction;
+use Domain\Sharing\Actions\SendViaEmailAction;
 
 class ShareViaEmailController extends Controller
 {
     public function __invoke(
-        SendLinkToEmailAction $sendLinkToEmailAction,
+        SendViaEmailAction $sendLinkToEmailAction,
         Request $request,
         string $token,
     ): Response {
+
         ($sendLinkToEmailAction)(
             $request->input('emails'),
             $token

src/Domain/Zipping/Controllers/EditorZipFilesController.php

@@ -1,16 +1,13 @@
 <?php
-
-
 namespace Domain\Zipping\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Domain\Files\Models\File;
-use Domain\Sharing\Models\Share;
-use Domain\Zipping\Actions\ZipFilesAction;
 use Illuminate\Http\Request;
+use Domain\Files\Models\File;
 use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
 use Support\Services\HelperService;
+use App\Http\Controllers\Controller;
+use Domain\Zipping\Actions\ZipFilesAction;
 
 /**
  * Guest download multiple files via zip
@@ -19,7 +16,8 @@ class EditorZipFilesController extends Controller
 {
     public function __construct(
         public HelperService $helper,
-    ) {}
+    ) {
+    }
 
     public function __invoke(
         ZipFilesAction $zipFiles,
@@ -54,4 +52,4 @@ class EditorZipFilesController extends Controller
             'name' => $zip->basename,
         ], 201);
     }
-}
+}

src/Domain/Zipping/Controllers/EditorZipFolderController.php

@@ -1,15 +1,12 @@
 <?php
-
-
 namespace Domain\Zipping\Controllers;
 
-
-use App\Http\Controllers\Controller;
-use Domain\Folders\Models\Folder;
-use Domain\Sharing\Models\Share;
-use Domain\Zipping\Actions\ZipFolderAction;
 use Illuminate\Http\Response;
+use Domain\Sharing\Models\Share;
+use Domain\Folders\Models\Folder;
 use Support\Services\HelperService;
+use App\Http\Controllers\Controller;
+use Domain\Zipping\Actions\ZipFolderAction;
 
 /**
  * Guest download folder via zip
@@ -18,7 +15,8 @@ class EditorZipFolderController extends Controller
 {
     public function __construct(
         public HelperService $helper,
-    ) {}
+    ) {
+    }
 
     public function __invoke(
         ZipFolderAction $zipFolder,
@@ -50,4 +48,4 @@ class EditorZipFolderController extends Controller
             'name' => $zip->basename,
         ], 201);
     }
-}
+}