Make encrypt and decrypt symetric

Author: pmclain

lib/internal/Magento/Framework/Encryption/Adapter/Sodium.php

@@ -16,22 +16,14 @@ class Sodium implements EncryptionAdapterInterface
      */
     private $key;
 
-    /**
-     * @var int
-     */
-    private $keyVersion;
-
     /**
      * Sodium constructor.
      * @param string $key
-     * @param int|null $keyVersion
      */
     public function __construct(
-        string $key,
-        int $keyVersion = null
+        string $key
     ) {
         $this->key = $key;
-        $this->keyVersion = $keyVersion;
     }
 
     /**
@@ -50,9 +42,7 @@ public function encrypt(string $data): string
             $this->key
         );
 
-        return $this->keyVersion .
-            ':' . Encryptor::CIPHER_AEAD_CHACHA20POLY1305 .
-            ':' . base64_encode($nonce . $cipherText);
+        return $nonce . $cipherText;
     }
 
     /**

lib/internal/Magento/Framework/Encryption/Encryptor.php

@@ -274,9 +274,11 @@ private function getPasswordVersion()
      */
     public function encrypt($data)
     {
-        $crypt = new Sodium($this->keys[$this->keyVersion], $this->keyVersion);
+        $crypt = new Sodium($this->keys[$this->keyVersion]);
 
-        return $crypt->encrypt($data);
+        return $this->keyVersion .
+            ':' . self::CIPHER_AEAD_CHACHA20POLY1305 .
+            ':' . base64_encode($crypt->encrypt($data));
     }
 
     /**