Work on encryption service provider.

taylorotwell · taylorotwell · commit 17ce4ed996d4 · 2016-03-25T08:10:16.000-05:00
diff --git a/src/Illuminate/Encryption/EncryptionServiceProvider.php b/src/Illuminate/Encryption/EncryptionServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Encryption;
 
 use RuntimeException;
+use Illuminate\Support\Str;
 use Illuminate\Support\ServiceProvider;
 
 class EncryptionServiceProvider extends ServiceProvider
@@ -11,25 +12,37 @@ class EncryptionServiceProvider extends ServiceProvider
      * Register the service provider.
      *
      * @return void
-     *
-     * @throws \RuntimeException
      */
     public function register()
     {
         $this->app->singleton('encrypter', function ($app) {
             $config = $app->make('config')->get('app');
 
-            $key = $config['key'];
-
-            $cipher = $config['cipher'];
-
-            if (Encrypter::supported($key, $cipher)) {
-                return new Encrypter($key, $cipher);
-            } elseif (McryptEncrypter::supported($key, $cipher)) {
-                return new McryptEncrypter($key, $cipher);
-            } else {
-                throw new RuntimeException('No supported encrypter found. The cipher and / or key length are invalid.');
+            if (Str::startsWith($key = $config['key'], 'base64:')) {
+                $key = base64_decode(substr($key, 7));
             }
+
+            return $this->getEncrypterForKeyAndCipher($key, $config['cipher']);
         });
     }
+
+    /**
+     * Get the proper encrypter instance for the given key and cipher.
+     *
+     * @param  string  $key
+     * @param  string  $cipher
+     * @return mixed
+     *
+     * @throws \RuntimeException
+     */
+    protected function getEncrypterForKeyAndCipher($key, $cipher)
+    {
+        if (Encrypter::supported($key, $cipher)) {
+            return new Encrypter($key, $cipher);
+        } elseif (McryptEncrypter::supported($key, $cipher)) {
+            return new McryptEncrypter($key, $cipher);
+        } else {
+            throw new RuntimeException('No supported encrypter found. The cipher and / or key length are invalid.');
+        }
+    }
 }
