Merge pull request #18 from tattersoftware/session-fix

Session fix

Author: MGatner

composer.json

@@ -72,9 +72,6 @@
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"scripts": {
-		"post-update-cmd": [
-			"composer dump-autoload"
-		],
 		"analyze": "phpstan analyze",
 		"style": "phpcbf --standard=./vendor/codeigniter4/codeigniter4-standard/CodeIgniter4 src/ tests/",
 		"test": "phpunit"

src/Controllers/Files.php

@@ -417,6 +417,7 @@ public function upload()
 			// Check for more chunks
 			if ($chunkIndex < $totalChunks - 1)
 			{
+				session_write_close();
 				return '';
 			}
 
@@ -432,9 +433,13 @@ public function upload()
 		// Accept the file
 		$file = $this->model->createFromPath($path ?? $upload->getRealPath(), $data);
 
-		return $this->request->isAJAX()
-			? ''
-			: redirect()->back()->with('message', lang('File.uploadSucces', [$file->clientname]));;
+		if ($this->request->isAJAX())
+		{
+			session_write_close();
+			return '';
+		}
+
+		return redirect()->back()->with('message', lang('File.uploadSucces', [$file->clientname]));
 	}
 
 	/**

src/Views/Dropzone/config.php

@@ -10,7 +10,7 @@
 
 	// Limit files to the MB equivalent of 500 chunks
 	$maxFileSize = round($chunkSize * 500 / 1024 / 1024, 1);
-	?>
+?>
 		Dropzone.options.filesDropzone = {
 
 			// Reload file list after uploads
@@ -22,10 +22,7 @@
 
 			// Maximum file size in MB
 			maxFilesize: <?= $maxFileSize ?>,
-
-			// Disable parallel uploads
-			// (CodeIgniter4 Sessions chokes on interspersed AJAX calls)
-			parallelUploads: 1,
+			timeout: 0,
 
 			// Enable chunking
 			chunking: true,

src/Views/index.php

@@ -68,6 +68,9 @@
 		</div>
 	</div>
 
+<?= $this->endSection() ?>
+<?= $this->section('footerAssets') ?>
+
 	<?= view(config('Files')->views['dropzone']) ?>
 
 <?= $this->endSection() ?>

tests/_support/FeatureTestCase.php

@@ -3,6 +3,7 @@
 use CodeIgniter\Config\Factories;
 use Config\Services;
 use Tatter\Files\Models\FileModel;
+use Tests\Support\Models\UserModel;
 
 class FeatureTestCase extends FilesTestCase
 {
@@ -37,6 +38,9 @@ protected function setUp(): void
 		parent::setUp();
 
 		$this->resetAuthServices();
+
+		// Make sure we use the correct UserModel for permissions
+		Factories::injectMock('models', UserModel::class, new UserModel());
 	}
 
 	/**