isReady / isInit

modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php

@@ -95,7 +95,7 @@ abstract class SalesforceMappingFormBase extends EntityForm {
    */
   protected function ensureConnection($method = 'objects', $arg = []) {
     $message = '';
-    if ($this->client->isReady()) {
+    if ($this->client->isInit()) {
       try {
         $this->client->{$method}($arg);
         return TRUE;

src/Rest/RestClient.php

@@ -145,8 +145,11 @@ class RestClient implements RestClientInterface {
     return $this;
   }
 
-  public function isReady() {
-    if (!$this->authProvider || !$this->authToken) {
+  /**
+   * {@inheritdoc}
+   */
+  public function isInit() {
+    if (!$this->authProvider || !$this->authToken || !$this->authManager) {
       return FALSE;
     }
     return TRUE;
@@ -156,6 +159,9 @@ class RestClient implements RestClientInterface {
    * {@inheritdoc}
    */
   public function apiCall($path, array $params = [], $method = 'GET', $returnObject = FALSE) {
+    if (!$this->isInit()) {
+      throw new RestException(NULL, 'RestClient is not initialized.');
+    }
     if (!$this->authToken) {
       $this->authManager->refreshToken();
     }

src/Rest/RestClientInterface.php

@@ -14,10 +14,14 @@ interface RestClientInterface {
   /**
    * Check if the client is ready to perform API calls.
    *
+   * TRUE indicates that the various dependencies are in place to initiate an
+   * API call. It does NOT indicate that the API call will be successful, or
+   * return a 200 status.
+   *
    * @return bool
-   *   TRUE if the client is ready to perform API calls. Otherwise FALSE.
+   *   FALSE if the client is not initialized. TRUE otherwise.
    */
-  public function isReady();
+  public function isInit();
 
   /**
    * Make a call to the Salesforce REST API.