fix public / private

Author: Dan Jewett

README.md

@@ -32,12 +32,14 @@ const propTypes = {
   file: PropTypes.object,
   cloudUpload: PropTypes.bool,
   style: PropTypes.object,
+  public: PropTypes.bool,
 };
 
 const defaultProps = {
   afterSuccess: () => {},
   cloudUpload: false,
   style: {},
+  public: false,
 };
 
 function FileUploader(props){
@@ -76,14 +78,16 @@ function FileUploader(props){
         pingUpload({
           file_name: blob.name,
           file_type: blob.type,
+          public: props.public,
         }, blob); //XMLHttpRequest can take a raw file blob, which works better for streaming the file
       }
       else
       {
         upload({
           file_name: blob.name,
           file_type: blob.type,
-          file_data: reader.result
+          file_data: reader.result,
+          public: props.public,
         });
       }
     }, false);

src/FileBaseController.php

@@ -40,12 +40,15 @@ public function store(Request $request)
         $file_type = $request->input('file_type');
         $file_data = $request->input('file_data');
 
+        $relative_directory = $request->input('directory') ?? null;
+        $public = $request->input('public') ?? false;
+
         //this is set up with two distinct routes so that the FileUploader component can still call the `store / post` method on the file object
         //in the cloud route, we are doing a direct upload to s3
         //in the other route, we are doing a an upload to the server, then to s3
         if (!$file_data)
         {
-            $data = File::s3CreateUpload(new File, $file_name, $file_type);
+            $data = File::s3CreateUpload(new File, $file_name, $file_type, $relative_directory, $public);
             $file = $data['file'];
             $upload_url = $data['upload_url'];
 
@@ -61,7 +64,7 @@ public function store(Request $request)
         }
         else
         {
-            $file = File::uploadAndCreateFileFromDataURI($file_name, $file_type, $file_data);
+            $file = File::uploadAndCreateFileFromDataURI($file_name, $file_type, $file_data, $relative_directory, $public);
             $file->refresh();
 
             return response()->json([
@@ -104,12 +107,15 @@ public function update(Request $request, File $file)
             $file_type = $request->input('file_type');
             $file_data = $request->input('file_data');
 
+            $relative_directory = $request->input('directory') ?? null;
+            $public = $request->input('public') ?? false;
+
             //this is set up with two distinct routes so that the FileUploader component can still call the `update / put` method on the file object
             //in the cloud route, we are doing a direct upload to s3
             //in the other route, we are doing a an upload to the server, then to s3
             if (!$file_data)
             {
-                $data = File::s3CreateUpload($file, $file_name, $file_type);
+                $data = File::s3CreateUpload($file, $file_name, $file_type, $relative_directory, $public);
                 $file = $data['file'];
                 $upload_url = $data['upload_url'];
 
@@ -125,7 +131,7 @@ public function update(Request $request, File $file)
             }
             else
             {
-                $uploadedFile = File::makeUploadFileFromDataURI($file_name, $file_type, $file_data);
+                $uploadedFile = File::makeUploadFileFromDataURI($file_name, $file_type, $file_data, $relative_directory, $public);
                 $upload_location = File::upload($uploadedFile, null, true);
 
                 $file->file_name = $file_name;

src/FileModel.php

@@ -131,7 +131,7 @@ public static function upload(UploadedFile $file, $relative_directory = null, $p
             : '');
 
         // Public or private
-        $visibility = $public ? 'public' : 'private';
+        $visibility = $public ? 'public-read' : 'private';
 
         return $disk->putFileAs($directory, $file, $file->getClientOriginalName(), $visibility);
     }
@@ -198,7 +198,7 @@ public function s3AuthorizeUploadUrl($public = false, $timing = '+24 hours')
         }
 
         // Public or private
-        $visibility = $public ? 'public' : 'private';
+        $visibility = $public ? 'public-read' : 'private';
 
         $s3Client = AWS::createClient($filesystem_driver);