Fix encrypter using wrong configuration to read old key

Author: avvertix

src/Encryption/Encrypter.php

@@ -23,9 +23,9 @@ public function decrypt($payload, $unserialize = true)
         } catch (\Throwable $e) {
             $currentKey = $this->key;
 
-            $this->key = Str::startsWith(config('identity.old_key'), 'base64:')
-                            ? base64_decode(substr(config('identity.old_key'), 7))
-                            : config('identity.old_key');
+            $this->key = Str::startsWith(config('identities.old_key'), 'base64:')
+                            ? base64_decode(substr(config('identities.old_key'), 7))
+                            : config('identities.old_key');
 
             return tap(parent::decrypt($payload, $unserialize), function () use ($currentKey) {
                 $this->key = $currentKey;

tests/TestCase.php

@@ -3,6 +3,7 @@
 namespace Tests;
 
 use ReflectionFunction;
+use Illuminate\Support\Str;
 use Illuminate\Events\Dispatcher;
 use Laravel\Socialite\SocialiteServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
@@ -44,6 +45,11 @@ protected function getEnvironmentSetUp($app)
             'redirect' => null,
             'instance_uri' => 'https://gitlab.com/'
         ]);
+
+        $key = Str::random(32);
+        $app['config']->set('app.key', $key);
+        $app['config']->set('app.cipher', 'AES-256-CBC');
+        $app['config']->set('identities.key', $key);
     }
 
     /**

tests/Unit/EncrypterTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+use Illuminate\Support\Str;
+use Oneofftech\Identities\Encryption\Encrypter;
+use Oneofftech\Identities\Facades\IdentityCrypt;
+
+class EncrypterTest extends TestCase
+{
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']->set('identities.old_key', Str::random(32));
+    }
+
+    public function test_value_encrypted_with_old_key_can_be_decrypted()
+    {
+        $encrypter = new Encrypter(config('identities.old_key'), 'AES-256-CBC');
+
+        $encryptedWithOldKey = $encrypter->encrypt('test');
+
+        $decrypted = IdentityCrypt::decrypt($encryptedWithOldKey);
+
+        $this->assertEquals('test', $decrypted);
+    }
+
+    public function test_value_can_be_encrypted()
+    {
+        $encrypted = IdentityCrypt::encrypt('test');
+
+        $decrypted = IdentityCrypt::decrypt($encrypted);
+
+        $this->assertEquals('test', $decrypted);
+    }
+}

tests/Unit/IdentityCryptTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+use Oneofftech\Identities\Encryption\Encrypter;
+use Oneofftech\Identities\Facades\IdentityCrypt;
+
+class IdentityCryptTest extends TestCase
+{
+    public function test_value_can_be_hashed()
+    {
+        $value = 'A value';
+        $expected = 'af4ca8f543cdca304ca2345c4d80db84d004889804974328da71bf1c451a2c2d23a71e2c853909bf5596899e74bc82b2019d20fcc93850c4d6d86fd04a67bc5d';
+
+        $result = IdentityCrypt::hash($value);
+
+        $this->assertEquals($expected, $result);
+    }
+    
+    public function test_facade_return_encrypter_instance()
+    {
+        $this->assertInstanceOf(Encrypter::class, IdentityCrypt::getFacadeRoot());
+    }
+}