Beautiful Open-Source Form Builder
Storage support for local disk (#165)
formsdev3c71be5d4575
diff --git a/app/Http/Controllers/Content/FileUploadController.php b/app/Http/Controllers/Content/FileUploadController.phpnew file mode 100644index 000000000..62e6423a7--- /dev/null+++ b/app/Http/Controllers/Content/FileUploadController.php@@ -0,0 +1,28 @@+<?php++namespace App\Http\Controllers\Content;++use App\Http\Controllers\Controller;+use App\Http\Controllers\Forms\PublicFormController;+use Illuminate\Http\Request;+use Illuminate\Support\Str;++class FileUploadController extends Controller+{+ /**+ * Upload file to local temp+ *+ * @param \Illuminate\Http\Request $request+ * @return \Illuminate\Http\JsonResponse+ */+ public function upload(Request $request)+ {+ $uuid = (string) Str::uuid();+ $path = $request->file('file')->storeAs(PublicFormController::TMP_FILE_UPLOAD_PATH, $uuid);++ return response()->json([+ 'uuid' => $uuid,+ 'key' => $path+ ], 201);+ }+}diff --git a/app/Http/Controllers/Forms/FormController.php b/app/Http/Controllers/Forms/FormController.phpindex 6c99b7b07..5865f1db1 100644--- a/app/Http/Controllers/Forms/FormController.php+++ b/app/Http/Controllers/Forms/FormController.php@@ -177,12 +177,12 @@ class FormController extends Controller// Make sure we retrieve the file in tmp storage, move it to persistent$fileName = PublicFormController::TMP_FILE_UPLOAD_PATH.'/'.$fileNameParser->uuid;;- if (!Storage::disk('s3')->exists($fileName)) {+ if (!Storage::exists($fileName)) {// File not found, we skipreturn null;}$newPath = self::ASSETS_UPLOAD_PATH.'/'.$fileNameParser->getMovedFileName();- Storage::disk('s3')->move($fileName, $newPath);+ Storage::move($fileName, $newPath);return $this->success(['message' => 'File uploaded.',@@ -199,12 +199,12 @@ class FormController extends Controller$this->authorize('view', $form);$path = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $form->id).'/'.$fileName;- if (!Storage::disk('s3')->exists($path)) {+ if (!Storage::exists($path)) {return $this->error(['message' => 'File not found.']);}- return redirect()->to(Storage::disk('s3')->temporaryUrl($path, now()->addMinutes(5)));+ return redirect()->to(Storage::temporaryUrl($path, now()->addMinutes(5)));}}diff --git a/app/Http/Controllers/Forms/FormSubmissionController.php b/app/Http/Controllers/Forms/FormSubmissionController.phpindex ba7a8f8ed..75d1a90d7 100644--- a/app/Http/Controllers/Forms/FormSubmissionController.php+++ b/app/Http/Controllers/Forms/FormSubmissionController.php@@ -57,14 +57,14 @@ class FormSubmissionController extends Controller$fileName = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $id).'/'.urldecode($fileName);- if (!Storage::disk('s3')->exists($fileName)) {+ if (!Storage::exists($fileName)) {return $this->error(['message' => 'File not found.',], 404);}return redirect(- Storage::disk('s3')->temporaryUrl($fileName, now()->addMinute())+ Storage::temporaryUrl($fileName, now()->addMinute()));}}diff --git a/app/Http/Controllers/Forms/PublicFormController.php b/app/Http/Controllers/Forms/PublicFormController.phpindex 69f7e677a..8856ba77d 100644--- a/app/Http/Controllers/Forms/PublicFormController.php+++ b/app/Http/Controllers/Forms/PublicFormController.php@@ -66,14 +66,14 @@ class PublicFormController extends Controllerpublic function showAsset($assetFileName){$path = FormController::ASSETS_UPLOAD_PATH.'/'.$assetFileName;- if (!Storage::disk('s3')->exists($path)) {+ if (!Storage::exists($path)) {return $this->error(['message' => 'File not found.','file_name' => $assetFileName]);}-- return redirect()->to(Storage::disk('s3')->temporaryUrl($path, now()->addMinutes(5)));++ return redirect()->to(Storage::temporaryUrl($path, now()->addMinutes(5)));}public function answer(AnswerFormRequest $request)diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.phpindex 81cca901f..7d14bf7bf 100644--- a/app/Http/Middleware/VerifyCsrfToken.php+++ b/app/Http/Middleware/VerifyCsrfToken.php@@ -13,6 +13,7 @@ class VerifyCsrfToken extends Middleware*/protected $except = ['stripe/webhook',- 'vapor/signed-storage-url'+ 'vapor/signed-storage-url',+ 'upload-file'];}diff --git a/app/Jobs/Form/StoreFormSubmissionJob.php b/app/Jobs/Form/StoreFormSubmissionJob.phpindex cf15f085a..c12d932ae 100644--- a/app/Jobs/Form/StoreFormSubmissionJob.php+++ b/app/Jobs/Form/StoreFormSubmissionJob.php@@ -140,7 +140,7 @@ class StoreFormSubmissionJob implements ShouldQueueprivate function isSkipForUpload($value){$newPath = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $this->form->id);- return Storage::disk('s3')->exists($newPath.'/'.$value);+ return Storage::exists($newPath.'/'.$value);}/**@@ -165,7 +165,7 @@ class StoreFormSubmissionJob implements ShouldQueue// Make sure we retrieve the file in tmp storage, move it to persistent$fileName = PublicFormController::TMP_FILE_UPLOAD_PATH.'/'.$fileNameParser->uuid;- if (!Storage::disk('s3')->exists($fileName)) {+ if (!Storage::exists($fileName)) {// File not found, we skipreturn null;}@@ -178,7 +178,7 @@ class StoreFormSubmissionJob implements ShouldQueue'form_id' => $this->form->id,'form_slug' => $this->form->slug,]);- Storage::disk('s3')->move($fileName, $completeNewFilename);+ Storage::move($fileName, $completeNewFilename);return $fileNameParser->getMovedFileName();}@@ -193,7 +193,7 @@ class StoreFormSubmissionJob implements ShouldQueue$newPath = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $this->form->id);$completeNewFilename = $newPath.'/'.$fileName;- Storage::disk('s3')->put($completeNewFilename, base64_decode(explode(',', $value)[1]));+ Storage::put($completeNewFilename, base64_decode(explode(',', $value)[1]));return $fileName;}diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex cdb7f10fc..dd0a30f1a 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -8,7 +8,8 @@ use Illuminate\Support\ServiceProvider;use Laravel\Cashier\Cashier;use Laravel\Dusk\DuskServiceProvider;use Illuminate\Support\Facades\Validator;-+use Illuminate\Support\Facades\Storage;+use Illuminate\Support\Facades\URL;class AppServiceProvider extends ServiceProvider{/**@@ -18,6 +19,16 @@ class AppServiceProvider extends ServiceProvider*/public function boot(){+ if(config('filesystems.default') === 'local'){+ Storage::disk('local')->buildTemporaryUrlsUsing(function ($path, $expiration, $options) {+ return URL::temporarySignedRoute(+ 'local.temp',+ $expiration,+ array_merge($options, ['path' => $path])+ );+ });+ }+JsonResource::withoutWrapping();Cashier::calculateTaxes();diff --git a/app/Rules/StorageFile.php b/app/Rules/StorageFile.phpindex 49e67a9fa..f2f0a3055 100644--- a/app/Rules/StorageFile.php+++ b/app/Rules/StorageFile.php@@ -43,7 +43,7 @@ class StorageFile implements Rule// This is use when updating a record, and file uploads aren't changed.if($this->form){$newPath = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $this->form->id);- if(Storage::disk('s3')->exists($newPath.'/'.$value)){+ if(Storage::exists($newPath.'/'.$value)){return true;}}diff --git a/resources/js/components/pages/welcome/AiFeature.vue b/resources/js/components/pages/welcome/AiFeature.vueindex ad4546875..c24fdad14 100644--- a/resources/js/components/pages/welcome/AiFeature.vue+++ b/resources/js/components/pages/welcome/AiFeature.vue@@ -62,13 +62,16 @@</li></ul>- <div class="mt-6 sm:mt-8 flex">- <v-button v-if="!authenticated" class="mr-1" :to="{ name: 'forms.create.guest' }" :arrow="true">+ <div class="mt-6 sm:mt-8 flex text-center justify-center lg:justify-start">+ <v-button v-if="!authenticated" class="mr-2 block" :to="{ name: 'forms.create.guest' }" :arrow="true">Get started for free</v-button>- <v-button v-else class="mr-1" :to="{ name: 'forms.create' }" :arrow="true">+ <v-button v-else class="mr-2 block" :to="{ name: 'forms.create' }" :arrow="true">Get started for free</v-button>+ <v-button color="light-gray" class="mr-1 block" :to="{ name: 'aiformbuilder' }">+ Learn more+ </v-button></div></div>diff --git a/resources/js/plugins/vapor.js b/resources/js/plugins/vapor.jsindex d3a6f0a85..ceb45f448 100644--- a/resources/js/plugins/vapor.js+++ b/resources/js/plugins/vapor.js@@ -15,6 +15,26 @@ Vue.mixin({* Store a file in S3 and return its UUID, key, and other information.*/async storeFile (file, options = {}) {+ if(!window.config.s3_enabled) { // If not s3 then upload to local temp+ if (typeof options.progress === 'undefined') {+ options.progress = () => {}+ }+ const cleanAxios = axios.create()+ let formData = new FormData();+ formData.append('file', file);+ const response = await cleanAxios.post('/upload-file', formData, {+ headers: {+ 'Content-Type': 'multipart/form-data'+ },+ onUploadProgress: (progressEvent) => {+ options.progress(progressEvent.loaded / progressEvent.total)+ }+ })++ response.data.extension = file.name.split('.').pop()+ return response.data+ }+const response = await axios.post(options.signedStorageUrl ? options.signedStorageUrl : '/vapor/signed-storage-url', {bucket: options.bucket || '',content_type: options.contentType || file.type,diff --git a/resources/views/spa.blade.php b/resources/views/spa.blade.phpindex f9dc12d16..0be87c3c9 100644--- a/resources/views/spa.blade.php+++ b/resources/views/spa.blade.php@@ -13,7 +13,8 @@'google_analytics_code' => config('services.google_analytics_code'),'amplitude_code' => config('services.amplitude_code'),'crisp_website_id' => config('services.crisp_website_id'),- 'ai_features_enabled' => !is_null(config('services.openai.api_key'))+ 'ai_features_enabled' => !is_null(config('services.openai.api_key')),+ 's3_enabled' => config('filesystems.default') === 's3'];@endphp<!DOCTYPE html>diff --git a/routes/web.php b/routes/web.phpindex 04d97e23c..a7abe4fc9 100644--- a/routes/web.php+++ b/routes/web.php@@ -1,6 +1,8 @@<?phpuse Illuminate\Support\Facades\Route;+use Illuminate\Support\Facades\Storage;+use Illuminate\Http\Request;/*|--------------------------------------------------------------------------@@ -22,4 +24,17 @@ Route::post('/vapor/signed-storage-url',[\App\Http\Controllers\Content\SignedStorageUrlController::class, 'store'])->middleware([]);+Route::post(+ '/upload-file',+ [\App\Http\Controllers\Content\FileUploadController::class, 'upload']+)->middleware([]);+Route::get('local/temp/{path}', function (Request $request, string $path){+ if (!$request->hasValidSignature()) {+ abort(401);+ }+ $response = Response::make(Storage::get($path), 200);+ $response->header("Content-Type", Storage::mimeType($path));+ return $response;+})->where('path', '(.*)')->name('local.temp');+Route::get('/sitemap.xml', [\App\Http\Controllers\SitemapController::class, 'getSitemap'])->name('sitemap');