Skip to content

Commit c6d216c

Browse files
committed
Remove fileupload middleware
1 parent 01b40ca commit c6d216c

File tree

2 files changed

+27
-51
lines changed

2 files changed

+27
-51
lines changed

api.php

Lines changed: 27 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3188,35 +3188,6 @@ public function handle(Request $request): Response
31883188
}
31893189
}
31903190

3191-
// file: src/Tqdev/PhpCrudApi/Middleware/FileUploadMiddleware.php
3192-
3193-
class FileUploadMiddleware extends Middleware
3194-
{
3195-
public function handle(Request $request): Response
3196-
{
3197-
$files = $request->getUploadedFiles();
3198-
if (!empty($files)) {
3199-
$body = $request->getBody();
3200-
foreach ($files as $fieldName => $file) {
3201-
if (isset($file['error']) && $file['error']) {
3202-
return $this->responder->error(ErrorCode::FILE_UPLOAD_FAILED, $fieldName);
3203-
}
3204-
foreach ($file as $key => $value) {
3205-
if ($key == 'tmp_name') {
3206-
$value = base64_encode(file_get_contents($value));
3207-
$key = $fieldName;
3208-
} else {
3209-
$key = $fieldName . '_' . $key;
3210-
}
3211-
$body->$key = $value;
3212-
}
3213-
}
3214-
$request->setBody($body);
3215-
}
3216-
return $this->next->handle($request);
3217-
}
3218-
}
3219-
32203191
// file: src/Tqdev/PhpCrudApi/Middleware/FirewallMiddleware.php
32213192

32223193
class FirewallMiddleware extends Middleware
@@ -3266,6 +3237,30 @@ public function handle(Request $request): Response
32663237
}
32673238
}
32683239

3240+
// file: src/Tqdev/PhpCrudApi/Middleware/FormMiddleware.php
3241+
3242+
class FormMiddleware extends Middleware
3243+
{
3244+
public function handle(Request $request): Response
3245+
{
3246+
$body = $request->getBody();
3247+
if (!$body) {
3248+
$body = file_get_contents('php://input');
3249+
if ($body) {
3250+
parse_str($body, $input);
3251+
foreach ($input as $key => $value) {
3252+
if (substr($key, -9) == '__is_null') {
3253+
$input[substr($key, 0, -9)] = null;
3254+
unset($input[$key]);
3255+
}
3256+
}
3257+
$request->setBody((object) $input);
3258+
}
3259+
}
3260+
return $this->next->handle($request);
3261+
}
3262+
}
3263+
32693264
// file: src/Tqdev/PhpCrudApi/Middleware/JwtAuthMiddleware.php
32703265

32713266
class JwtAuthMiddleware extends Middleware
@@ -5070,9 +5065,6 @@ public function __construct(Config $config)
50705065
case 'jwtAuth':
50715066
new JwtAuthMiddleware($router, $responder, $properties);
50725067
break;
5073-
case 'fileUpload':
5074-
new FileUploadMiddleware($router, $responder, $properties);
5075-
break;
50765068
case 'validation':
50775069
new ValidationMiddleware($router, $responder, $properties, $reflection);
50785070
break;
@@ -5405,17 +5397,10 @@ private function decodeBody(String $body) /*: ?object*/
54055397

54065398
private function parseBody(String $body = null) /*: void*/
54075399
{
5408-
if ($body) {
5409-
$object = $this->decodeBody($body);
5410-
} else {
5411-
if (!empty($_FILES)) {
5412-
$object = (object) $_POST;
5413-
} else {
5414-
$input = file_get_contents('php://input');
5415-
$object = $this->decodeBody($input);
5416-
}
5400+
if (!$body) {
5401+
$body = file_get_contents('php://input');
54175402
}
5418-
$this->body = $object;
5403+
$this->body = $this->decodeBody($body);
54195404
}
54205405

54215406
public function getMethod(): String
@@ -5493,11 +5478,6 @@ public static function fromString(String $request): Request
54935478
}
54945479
return new Request($method, $path, $query, $headers, $body);
54955480
}
5496-
5497-
public function getUploadedFiles(): array
5498-
{
5499-
return $_FILES;
5500-
}
55015481
}
55025482

55035483
// file: src/Tqdev/PhpCrudApi/Response.php

src/Tqdev/PhpCrudApi/Api.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Tqdev\PhpCrudApi\Middleware\BasicAuthMiddleware;
1515
use Tqdev\PhpCrudApi\Middleware\CorsMiddleware;
1616
use Tqdev\PhpCrudApi\Middleware\CustomizationMiddleware;
17-
use Tqdev\PhpCrudApi\Middleware\FileUploadMiddleware;
1817
use Tqdev\PhpCrudApi\Middleware\FirewallMiddleware;
1918
use Tqdev\PhpCrudApi\Middleware\JwtAuthMiddleware;
2019
use Tqdev\PhpCrudApi\Middleware\MultiTenancyMiddleware;
@@ -60,9 +59,6 @@ public function __construct(Config $config)
6059
case 'jwtAuth':
6160
new JwtAuthMiddleware($router, $responder, $properties);
6261
break;
63-
case 'fileUpload':
64-
new FileUploadMiddleware($router, $responder, $properties);
65-
break;
6662
case 'validation':
6763
new ValidationMiddleware($router, $responder, $properties, $reflection);
6864
break;

0 commit comments

Comments
 (0)