Add picture to the question/answer: added support s3

Author: DevilRep

app/Http/Controllers/API/ImageController.php

@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\Response;
 use App\Services\Questions\Contracts\QuestionServiceInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 class ImageController extends Controller
 {
@@ -29,31 +28,38 @@ public function __construct(QuestionServiceInterface $questionService)
     public function store(Request $request, ImageServiceInterface $imageService)
     {
         $response_type = $request->get('responseType');
+        // For CKEditor API
+        // (http://docs.ckeditor.com/#!/guide/dev_file_browser_api)
+        $funcNum = $request->get('CKEditorFuncNum');
+
         if (!$request->hasFile('upload')) {
             if ($response_type === 'json') {
                 return Response::json([
                     'description' => 'File not exists',
                 ], 422);
             }
-            throw new UnprocessableEntityHttpException();
-        }
+            $url = '';
+            $message = 'File invalid. Please choose another file.';
+        } else {
+            try {
+                $fileName = $imageService->save($request->file('upload'));
+                $url = $imageService->url($fileName);
 
-        $fileName = $imageService->save($request->file('upload'));
-        $url = $imageService->url($fileName);
+                if ($response_type === 'json') {
+                    return Response::json([
+                        'fileName' => $fileName,
+                        'uploaded' => 1,
+                        'url'      => $url
+                    ], 200, [], JSON_NUMERIC_CHECK);
+                }
 
-        if ($response_type === 'json') {
-            return Response::json([
-                'fileName' => $fileName,
-                'uploaded' => 1,
-                'url'      => $url
-            ], 200, [], JSON_NUMERIC_CHECK);
+                $message = 'Image was loading successfully';
+            } catch (\Exception $e) {
+                $url = '';
+                $message = 'File invalid. Please choose another file.';
+            }
         }
 
-        // For CKEditor API
-        // (http://docs.ckeditor.com/#!/guide/dev_file_browser_api)
-        $funcNum = $request->get('CKEditorFuncNum');
-        $message = 'Image was loading successfully';
-
         return "<script type='text/javascript'>
                     window.parent.CKEDITOR.tools.callFunction(
                         $funcNum,

app/Services/Image/Contracts/ImageServiceInterface.php

@@ -15,4 +15,6 @@ public function url($filename);
     public function generateFilename($extension, $extraName = '');
 
     public function resize($file, $new_name, $width);
+
+    public function delete($filename, $isLocal = false);
 }

app/Services/Image/Exceptions/ImageNotWritableException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Services\Image\Exceptions;
+
+class ImageNotWritableException extends ImageException
+{
+}

app/Services/Image/ImageService.php

@@ -3,6 +3,9 @@
 namespace App\Services\Image;
 
 use App\Services\Image\Contracts\ImageServiceInterface;
+use App\Services\Image\Exceptions\ImageNotWritableException;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Intervention\Image\Facades\Image;
 use Illuminate\Support\Facades\File;
@@ -41,14 +44,18 @@ public function url($filename)
 
     public function get($filename)
     {
-        $path = storage_path('app') . config('images.localPath') . $filename;
-        $exists = File::exists($path);
+        $path = config('images.localPath') . $filename;
 
-        if (!$exists) {
+        if (!Storage::exists($path)) {
             throw new ImageNotFoundHttpException();
         }
 
-        return Image::make($path)->response(pathinfo($path, PATHINFO_EXTENSION));
+        $data = Storage::get($path);
+        $mime = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data);
+
+        return Response::make($data)
+            ->header('Content-Type', $mime)
+            ->header('Content-Length', strlen($data));
     }
 
     public function generateFilename($extension, $extraName = '')
@@ -57,19 +64,42 @@ public function generateFilename($extension, $extraName = '')
         return [
             'filename' => $fileName . '.' . $extension,
             'path' => config('images.localPath') . $fileName . '.' . $extension,
-            'full_path' => storage_path('app') . config('images.localPath') .
+            'local_path' => storage_path('app') . config('images.localPath') .
                 $fileName . '.' . $extension,
             'url' => config('images.url') . $fileName . '/' . $extension
         ];
     }
 
-    public function resize($file, $new_name, $width)
+    public function resize($file, $newName, $width)
     {
-        Image::make($file)
+        $image = Image::make($file)
             ->resize($width, null, function ($constraint) {
                 $constraint->upsize();
                 $constraint->aspectRatio();
-            })
-            ->save(storage_path('app') . config('images.localPath') . $new_name);
+            });
+
+        $data = $image->encode(pathinfo($newName, PATHINFO_EXTENSION));
+
+        $saved = Storage::put(
+            config('images.localPath') . $newName,
+            $data->getEncoded()
+        );
+
+        if ($saved === false) {
+            throw new ImageNotWritableException(
+                'Can\'t write image data to path ({$path})'
+            );
+        }
+    }
+
+    public function delete($filename, $isLocal = false)
+    {
+        if ($isLocal) {
+            File::delete(
+                storage_path('app') . config('images.localPath') . $filename
+            );
+        } else {
+            Storage::delete(config('images.localPath') . $filename);
+        }
     }
 }

composer.json

@@ -17,7 +17,9 @@
         "tymon/jwt-auth": "^0.5.4",
         "smart-crowd/laravel-rbac": "dev-master",
         "doctrine/dbal": "^2.5",
-        "react/zmq": "^0.3.0"
+        "react/zmq": "^0.3.0",
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "aws/aws-sdk-php-laravel": "~3.0"
     },
     "repositories": [
         {