From 432d4a93922e5cf78ff42e2eb02c3905cc3d3887 Mon Sep 17 00:00:00 2001
From: Aaron Bauman <aaron@messageagency.com>
Date: Fri, 28 Dec 2018 16:45:28 -0500
Subject: [PATCH] Couple more updates to docs

---
 composer.json                               | 2 --
 src/Rest/RestClient.php                     | 4 ++--
 src/SalesforceAuthProviderPluginManager.php | 4 ++--
 src/Storage/SalesforceAuthTokenStorage.php  | 8 +++++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index b96738b4..b02b2183 100644
--- a/composer.json
+++ b/composer.json
@@ -30,9 +30,7 @@
     "consolidation/output-formatters": "^3.2.0",
     "drupal/dynamic_entity_reference": "^2.0@alpha",
     "drupal/encrypt": "^3.0@rc",
-    "drupal/key": "^1.7",
     "lusitanian/oauth": "^0.8.11",
-    "firebase/php-jwt": "^5.0",
     "messageagency/force.com-toolkit-for-php": "^1.0.0"
   }
 }
diff --git a/src/Rest/RestClient.php b/src/Rest/RestClient.php
index efa963e5..2b734963 100644
--- a/src/Rest/RestClient.php
+++ b/src/Rest/RestClient.php
@@ -95,7 +95,7 @@ class RestClient implements RestClientInterface {
    *
    * @var \Drupal\salesforce\Storage\SalesforceAuthTokenStorage
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   private $storage;
 
@@ -137,7 +137,7 @@ class RestClient implements RestClientInterface {
    * @return \Drupal\salesforce\Storage\SalesforceAuthTokenStorage
    *   The auth token storage service.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   private function storage() {
     if (!$this->storage) {
diff --git a/src/SalesforceAuthProviderPluginManager.php b/src/SalesforceAuthProviderPluginManager.php
index b05ffe9b..3b24f076 100644
--- a/src/SalesforceAuthProviderPluginManager.php
+++ b/src/SalesforceAuthProviderPluginManager.php
@@ -61,7 +61,7 @@ class SalesforceAuthProviderPluginManager extends DefaultPluginManager {
   /**
    * Backwards-compatibility for legacy singleton auth.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   public static function updateAuthConfig() {
     $oauth = self::getAuthConfig();
@@ -79,7 +79,7 @@ class SalesforceAuthProviderPluginManager extends DefaultPluginManager {
   /**
    * Backwards-compatibility for legacy singleton auth.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   public static function getAuthConfig() {
     $config = \Drupal::configFactory()->getEditable('salesforce.settings');
diff --git a/src/Storage/SalesforceAuthTokenStorage.php b/src/Storage/SalesforceAuthTokenStorage.php
index 615d9cd8..beb74b73 100644
--- a/src/Storage/SalesforceAuthTokenStorage.php
+++ b/src/Storage/SalesforceAuthTokenStorage.php
@@ -40,7 +40,7 @@ class SalesforceAuthTokenStorage implements SalesforceAuthTokenStorageInterface
    * @return string
    *   Id of the active oauth.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   private function service() {
     $oauth = SalesforceAuthProviderPluginManager::getAuthConfig();
@@ -50,7 +50,7 @@ class SalesforceAuthTokenStorage implements SalesforceAuthTokenStorageInterface
   /**
    * Backwards-compatibility for legacy singleton auth.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   public function updateToken() {
     $this->storeAccessToken($this->service(),
@@ -63,7 +63,7 @@ class SalesforceAuthTokenStorage implements SalesforceAuthTokenStorageInterface
   /**
    * Backwards-compatibility for legacy singleton auth.
    *
-   * @deprecated interim, do not use.
+   * @deprecated BC legacy auth scheme only, do not use, will be removed.
    */
   public function updateIdentity() {
     $this->storeIdentity($this->service(), $this->state->get('salesforce.identity'));
@@ -143,6 +143,7 @@ class SalesforceAuthTokenStorage implements SalesforceAuthTokenStorageInterface
    */
   public function clearAllTokens() {
     // noop. We don't do this. Only here to satisfy interface.
+    return $this;
   }
 
   /**
@@ -180,6 +181,7 @@ class SalesforceAuthTokenStorage implements SalesforceAuthTokenStorageInterface
    */
   public function clearAllAuthorizationStates() {
     // noop. only here to satisfy interface. Use clearAuthorizationState().
+    return $this;
   }
 
   /**
-- 
GitLab