UHF-9239: Remove VaultAuthorizer

helfi_api_base.services.yml

@@ -151,10 +151,3 @@ services:
       - '@cache.default'
       - '@datetime.time'
       - '@helfi_api_base.environment_resolver'
-
-  helfi_api_base.vault_authorizer:
-    class: Drupal\helfi_api_base\ApiClient\VaultAuthorizer
-    abstract: true
-    arguments:
-      - '@config.factory'
-      - '@helfi_api_base.vault_manager'

src/ApiClient/ApiClientBase.php

@@ -52,8 +52,6 @@ abstract class ApiClientBase {
    *   The environment resolver.
    * @param \Psr\Log\LoggerInterface $logger
    *   Logger channel.
-   * @param \Drupal\helfi_api_base\ApiClient\ApiAuthorizerInterface|null $authorizer
-   *   The authorization plugin.
    * @param array $defaultOptions
    *   Default request options.
    */
@@ -63,7 +61,6 @@ public function __construct(
     protected readonly TimeInterface $time,
     protected readonly EnvironmentResolverInterface $environmentResolver,
     protected readonly LoggerInterface $logger,
-    protected readonly ?ApiAuthorizerInterface $authorizer = NULL,
     private readonly array $defaultOptions = [],
   ) {
   }
@@ -80,16 +77,6 @@ public function withBypassCache() : self {
     return $instance;
   }
 
-  /**
-   * Is the authorizer configured.
-   *
-   * @return bool
-   *   True if the requests contain authorization header.
-   */
-  public function hasAuthorization(): bool {
-    return (bool) $this->authorizer?->getAuthorization();
-  }
-
   /**
    * Gets the default request options.
    *
@@ -109,10 +96,6 @@ protected function getRequestOptions(string $environmentName, array $options = [
       'curl' => [CURLOPT_TCP_KEEPALIVE => TRUE],
     ];
 
-    if ($this->hasAuthorization()) {
-      $default['headers']['Authorization'] = $this->authorizer?->getAuthorization();
-    }
-
     if ($environmentName === 'local') {
       // Disable SSL verification in local environment.
       $default['verify'] = FALSE;

tests/src/Unit/ApiClient/ApiClientBaseTest.php

@@ -93,8 +93,6 @@ private function getTimeMock(int $expectedTime) : ObjectProphecy {
    *   The time prophecy.
    * @param \Psr\Log\LoggerInterface|null $logger
    *   The logger.
-   * @param \Drupal\helfi_api_base\ApiClient\ApiAuthorizerInterface|null $authorizer
-   *   The api authorizer.
    * @param \Drupal\helfi_api_base\Environment\EnvironmentResolverInterface|null $environmentResolver
    *   The environment resolver.
    * @param array $requestOptions
@@ -107,7 +105,6 @@ private function getSut(
     ClientInterface $client = NULL,
     TimeInterface $time = NULL,
     LoggerInterface $logger = NULL,
-    ApiAuthorizerInterface $authorizer = NULL,
     EnvironmentResolverInterface $environmentResolver = NULL,
     array $requestOptions = [],
   ) : ApiClient {
@@ -134,53 +131,10 @@ private function getSut(
       $time,
       $environmentResolver,
       $logger,
-      $authorizer,
       $requestOptions,
     );
   }
 
-  /**
-   * Tests authorization.
-   *
-   * @covers ::__construct
-   * @covers ::makeRequest
-   * @covers ::getRequestOptions
-   * @covers ::hasAuthorization
-   * @covers \Drupal\helfi_api_base\ApiClient\ApiResponse::__construct
-   * @covers \Drupal\helfi_api_base\ApiClient\VaultAuthorizer::__construct
-   * @covers \Drupal\helfi_api_base\ApiClient\VaultAuthorizer::getAuthorization
-   * @covers \Drupal\helfi_api_base\ApiClient\VaultAuthorizer::getToken
-   */
-  public function testAuthorization() : void {
-    $requests = [];
-    $client = $this->createMockHistoryMiddlewareHttpClient($requests, [
-      new Response(200, body: json_encode(['key' => 'value'])),
-    ]);
-
-    $sut = $this->getSut(
-      $client,
-      authorizer: new VaultAuthorizer(
-        $this->getConfigFactoryStub([]),
-        new VaultManager([
-          new AuthorizationToken('vault_key', '123'),
-        ]),
-        'vault_key',
-      ),
-      requestOptions: [
-        'headers' => ['X-Custom-Header' => '1'],
-      ],
-    );
-
-    $sut->exposedMakeRequest('GET', '/foo');
-
-    $this->assertCount(1, $requests);
-    // Make sure SSL verification is disabled on local.
-    $this->assertFalse($requests[0]['options']['verify']);
-    // Make sure headers are set.
-    $this->assertEquals('Basic 123', $requests[0]['request']->getHeader('Authorization')[0]);
-    $this->assertEquals('1', $requests[0]['request']->getHeader('X-Custom-Header')[0]);
-  }
-
   /**
    * Test makeRequest().
    *