Updates to the key service

Author: adam-bergstein

encrypt.services.yml

@@ -1,7 +1,7 @@
 services:
   encryption:
     class: Drupal\encrypt\EncryptService
-    arguments: ['@entity.manager', '@plugin.manager.encrypt.encryption_methods', '@key_manager']
+    arguments: ['@entity.manager', '@plugin.manager.encrypt.encryption_methods', '@key_repository']
 
   plugin.manager.encrypt.encryption_methods:
     class: Drupal\encrypt\EncryptionMethodManager

src/EncryptService.php

@@ -8,7 +8,7 @@
 namespace Drupal\encrypt;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\key\KeyManager;
+use Drupal\key\KeyRepository;
 
 /**
  * Class EncryptService.
@@ -28,17 +28,17 @@ class EncryptService implements EncryptServiceInterface {
   protected $encryptManager;
 
   /**
-   * @var \Drupal\key\KeyManager
+   * @var \Drupal\key\KeyRepository
    */
   protected $key;
 
 
   /**
    * @param \Drupal\Core\Entity\EntityManagerInterface $entityManager
    * @param \Drupal\encrypt\EncryptionMethodManager $manager
-   * @param \Drupal\key\KeyManager $key
+   * @param \Drupal\key\KeyRepository $key
    */
-  public function __construct(EntityManagerInterface $entityManager, EncryptionMethodManager $encryptManager, KeyManager $key) {
+  public function __construct(EntityManagerInterface $entityManager, EncryptionMethodManager $encryptManager, KeyRepository $key) {
     $this->entityManager = $entityManager;
     $this->encryptManager = $encryptManager;
     $this->key = $key;
@@ -74,9 +74,9 @@ public function encrypt($text, $inst_id = NULL) {
     // Load the key.
     $key_id = $enc_profile->getEncryptionKey();
     if ($key_id != 'default') {
-      $key_value = $this->key->getKeyValue($key_id);
+      $key_value = $this->key->getKey($key_id)->getKeyValue();
     } else {
-      $key_value = $this->key->getDefaultKeyValue();
+      $key_value = $this->key->getKey()->getKeyValue();
     }
 
     // Load the encryption method.
@@ -108,9 +108,9 @@ public function decrypt($text, $inst_id = NULL) {
     // Load the key.
     $key_id = $enc_profile->getEncryptionKey();
     if ($key_id != 'default') {
-      $key_value = $this->key->getKeyValue($key_id);
+      $key_value = $this->key->getKey($key_id)->getKeyValue();
     } else {
-      $key_value = $this->key->getDefaultKeyValue();
+      $key_value = $this->key->getKey()->getKeyValue();
     }
 
     // Load the encryption method.