fix(uploads): fixing uploads so the download actually works

Author: BennettPhil

app/Http/Controllers/Auth/SocialitePlusController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
 use App\Models\User;
-use Blaspsoft\SocialitePlus\SocialitePlusFactory;
 use Illuminate\Http\Request;
+use Blaspsoft\SocialitePlus\SocialitePlusFactory;
 use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
 
 class SocialitePlusController extends Controller
 {
@@ -19,6 +19,8 @@ class SocialitePlusController extends Controller
 
     /**
      * Create a new SocialLoginController instance.
+     *
+     * @param SocialitePlusFactory $socialitePlus
      */
     public function __construct(SocialitePlusFactory $socialitePlus)
     {
@@ -28,6 +30,7 @@ public function __construct(SocialitePlusFactory $socialitePlus)
     /**
      * Redirect to the social login page
      *
+     * @param string $provider
      * @return \Illuminate\Http\RedirectResponse
      */
     public function redirect(string $provider)
@@ -44,21 +47,20 @@ public function redirect(string $provider)
     /**
      * Handle the social login callback
      *
+     * @param string $provider
+     * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function callback(string $provider, Request $request)
     {
-        if (! $request->has('code')) {
-            return redirect()->route('login')->with('error', 'Invalid request');
-        }
+        if (!$request->has('code')) return redirect()->route('login')->with('error', 'Invalid request');
 
         $user = $this->socialitePlus->build($provider)->user();
 
         $existingUser = User::where('email', $user->getEmail())->first();
 
         if ($existingUser) {
             Auth::login($existingUser);
-
             return redirect()->intended('/dashboard');
         }
 

app/Http/Controllers/FileUploadController.php

@@ -38,10 +38,27 @@ public function store(Request $request)
 
         $file = $request->file('file');
         $originalFilename = $file->getClientOriginalName();
-        $filename = Str::uuid().'.'.$file->getClientOriginalExtension();
+        $filename = Str::uuid() . '.' . $file->getClientOriginalExtension();
 
-        // Store the file in the storage/app/uploads directory (private)
-        $path = $file->storeAs('uploads', $filename);
+        // Ensure the uploads directory exists
+        if (!Storage::exists('uploads')) {
+            Storage::makeDirectory('uploads');
+            Log::info('Created uploads directory on default disk');
+        }
+
+        // Store the file in the private/uploads directory
+        $path = Storage::putFileAs('uploads', $file, $filename);
+
+        // Log file storage details
+        Log::info('File stored', [
+            'original_filename' => $originalFilename,
+            'generated_filename' => $filename,
+            'storage_path' => $path,
+            'full_path' => Storage::path($path),
+            'exists' => Storage::exists($path) ? 'Yes' : 'No',
+            'default_disk' => config('filesystems.default'),
+            'disk_root' => config('filesystems.disks.' . config('filesystems.default') . '.root'),
+        ]);
 
         // Create a new file upload record
         $fileUpload = FileUpload::create([
@@ -71,20 +88,63 @@ public function download(FileUpload $fileUpload)
             abort(403, 'You do not have permission to access this file.');
         }
 
+        // Log the download attempt
+        Log::info('File download requested', [
+            'file_id' => $fileUpload->id,
+            'filename' => $fileUpload->original_filename,
+            'path' => $fileUpload->path,
+            'user_id' => Auth::id(),
+            'exists' => Storage::exists($fileUpload->path) ? 'Yes' : 'No',
+            'default_disk' => config('filesystems.default'),
+        ]);
+
         // Check if the file exists
-        if (! Storage::exists($fileUpload->path)) {
-            abort(404, 'File not found.');
+        if (!Storage::exists($fileUpload->path)) {
+            // Try to check where the file might be
+            $alternativePaths = [
+                'uploads/' . $fileUpload->filename,
+                'private/uploads/' . $fileUpload->filename,
+                'app/uploads/' . $fileUpload->filename,
+                'app/private/uploads/' . $fileUpload->filename,
+            ];
+
+            $foundAlternative = false;
+            foreach ($alternativePaths as $altPath) {
+                if (Storage::exists($altPath)) {
+                    Log::info('Found file at alternative path', ['path' => $altPath]);
+                    $fileUpload->path = $altPath;
+                    $fileUpload->save();
+                    $foundAlternative = true;
+                    break;
+                }
+            }
+
+            if (!$foundAlternative) {
+                Log::error('File not found for download', [
+                    'file_id' => $fileUpload->id,
+                    'path' => $fileUpload->path,
+                    'checked_alternatives' => $alternativePaths,
+                ]);
+
+                abort(404, 'File not found. It may have been moved or deleted.');
+            }
         }
 
-        // Debugging information
-        Log::info('Download requested by User: '.Auth::id().' for File: '.$fileUpload->id.' Path: '.$fileUpload->path);
-
-        // Force download the file
-        return response()->download(
-            storage_path('app/'.$fileUpload->path),
-            $fileUpload->original_filename,
-            ['Content-Type' => $fileUpload->mime_type]
-        );
+        try {
+            // Return the file as a download
+            return Storage::download(
+                $fileUpload->path,
+                $fileUpload->original_filename,
+                ['Content-Type' => $fileUpload->mime_type]
+            );
+        } catch (\Exception $e) {
+            Log::error('Error downloading file', [
+                'file_id' => $fileUpload->id,
+                'error' => $e->getMessage(),
+            ]);
+
+            abort(500, 'Error downloading file. Please try again later.');
+        }
     }
 
     /**

app/Models/FileUpload.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Facades\Log;
 
 class FileUpload extends Model
 {
@@ -25,6 +26,13 @@ class FileUpload extends Model
         'status',
     ];
 
+    /**
+     * The accessors to append to the model's array form.
+     *
+     * @var array
+     */
+    protected $appends = ['url'];
+
     /**
      * Get the user that owns the file upload.
      */
@@ -38,6 +46,8 @@ public function user(): BelongsTo
      */
     public function getUrlAttribute(): string
     {
-        return route('content.download', $this->id);
+        $url = route('content.download', $this->id);
+
+        return $url;
     }
 }