@@ -7,7 +7,6 @@
 use Laravel\Horizon\Http\Controllers\Controller;
 use ProcessMaker\Http\Resources\ApiCollection;
 use ProcessMaker\Models\Media;
-use ProcessMaker\Models\User;
 use Spatie\BinaryUuid\HasBinaryUuid;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -72,9 +71,14 @@ public function store(Request $request)
             throw new NotFoundHttpException();
         }
 
-        $model->addMediaFromRequest('file')->toMediaCollection('local');
+        $addedMedia = $model->addMediaFromRequest('file')->toMediaCollection('local');
 
-        return response([], 201);
+        return response([
+            'uuid' => $addedMedia->uuid_text,
+            'model_id' => $addedMedia->model_id_text,
+            'file_name' => $addedMedia->file_name,
+            'mime_type' => $addedMedia->mime_type
+        ], 200);
     }
 
     /**
@@ -116,7 +120,10 @@ public function edit($id)
      */
     public function update(Request $request, Media $file)
     {
-        //
+        $newFile = $request->file('file');
+        $newMedia = new \ProcessMaker\Media();
+        $newMedia->updateFile($newFile, $file);
+        return response([], 201);
     }
 
     /**
 
@@ -2,10 +2,58 @@
 
 namespace ProcessMaker;
 
+use Illuminate\Http\File;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
 use Spatie\BinaryUuid\HasBinaryUuid;
+use Spatie\MediaLibrary\FileManipulator;
+use Spatie\MediaLibrary\Filesystem\Filesystem;
 use Spatie\MediaLibrary\Models\Media as BaseMedia;
 
 class Media extends BaseMedia
 {
     use HasBinaryUuid;
+
+    /**
+     * The binary UUID attributes that should be converted to text.
+     *
+     * @var array
+     */
+    protected $uuids = [
+        'model_id'
+    ];
+
+    /**
+     * Updates the Media with a new file
+     *
+     * @param UploadedFile $newFile
+     * @param Models\Media $file
+     */
+    public function updateFile(UploadedFile $newFile, \ProcessMaker\Models\Media $file)
+    {
+        $originalFilePath = $file->uuid_text . '/' . $file->file_name;
+        $newFileName = $this->sanitizeFileName($newFile->getClientOriginalName());
+        $newFilePath = $file->uuid_text . '/' . $newFileName;
+
+        Storage::disk('public')->delete($originalFilePath);
+        Storage::disk('public')->put($newFilePath, $newFile);
+
+        $file->file_name = $newFileName;
+        $file->name = pathinfo($newFileName, PATHINFO_FILENAME);
+        $file->mime_type = $newFile->getMimeType();
+        $file->size = filesize($newFile->path());
+        $file->save();
+    }
+
+    /**
+     * Removes from file name non accepted characters
+     *
+     * @param string $fileName
+     *
+     * @return string
+     */
+    protected function sanitizeFileName(string $fileName)
+    {
+        return str_replace(['#', '/', '\\'], '-', $fileName);
+    }
 }
@@ -2,13 +2,12 @@
 
 namespace Tests\Feature\Api;
 
-use Faker\Factory as Faker;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
+use ProcessMaker\Models\Media;
 use ProcessMaker\Models\User;
+use Spatie\BinaryUuid\HasBinaryUuid;
 use Tests\TestCase;
 use Tests\Feature\Shared\ApiCallWithUser;
 use Illuminate\Support\Facades\Hash;
@@ -124,7 +123,7 @@ public function testGetFile()
     /**
      * Upload a file and associate it to a model
      */
-    public function testCreateFile()
+  public function testCreateFile()
   {
       // We create a fake file to upload
       Storage::fake('public');
@@ -141,14 +140,53 @@ public function testCreateFile()
       $response = $this->actingAs($this->user, 'api')
           ->json('POST', self::API_TEST_URL . '?model=user&model_uuid=' . $model->uuid_text, $data);
 
+      // Validate the header status code
+      $response->assertStatus(200);
+
+      // Validate that a file was created in the media directory
+      $mediaObj = json_decode($response->getContent());
+      Storage::disk('public')->assertExists($mediaObj->uuid . '/test.txt');
+  }
+
+    /**
+     * Update a media with a new file
+     */
+    public function testUpdateFile()
+  {
+      // We create a fake file to upload
+      Storage::fake('public');
+      $fileUploadInsert = UploadedFile::fake()->create('insertedFile.txt', 1);
+      $fileUploadUpdate= UploadedFile::fake()->create('updatedFile.txt', 2);
+
+      // We create a model (in this case a user) to whom the file will be associated
+      $model = factory(User::class)->create();
+      $addedMedia = $model->addMedia($fileUploadInsert)->toMediaCollection('local');
+
+      // In the data array add the file to update
+      $data = [
+          'file' => $fileUploadUpdate
+      ];
+
+      $response = $this->actingAs($this->user, 'api')
+          ->json('PUT', self::API_TEST_URL . '/' . $addedMedia->uuid_text, $data);
+
       // Validate the header status code
       $response->assertStatus(201);
+
+      // Validate that the file was updated in the directory of the inserted media
+      Storage::disk('public')->assertExists($addedMedia->uuid_text . '/updatedFile.txt');
+
+      // Validate that the media table has been updated
+      $modelId = HasBinaryUuid::encodeUuid($addedMedia->uuid_text);
+      $updatedMediaModel = Media::find($modelId);
+      $this->assertEquals('updatedFile.txt', $updatedMediaModel->file_name);
+      $this->assertEquals('updatedFile', $updatedMediaModel->name);
   }
 
     /**
      * Remove a file and its model associations
      */
-    public function testDestroyFile()
+  public function testDestroyFile()
   {
       // We create a fake file to upload
       Storage::fake('public');