Issue #3316452: Call to a member function getClientArgs() on bool in...

Issue #3316452: Call to a member function getClientArgs() on bool in Drupal\aws\AwsClientFactory->getClient()

src/AmazonSesHandler.php

@@ -77,6 +77,13 @@ class AmazonSesHandler implements AmazonSesHandlerInterface {
     $this->config = $config_factory->get('amazon_ses.settings');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getClient() {
+    return $this->client;
+  }
+
   /**
    * {@inheritdoc}
    */

src/AmazonSesHandlerInterface.php

@@ -9,6 +9,14 @@ use Symfony\Component\Mime\Email;
  */
 interface AmazonSesHandlerInterface {
 
+  /**
+   * Get the AWS SES client.
+   *
+   * @return \Aws\SesV2\SesV2Client
+   *   The AWS SES client.
+   */
+  public function getClient();
+
   /**
    * Send an email using the AWS SDK.
    *

src/Controller/AmazonSesController.php

@@ -29,6 +29,10 @@ class AmazonSesController extends ControllerBase {
    *   A render array to build the page.
    */
   public function statistics() {
+    if (!$this->verifyClient()) {
+      return [];
+    }
+
     $quota = $this->handler->getSendQuota();
 
     return [

src/Form/AmazonSesIdentitiesForm.php

@@ -33,29 +33,32 @@ class AmazonSesIdentitiesForm extends AmazonSesFormBase {
       'status' => $this->t('Status'),
     ];
 
-    $identities = $this->handler->getIdentities();
     $options = [];
 
-    foreach ($identities as $identity) {
-      $options[$identity['identity']] = [
-        'identity' => $identity['identity'],
-        'type' => $identity['type'],
-        'status' => $identity['status'],
-      ];
-
-      if ($identity['type'] == 'Domain') {
-        $record = "<strong>Name:</strong> _amazonses.{$identity['identity']}<br/>
-          <strong>Type:</strong> TXT<br/>
-          <strong>Value:</strong> {$identity['token']}";
-
-        $options[$identity['identity']]['record'] = [
-          'data' => [
-            '#markup' => $record,
-          ],
+    if ($this->verifyClient()) {
+      $identities = $this->handler->getIdentities();
+
+      foreach ($identities as $identity) {
+        $options[$identity['identity']] = [
+          'identity' => $identity['identity'],
+          'type' => $identity['type'],
+          'status' => $identity['status'],
         ];
-      }
-      else {
-        $options[$identity['identity']]['record'] = '';
+
+        if ($identity['type'] == 'Domain') {
+          $record = "<strong>Name:</strong> _amazonses.{$identity['identity']}<br/>
+            <strong>Type:</strong> TXT<br/>
+            <strong>Value:</strong> {$identity['token']}";
+
+          $options[$identity['identity']]['record'] = [
+            'data' => [
+              '#markup' => $record,
+            ],
+          ];
+        }
+        else {
+          $options[$identity['identity']]['record'] = '';
+        }
       }
     }
 

src/Traits/HandlerTrait.php

@@ -30,4 +30,21 @@ trait HandlerTrait {
     return $this;
   }
 
+  /**
+   * Verify that the AWS SES client has been initialized.
+   *
+   * @return bool
+   *   TRUE if the client is initialized, FALSE if not.
+   */
+  protected function verifyClient() {
+    $client = $this->handler->getClient();
+
+    if (!$client) {
+      $this->messenger()->addError($this->t('Unable to initialize the SES
+        client. More information may be available in the log.'));
+    }
+
+    return (bool) $client;
+  }
+
 }

tests/src/Functional/MissingClientTest.php

+<?php
+
+namespace Drupal\Tests\amazon_ses\Functional;
+
+use Drupal\Core\Url;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Tests functionality when the AWS SES client is missing.
+ *
+ * @group amazon_ses
+ */
+class MissingClientTest extends FunctionalTestBase {
+
+  /**
+   * Tests the error message is shown when the client can't be initialized.
+   */
+  public function testErrorMessage() {
+    $this->drupalGet(Url::fromRoute('amazon_ses.identities'));
+    $this->assertSession()->pageTextContains('Unable to initialize the SES client.');
+  }
+
+}