allow argument to override guzzle client config

Symplicity · Jan 31, 2024 · 06ec95f · 06ec95f
1 parent adaa7d2
commit 06ec95f
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 6 deletions.
diff --git a/src/Interfaces/Utilities/CalendarView/CalendarViewParamsInterface.php b/src/Interfaces/Utilities/CalendarView/CalendarViewParamsInterface.php
@@ -30,6 +30,11 @@ public function getSelect(): ?array;
 
     public function getDeltaToken(): ?string;
 
+    /**
+     * @return array<string, mixed>
+     */
+    public function getRequestOptions(): array;
+
     /**
      * @return array<string, string>|null
      */

diff --git a/src/Utilities/CalendarView/CalendarViewParams.php b/src/Utilities/CalendarView/CalendarViewParams.php
@@ -17,6 +17,9 @@ class CalendarViewParams extends CalendarViewRequestBuilderGetQueryParameters im
     private ?string $preferHeaders = null;
     private ?string $timezone = 'Eastern Standard Time';
 
+    /** @var array<string, mixed>  */
+    private array $requestOptions = [];
+
     public function getStartDateTime(): ?string
     {
         return $this->startDateTime;
@@ -81,6 +84,11 @@ public function getPreferHeaders(): ?string
         return $this->preferHeaders ?? 'odata.maxpagesize=50,odata.track-changes,outlook.timezone="' . $this->timezone . '"';
     }
 
+    public function getRequestOptions(): array
+    {
+        return $this->requestOptions;
+    }
+
     public function setStartDateTime(string $startDateTime): CalendarViewParams
     {
         $this->startDateTime = $startDateTime;
@@ -161,4 +169,13 @@ public function setTimezone(?string $timezone): CalendarViewParams
         $this->timezone = $timezone;
         return $this;
     }
+
+    /**
+     * @param array<string, mixed> $requestOptions
+     */
+    public function setRequestOptions(array $requestOptions): CalendarViewParams
+    {
+        $this->requestOptions = $requestOptions;
+        return $this;
+    }
 }
diff --git a/src/Utilities/CalendarView/GraphServiceCalendarView.php b/src/Utilities/CalendarView/GraphServiceCalendarView.php
@@ -25,6 +25,7 @@ class GraphServiceCalendarView
     public const BASE_URI = NationalCloud::GLOBAL;
     public const ENABLE_HTTP_ERROR = false;
     public const HTTP_VERIFY = false;
+    public const GUZZLE_HTTP_CONFIG_KEY = 'guzzleConfig';
 
     protected ?RequestAdapter $requestAdapter;
     protected ?Client $httpClient = null;
@@ -45,10 +46,13 @@ public function client(CalendarViewParamsInterface $params): MSGraphServiceClien
                 'deltaToken' => $params->getDeltaToken()
             ]));
 
-            $client = GraphClientFactory::createWithConfig(array_merge(
+            $guzzleConfig = array_merge(
                 static::getDefaultConfig(),
+                $params->getRequestOptions(),
                 ['handler' => $handlerStack]
-            ));
+            );
+
+            $client = GraphClientFactory::createWithConfig($guzzleConfig);
         }
 
         $this->requestAdapter = new GraphRequestAdapter(

diff --git a/src/Utilities/EventView/GraphServiceEvent.php b/src/Utilities/EventView/GraphServiceEvent.php
@@ -21,10 +21,12 @@ public function client(mixed $params = null): MSGraphServiceClient
             $client = $params['client'];
         } else {
             $handlerStack = GraphClientFactory::getDefaultHandlerStack();
-            $client = GraphClientFactory::createWithConfig(array_merge(
+            $guzzleConfig = array_merge(
                 static::getDefaultConfig(),
+                $params[static::GUZZLE_HTTP_CONFIG_KEY] ?? [],
                 ['handler' => $handlerStack]
-            ));
+            );
+            $client = GraphClientFactory::createWithConfig($guzzleConfig);
         }
 
         $this->requestAdapter = new GraphRequestAdapter(

diff --git a/tests/Utilities/CalendarView/GraphServiceCalendarViewTest.php b/tests/Utilities/CalendarView/GraphServiceCalendarViewTest.php
@@ -4,6 +4,9 @@
 
 namespace Symplicity\Outlook\Tests\Utilities\CalendarView;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\RequestOptions;
+use Microsoft\Graph\GraphServiceClient;
 use Microsoft\Kiota\Abstractions\RequestAdapter;
 use PHPUnit\Framework\TestCase;
 use Symplicity\Outlook\Utilities\CalendarView\CalendarViewParams;
@@ -17,9 +20,43 @@ public function testClient()
         $params->setOrderBy(['start', 'end']);
         $params->setDeltaToken('foo-delta-token==');
         $params->setFilter('Extensions(id eq \'symplicity.com\'');
+
         $graphClient = new GraphServiceCalendarView('foo', 'bar', 'token_1');
         $actualClient = $graphClient->client($params);
-        $this->assertInstanceOf(RequestAdapter::class, $actualClient->getRequestAdapter());
-        $this->assertSame('https://graph.microsoft.com/v1.0', $actualClient->getRequestAdapter()->getBaseUrl());
+        $requestAdapter = $actualClient->getRequestAdapter();
+        $this->assertInstanceOf(RequestAdapter::class, $requestAdapter);
+        $this->assertSame('https://graph.microsoft.com/v1.0', $requestAdapter->getBaseUrl());
+
+        $values = $this->getGuzzleConfig($requestAdapter, $actualClient);
+        $this->assertIsArray($values);
+        $this->assertSame(GraphServiceCalendarView::DEFAULT_CONNECT_TIMEOUT, $values['connect_timeout']);
+        $this->assertSame(GraphServiceCalendarView::DEFAULT_TIMEOUT, $values['timeout']);
+        $this->assertSame(GraphServiceCalendarView::HTTP_VERIFY, $values['verify']);
+
+        $params->setRequestOptions([
+            RequestOptions::CONNECT_TIMEOUT => 6.0,
+            RequestOptions::TIMEOUT => 8.0,
+            RequestOptions::VERIFY => true
+        ]);
+
+        $actualClient = $graphClient->client($params);
+        $requestAdapter = $actualClient->getRequestAdapter();
+        $values = $this->getGuzzleConfig($requestAdapter, $actualClient);
+        $this->assertIsArray($values);
+        $this->assertSame(6.0, $values['connect_timeout']);
+        $this->assertSame(8.0, $values['timeout']);
+        $this->assertTrue($values['verify']);
+    }
+
+    private function getGuzzleConfig(RequestAdapter $requestAdapter, GraphServiceClient $client): mixed
+    {
+        $reflection = new \ReflectionObject($requestAdapter);
+        $reflectionProperty = $reflection->getParentClass()->getParentClass()->getProperty('guzzleClient');
+
+        /** @var Client $guzzleClient */
+        $guzzleClient = $reflectionProperty->getValue($client->getRequestAdapter());
+
+        $guzzleConfigProperty = new \ReflectionProperty(Client::class, 'config');
+        return $guzzleConfigProperty->getValue($guzzleClient);
     }
 }