controller refactoring part 7

2026-04-24 18:00:40 +00:00 · 2021-07-20 12:22:48 +02:00
parent 0232a7abeb
commit dc98c839a2
17 changed files with 275 additions and 216 deletions
@@ -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);
+    }
+}
@@ -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
     *
@@ -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;
@@ -0,0 +1,43 @@
+<?php
+namespace Domain\Sharing\Controllers;
+
+use Illuminate\View\View;
+use Domain\Sharing\Models\Share;
+use App\Http\Controllers\Controller;
+
+class OGSiteController extends Controller
+{
+    /**
+     * Get og site for web crawlers
+     */
+    public function __invoke(
+        Share $shared
+    ): View {
+        $namespace = match ($shared->type) {
+            'folder' => 'Domain\\Folders\\Models\\Folder',
+            'file'   => 'Domain\\Files\\Models\\File',
+        };
+
+        // Get file/folder record
+        $item = ($namespace)::where('user_id', $shared->user->id)
+            ->where('id', $shared->item_id)
+            ->first();
+
+        if ($item->thumbnail) {
+            $item->setPublicUrl($shared->token);
+        }
+
+        return view('vuefilemanager.crawler.og-view')
+            ->with('settings', get_settings_in_json())
+            ->with('metadata', [
+                'url'          => url('/share', ['token' => $shared->token]),
+                'is_protected' => $shared->is_protected,
+                'user'         => $shared->user->settings->name,
+                'name'         => $item->name,
+                'size'         => $shared->type === 'folder'
+                    ? $item->items
+                    : $item->filesize,
+                'thumbnail' => $item->thumbnail ?? null,
+            ]);
+    }
+}
@@ -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')
@@ -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