Simplified tests adding a dummy private key to use instead of mocking the CloudFrontClient

Author: IlCallo

src/CloudFrontUrlSignerServiceProvider.php

@@ -41,7 +41,7 @@ public function register()
             $cloudFrontClient = new CloudFrontClient([
                 'region' => $config['region'],
                 'version' => $config['version']
-            ]);;
+            ]);
 
             return new CloudFrontUrlSigner($cloudFrontClient, $config['private_key_path'], $config['key_pair_id']);
         });

tests/SignatureGenerationTest.php

@@ -2,30 +2,28 @@
 
 namespace Dreamonkey\CloudFrontUrlSigner\Tests;
 
-use Aws\CloudFront\CloudFrontClient;
 use DateTime;
 use DateTimeZone;
-use Dreamonkey\CloudFrontUrlSigner\CloudFrontUrlSigner;
+use League\Uri\Components\Query;
+use League\Uri\Http;
 
 class SignatureGenerationTest extends TestCase
 {
-    private $dummyPrivateKeyPath = 'dummy/path/key.pem';
+    private $dummyPrivateKeyPath = 'tests/dummy-key.pem';
     private $dummyKeyPairId = 'dummyKeyPairId';
     private $dummyUrl = 'http://myapp.com';
 
-    private $mockCloudFrontClient;
-
     protected function setUp()
     {
         parent::setUp();
-        $this->mockCloudFrontClient = $this->createMock(CloudFrontClient::class);
-        $this->mockCloudFrontClient->method('getSignedUrl')->willReturn('dummysignedurl');
+
+        config(['cloudfront-url-signer.key_pair_id' => $this->dummyKeyPairId]);
+        config(['cloudfront-url-signer.private_key_path' => $this->dummyPrivateKeyPath]);
     }
 
     /** @test */
     public function it_registered_cloudfront_url_signer_in_the_container()
     {
-        config(['cloudfront-url-signer.key_pair_id' => $this->dummyKeyPairId]);
         $instance = $this->app['cloudfront-url-signer'];
 
         $this->assertInstanceOf(\Dreamonkey\CloudFrontUrlSigner\CloudFrontUrlSigner::class, $instance);
@@ -38,8 +36,10 @@ public function it_registered_cloudfront_url_signer_in_the_container()
      */
     public function it_will_throw_an_exception_for_an_empty_key_pair_id()
     {
+        config(['cloudfront-url-signer.key_pair_id' => '']);
+
         /** @noinspection PhpUnhandledExceptionInspection */
-        new CloudFrontUrlSigner($this->mockCloudFrontClient, $this->dummyPrivateKeyPath, '');
+        sign($this->dummyUrl);
     }
 
     /**
@@ -49,24 +49,22 @@ public function it_will_throw_an_exception_for_an_empty_key_pair_id()
      */
     public function it_will_throw_an_exception_for_an_empty_private_key_path()
     {
+        config(['cloudfront-url-signer.private_key_path' => '']);
+
         /** @noinspection PhpUnhandledExceptionInspection */
-        new CloudFrontUrlSigner($this->mockCloudFrontClient, '', $this->dummyKeyPairId);
+        sign($this->dummyUrl);
     }
 
     /** @test */
     public function it_can_sign_an_url_that_expires_at_a_certain_time()
     {
-        $expiration = DateTime::createFromFormat('d/m/Y H:i:s', '10/08/2115 18:15:44',
+        $expiration = DateTime::createFromFormat('d/m/Y H:i:s', '10/08/2025 18:15:44',
             new DateTimeZone('Europe/Brussels'));
 
         /** @noinspection PhpUnhandledExceptionInspection */
-        $urlSigner = (new CloudFrontUrlSigner($this->mockCloudFrontClient,
-            $this->dummyPrivateKeyPath, $this->dummyKeyPairId));
-
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $signedUrl = $urlSigner->sign($this->dummyUrl, $expiration);
+        $signedUrl = sign($this->dummyUrl, $expiration);
 
-        $this->assertTrue(is_string($signedUrl));
+        $this->assertEquals($expiration->getTimestamp(), $this->getSignedUrlExpirationTimestamp($signedUrl));
     }
 
     /** @test */
@@ -75,13 +73,9 @@ public function it_can_sign_an_url_that_expires_after_a_relative_amount_of_days(
         $expiration = 30;
 
         /** @noinspection PhpUnhandledExceptionInspection */
-        $urlSigner = (new CloudFrontUrlSigner($this->mockCloudFrontClient,
-            $this->dummyPrivateKeyPath, $this->dummyKeyPairId));
+        $signedUrl = sign($this->dummyUrl, $expiration);
 
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $signedUrl = $urlSigner->sign($this->dummyUrl, $expiration);
-
-        $this->assertTrue(is_string($signedUrl));
+        $this->assertLessThanOrEqual(60, (new DateTime())->modify($expiration . ' days')->getTimestamp() - $this->getSignedUrlExpirationTimestamp($signedUrl));
     }
 
     /**
@@ -93,11 +87,7 @@ public function it_does_not_allow_expiration_in_the_past_when_integer_is_given()
     {
         $expiration = -5;
 
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $urlSigner = (new CloudFrontUrlSigner($this->mockCloudFrontClient,
-            $this->dummyPrivateKeyPath, $this->dummyKeyPairId));
-
-        $urlSigner->sign($this->dummyUrl, $expiration);
+        sign($this->dummyUrl, $expiration);
     }
 
     /**
@@ -109,10 +99,15 @@ public function it_does_not_allow_expiration_in_the_past_when_datetime_is_given(
     {
         $expiration = DateTime::createFromFormat('d/m/Y H:i:s', '10/08/2005 18:15:44');
 
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $urlSigner = (new CloudFrontUrlSigner($this->mockCloudFrontClient,
-            $this->dummyPrivateKeyPath, $this->dummyKeyPairId));
+        sign($this->dummyUrl, $expiration);
+    }
 
-        $urlSigner->sign($this->dummyUrl, $expiration);
+    /**
+     * @param string $signedUrl
+     * @return int
+     */
+    private function getSignedUrlExpirationTimestamp(string $signedUrl): int
+    {
+        return (int)(new Query(Http::createFromString($signedUrl)->getQuery()))->getParam('Expires');
     }
 }

tests/dummy-key.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC9gNlt7pYkGYiGzaad0RvXS2njon2tEOHm8UVA5hGULE0SYrIr
+KwFmtkhSqO0IIjxbTlRbm48sJqTnnE06YeZwOnwSi3m4qlHYVeLYRaot3U9SCDH9
+ZbZUooWUgor2jRwcyurOXfI/P7jvwmhl/XQlpEhoikqs9FTjPdp730gjrwIDAQAB
+AoGAH2hxoQTAIa+RrzX6fYGg6af4HuBZkAuSRWKLpdv74eENzRRKj1kLXGitx/Vz
+g7uY4VE0LhK0Qg8Nmc2QBzMerAWYAeoYb7jxUHKGYUrCNPGPMGgp69iskwTIKZ5B
+KMZX+yVA984NbzoqCuCCgZybHVE5zUKKnulp4VihdSmb+SECQQD4xGIk+XmXWM6D
+tz5xnctVMqtiIhObpIzaaSNXapqE8QMxkSg8HeIXMCBcfo3y53g4DjfFdr736MsX
+NfEXTenpAkEAwwNa8F4rtyxKWuUKmZA7ym4mvBE7mtQV5w1ZTrJFUtzFShA7Y+7r
+PPY8vhLlr0aKKAqGFBFQjFwAtj/o73OJ1wJAceuc9km4wPJOQEteMTGNuApoKZxp
+VlFYn3yeTp3m/RJR4BUVU9Jrgyrq5vCdmKsfhqwcJjVm5qiYuJxfN8jaYQJBALp/
+9vRx2zTusp2C9kQuYEAUYA70HCDSO7AgYAyXCR1Z7YQLSgEkeOxwQV82C1s5Bt+M
+UPXYKURSqIujS03VHTkCQQCHxDn0wa6wyTnHbUxxJuD+EXuvRQjACywIaBunVwsw
+ubwoUvJNVkmTaMIIQIQQNuMeKNueGwUpealvmPrCydaL
+-----END RSA PRIVATE KEY-----