s3 with b2

Author: AllanKoder

.env.example

@@ -21,7 +21,7 @@ LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
+DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=computer_science_resources
@@ -48,20 +48,22 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=log
-MAIL_SCHEME=null
-MAIL_HOST=127.0.0.1
-MAIL_PORT=2525
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="noreply@computerscienceresources.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
+FILESYSTEM_PUBLIC_DRIVER="local"
+
+B2_ACCESS_KEY_ID=
+B2_SECRET_ACCESS_KEY=
+B2_DEFAULT_REGION=
+B2_BUCKET=
+B2_ENDPOINT=
 
 VITE_APP_NAME="${APP_NAME}"
 

app/Http/Controllers/ComputerScienceResourceController.php

@@ -19,6 +19,7 @@
 use Illuminate\Support\Facades\Log;
 use Inertia\Inertia;
 use Throwable;
+use Exception;
 
 class ComputerScienceResourceController extends Controller
 {
@@ -65,16 +66,24 @@ public function create()
     public function store(StoreResourceRequest $request)
     {
         $validatedData = $request->validated();
-        Log::debug('Called store resource with data '.json_encode($request));
 
         DB::beginTransaction();
         try {
             // Store the image onto storage
             $path = null;
             if (array_key_exists('image_file', $validatedData) && $imageFile = $validatedData['image_file']) {
                 $path = $imageFile->store('resource', 'public');
+                if (!$path) {
+                    Log::error('Failed to store image file', [
+                        'user_id' => Auth::id(),
+                        'file_info' => $imageFile,
+                    ]);
+
+                    throw new Exception('Could not save the image.');
+                }
             }
 
+
             $resource = ComputerScienceResource::create([
                 'user_id' => Auth::id(),
                 'name' => $validatedData['name'],

app/Http/Requests/ComputerScienceResource/StoreResourceRequest.php

@@ -35,7 +35,7 @@ public function rules(): array
             'topic_tags.*' => ['required', 'distinct', 'string', 'max:50'],
 
             // Optional, can just be omitted
-            'image_file' => ['nullable', 'image', 'max:400'], // 400 kiloBytes
+            'image_file' => ['nullable', 'image', 'max:500'], // 500 kiloBytes
             'general_tags' => ['array'],
             'general_tags.*' => ['required', 'distinct', 'string', 'max:50'],
             'programming_language_tags' => ['array'],

app/Http/Requests/ResourceEdit/StoreResourceEdit.php

@@ -37,7 +37,7 @@ public function rules(): array
             'proposed_changes.pricing' => ['nullable', 'string', Rule::in(config('computerScienceResource.pricings'))],
             'proposed_changes.topic_tags' => ['nullable', 'array', 'min:2'],
             'proposed_changes.topic_tags.*' => ['required', 'distinct', 'string', 'max:50'],
-            'proposed_changes.image_file' => ['nullable', 'image', 'max:400'], // 400 kilobytes
+            'proposed_changes.image_file' => ['nullable', 'image', 'max:500'], // 500 kilobytes
             'proposed_changes.general_tags' => ['nullable', 'array'],
             'proposed_changes.general_tags.*' => ['required', 'distinct', 'string', 'max:50'],
             'proposed_changes.programming_language_tags' => ['nullable', 'array'],

app/Models/ComputerScienceResource.php

@@ -62,7 +62,7 @@ public function user(): BelongsTo
     protected function imageUrl(): Attribute
     {
         return Attribute::make(
-            get: fn () => $this->image_path ? Storage::url($this->image_path) : null,
+            get: fn () => $this->image_path ? Storage::disk('public')->url($this->image_path) : null,
         );
     }
 

app/Models/NewsPost.php

@@ -18,7 +18,7 @@ class NewsPost extends Model
     protected function thumbnailUrl(): Attribute
     {
         return Attribute::make(
-            get: fn () => Storage::url($this->thumbnail_path)
+            get: fn () => Storage::disk('public')->url($this->thumbnail_path)
         );
     }
 

app/Models/ResourceEdits.php

@@ -83,7 +83,7 @@ protected function proposedChanges(): Attribute
                 if (array_key_exists('image_path', $changes)) {
                     $changes['image_url'] = null;
                     if ($changes['image_path']) {
-                        $changes['image_url'] = Storage::url($changes['image_path']);
+                        $changes['image_url'] = Storage::disk('public')->url($changes['image_path']);
                     }
                 }
 

composer.json

@@ -7,6 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
+        "aws/aws-sdk-php": "3.336",
         "cviebrock/eloquent-sluggable": "^11.0",
         "filament/filament": "^3.3",
         "filament/tables": "^3.3",
@@ -17,6 +18,7 @@
         "laravel/jetstream": "^5.3",
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.9",
+        "league/flysystem-aws-s3-v3": "^3.0",
         "shiftonelabs/laravel-cascade-deletes": "^2.0",
         "spatie/laravel-activitylog": "^4.10",
         "spatie/laravel-tags": "^4.9",