fix withCredentials method

Signed-off-by: mesilov <[email protected]>

Author: mesilov

CHANGELOG.md

@@ -46,9 +46,11 @@
 * method `Services\Main\Service::getAllMethods` marks as deprecated
 * method `Services\Main\Service::getMethodsByScope` marks as deprecated
 * fabric methods for `Bitrix24\SDK\Core\Credentials`
-  are [consistent](https://github.com/mesilov/bitrix24-php-sdk/issues/303): `createFromWebhook`, `createFromOAuth`, `createFromPlacementRequest`
+  are [consistent](https://github.com/mesilov/bitrix24-php-sdk/issues/303): `createFromWebhook`, `createFromOAuth`
+  , `createFromPlacementRequest`
 * deleted [unused class](https://github.com/mesilov/bitrix24-php-sdk/issues/303) `Bitrix24\SDK\Core\Response\DTO\ResponseDataCollection`
-
+* deleted [method](https://github.com/mesilov/bitrix24-php-sdk/issues/303) `CoreBuilder::withWebhookUrl`, use
+  method `CoreBuilder::withCredentials`
 
 ### Bugfix
 

src/Core/CoreBuilder.php

@@ -27,7 +27,6 @@ class CoreBuilder
     protected HttpClientInterface $httpClient;
     protected EventDispatcherInterface $eventDispatcher;
     protected LoggerInterface $logger;
-    protected ?WebhookUrl $webhookUrl;
     protected ?Credentials $credentials;
     protected ApiLevelErrorHandler $apiLevelErrorHandler;
 
@@ -44,7 +43,6 @@ public function __construct()
                 'timeout'      => 120,
             ]
         );
-        $this->webhookUrl = null;
         $this->credentials = null;
         $this->apiClient = null;
         $this->apiLevelErrorHandler = new ApiLevelErrorHandler($this->logger);
@@ -62,20 +60,6 @@ public function withCredentials(Credentials $credentials): self
         return $this;
     }
 
-    /**
-     * @param string $webhookUrl
-     *
-     * @return $this
-     * @throws \Bitrix24\SDK\Core\Exceptions\InvalidArgumentException
-     * @deprecated use withCredentials
-     */
-    public function withWebhookUrl(string $webhookUrl): self
-    {
-        $this->webhookUrl = new WebhookUrl($webhookUrl);
-
-        return $this;
-    }
-
     /**
      * @param ApiClientInterface $apiClient
      *
@@ -118,10 +102,8 @@ public function withEventDispatcher(EventDispatcherInterface $eventDispatcher):
      */
     public function build(): CoreInterface
     {
-        if ($this->webhookUrl !== null) {
-            $this->credentials = Credentials::createFromWebhook($this->webhookUrl);
-        } elseif ($this->credentials === null) {
-            throw new InvalidArgumentException('you must set webhook url or oauth credentials before call method build');
+        if ($this->credentials === null) {
+            throw new InvalidArgumentException('you must set credentials before call method build');
         }
 
         if ($this->apiClient === null) {

tests/Integration/Fabric.php

@@ -9,6 +9,7 @@
 use Bitrix24\SDK\Core\Contracts\BulkItemsReaderInterface;
 use Bitrix24\SDK\Core\Contracts\CoreInterface;
 use Bitrix24\SDK\Core\CoreBuilder;
+use Bitrix24\SDK\Core\Credentials\Credentials;
 use Bitrix24\SDK\Services\ServiceBuilder;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
@@ -57,7 +58,7 @@ public static function getCore(): CoreInterface
     {
         return (new CoreBuilder())
             ->withLogger(self::getLogger())
-            ->withWebhookUrl($_ENV['BITRIX24_PHP_SDK_PLAYGROUND_WEBHOOK'] ?? $_ENV['BITRIX24_WEBHOOK'])
+            ->withCredentials(Credentials::createFromWebhook($_ENV['BITRIX24_PHP_SDK_PLAYGROUND_WEBHOOK'] ?? $_ENV['BITRIX24_WEBHOOK']))
             ->build();
     }
 

tests/Unit/Core/CoreBuilderTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bitrix24\SDK\Tests\Unit\Core;
+
+use Bitrix24\SDK\Core\CoreBuilder;
+use Bitrix24\SDK\Core\Credentials\Credentials;
+use Bitrix24\SDK\Core\Credentials\WebhookUrl;
+use Bitrix24\SDK\Core\Exceptions\InvalidArgumentException;
+use Bitrix24\SDK\Core\Exceptions\UnknownScopeCodeException;
+use PHPUnit\Framework\TestCase;
+
+class CoreBuilderTest extends TestCase
+{
+    /**
+     * @throws UnknownScopeCodeException
+     * @throws \Bitrix24\SDK\Core\Exceptions\InvalidArgumentException
+     */
+    public function testBuildWithCredentialsFromWebhook(): void
+    {
+        $core = (new CoreBuilder())
+            ->withCredentials(Credentials::createFromWebhook(new WebhookUrl('https://127.0.0.1')))
+            ->build();
+        // successful build core
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @throws UnknownScopeCodeException
+     * @throws \Bitrix24\SDK\Core\Exceptions\InvalidArgumentException
+     */
+    public function testBuildWithoutCredentials(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $core = (new CoreBuilder())
+            ->build();
+    }
+}

tools/DemoDataGenerators/CRM/Contacts/GenerateContactsCommand.php

@@ -7,6 +7,8 @@
 use Bitrix24\SDK\Core\Batch;
 use Bitrix24\SDK\Core\BulkItemsReader\BulkItemsReaderBuilder;
 use Bitrix24\SDK\Core\CoreBuilder;
+use Bitrix24\SDK\Core\Credentials\Credentials;
+use Bitrix24\SDK\Core\Credentials\WebhookUrl;
 use Bitrix24\SDK\Core\Exceptions\BaseException;
 use Bitrix24\SDK\Services\ServiceBuilder;
 use InvalidArgumentException;
@@ -114,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             // todo create service builder factory
             $core = (new CoreBuilder())
                 ->withLogger($this->logger)
-                ->withWebhookUrl($b24Webhook)
+                ->withCredentials(Credentials::createFromWebhook(new WebhookUrl($b24Webhook)))
                 ->build();
             $batch = new Batch(
                 $core,

tools/PerformanceBenchmarks/ListCommand.php

@@ -8,6 +8,8 @@
 use Bitrix24\SDK\Core\Contracts\BatchInterface;
 use Bitrix24\SDK\Core\Contracts\CoreInterface;
 use Bitrix24\SDK\Core\CoreBuilder;
+use Bitrix24\SDK\Core\Credentials\Credentials;
+use Bitrix24\SDK\Core\Credentials\WebhookUrl;
 use Bitrix24\SDK\Core\Exceptions\BaseException;
 use Bitrix24\SDK\Core\Exceptions\TransportException;
 use Psr\Log\LoggerInterface;
@@ -147,7 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $this->core = (new CoreBuilder())
                 ->withLogger($this->logger)
-                ->withWebhookUrl($b24Webhook)
+                ->withCredentials(Credentials::createFromWebhook(new WebhookUrl($b24Webhook)))
                 ->build();
             $this->batch = new Batch(
                 $this->core,

tools/ShowFieldsDescriptionCommand.php

@@ -5,6 +5,9 @@
 namespace Bitrix24\SDK\Tools;
 
 use Bitrix24\SDK\Core\Contracts\CoreInterface;
+use Bitrix24\SDK\Core\CoreBuilder;
+use Bitrix24\SDK\Core\Credentials\Credentials;
+use Bitrix24\SDK\Core\Credentials\WebhookUrl;
 use Bitrix24\SDK\Core\Exceptions\BaseException;
 use Bitrix24\SDK\Core\Response\Response;
 use Psr\Log\LoggerInterface;
@@ -80,9 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $io = new SymfonyStyle($input, $output);
         try {
-            $this->core = (new \Bitrix24\SDK\Core\CoreBuilder())
+            $this->core = (new CoreBuilder())
                 ->withLogger($this->logger)
-                ->withWebhookUrl($b24Webhook)
+                ->withCredentials(Credentials::createFromWebhook(new WebhookUrl($b24Webhook)))
                 ->build();
 
             $methods = $this->core->call('methods', ['full' => true])->getResponseData()->getResult()->getResultData();