fixed #204 - [EncryptionService] Add fallback for secret

Author: fashxp

src/Encryption/DefaultEncryptionService.php

@@ -17,6 +17,8 @@
 
 use CustomerManagementFrameworkBundle\Traits\LoggerAware;
 use Defuse\Crypto\Crypto;
+use Defuse\Crypto\Encoding;
+use Defuse\Crypto\Exception\BadFormatException;
 use Defuse\Crypto\Key;
 
 class DefaultEncryptionService implements EncryptionServiceInterface
@@ -51,7 +53,17 @@ public function getDefaultKey()
                 throw new \RuntimeException('Need an encryption secret');
             }
 
-            $this->defaultKey = Key::loadFromAsciiSafeString($secret);
+            try {
+                $this->defaultKey = Key::loadFromAsciiSafeString($secret);
+            } catch (BadFormatException $e) {
+
+                //fallback if secret is generated by Pimcore composer plugin and is actually a byte sequence
+                $secret = Encoding::saveBytesToChecksummedAsciiSafeString(
+                    \Defuse\Crypto\Key::KEY_CURRENT_VERSION,
+                    base64_decode($secret)
+                );
+                $this->defaultKey = Key::loadFromAsciiSafeString($secret);
+            }
         }
 
         return $this->defaultKey;