Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api-client/src/PendingRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ protected function handleMiddlewareRequest(ApiRequest $request): ApiRequest
protected function handleMiddlewareResponse(ApiResponse $response): ApiResponse
{
return $this->pipeline
->send($response)
->send($response->withContext('options', $this->middlewareOptions))
->through($this->createMiddleware($this->responseMiddleware))
->thenReturn();
}
Expand Down
46 changes: 41 additions & 5 deletions tests/ApiClient/PendingRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,36 @@ public function testMiddlewareCanBeEnabled(): void
TestRequestMiddleware::reset();
}

public function testWithMiddlewareOptionsPassesOptionsToMiddleware(): void
public function testWithMiddlewareOptionsPassesOptionsToRequestMiddleware(): void
{
$client = new ApiClient();
$options = ['key' => 'value', 'timeout' => 30];

$pending = $client
->withMiddlewareOptions($options)
->withRequestMiddleware([OptionsCheckingMiddleware::class]);
->withRequestMiddleware([RequestOptionsCheckingMiddleware::class]);

Http::fake(['test' => Http::response('{"success": true}')]);
$pending->get('test');

$this->assertEquals($options, OptionsCheckingMiddleware::$receivedOptions);
OptionsCheckingMiddleware::reset();
$this->assertEquals($options, RequestOptionsCheckingMiddleware::$receivedOptions);
RequestOptionsCheckingMiddleware::reset();
}

public function testWithMiddlewareOptionsPassesOptionsToResponseMiddleware(): void
{
$client = new ApiClient();
$options = ['key' => 'value', 'timeout' => 30];

$pending = $client
->withMiddlewareOptions($options)
->withResponseMiddleware([ResponseOptionsCheckingMiddleware::class]);

Http::fake(['test' => Http::response('{"success": true}')]);
$pending->get('test');

$this->assertEquals($options, ResponseOptionsCheckingMiddleware::$receivedOptions);
ResponseOptionsCheckingMiddleware::reset();
}

public function testMiddlewareCaching(): void
Expand Down Expand Up @@ -462,7 +478,7 @@ public function handle(ApiRequest $request, callable $next): ApiRequest
}
}

class OptionsCheckingMiddleware
class RequestOptionsCheckingMiddleware
{
public static ?array $receivedOptions = null;

Expand All @@ -482,6 +498,26 @@ public static function reset(): void
}
}

class ResponseOptionsCheckingMiddleware
{
public static ?array $receivedOptions = null;

public function __construct(protected ?array $config = null)
{
}

public function handle(ApiResponse $response, callable $next): ApiResponse
{
self::$receivedOptions = $response->context('options');
return $next($response);
}

public static function reset(): void
{
self::$receivedOptions = null;
}
}

class CachingTestMiddleware
{
public static ?string $instanceId = null;
Expand Down