remove duplicating code

RC4347 · Dec 2, 2022 · d3a2ff7 · d3a2ff7
1 parent f907779
commit d3a2ff7
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 47 deletions.
diff --git a/src/SignedCookieService.php b/src/SignedCookieService.php
@@ -4,44 +4,28 @@
 
 use Aws\CloudFront\CloudFrontClient;
 use Aws\Exception\AwsException;
+use RC4347\CloudFrontSigner\base\BaseService;
 use RC4347\CloudFrontSigner\credentials\AccessConfig;
 use RC4347\CloudFrontSigner\credentials\ClientConfig;
 use RC4347\CloudFrontSigner\credentials\ExpireConfig;
 
-class SignedCookieService
+class SignedCookieService extends BaseService
 {
 
     public ?string $policy;
 
-    public ClientConfig $clientConfig;
-    public AccessConfig $accessConfig;
-    public ExpireConfig $config;
-
-    /**
-     * @param string|null $policy
-     * @param ClientConfig $clientConfig
-     * @param AccessConfig $accessConfig
-     * @param ExpireConfig $config
-     */
-    public function __construct(ClientConfig $clientConfig, AccessConfig $accessConfig, ExpireConfig $config, ?string $policy = null)
+    public function __construct(ExpireConfig $config, ClientConfig $clientConfig, AccessConfig $accessConfig, ?string $policy = null)
     {
+        parent::__construct($config, $clientConfig, $accessConfig);
         $this->policy = $policy;
-        $this->clientConfig = $clientConfig;
-        $this->accessConfig = $accessConfig;
-        $this->config = $config;
     }
 
     /**
      * @return array|string
      */
     public function run()
     {
-        $cloudFrontClient = new CloudFrontClient([
-            'profile' => $this->clientConfig->profile ?? 'default',
-            'version' => $this->clientConfig->version ?? 'latest',
-            'region' => $this->clientConfig->region
-        ]);
-
+        $cloudFrontClient = $this->getClient();
         return $this->getSignedCookie($cloudFrontClient);
     }
 

diff --git a/src/SignedUrlService.php b/src/SignedUrlService.php
@@ -4,39 +4,16 @@
 
 use Aws\CloudFront\CloudFrontClient;
 use Aws\Exception\AwsException;
-use RC4347\CloudFrontSigner\credentials\AccessConfig;
-use RC4347\CloudFrontSigner\credentials\ClientConfig;
-use RC4347\CloudFrontSigner\credentials\ExpireConfig;
+use RC4347\CloudFrontSigner\base\BaseService;
 
-class SignedUrlService
+class SignedUrlService extends BaseService
 {
-    public ExpireConfig $config;
-    public ClientConfig $clientConfig;
-    public AccessConfig $accessConfig;
-
-    /**
-     * @param ExpireConfig $config
-     * @param ClientConfig $clientConfig
-     * @param AccessConfig $accessConfig
-     */
-    public function __construct(ExpireConfig $config, ClientConfig $clientConfig, AccessConfig $accessConfig)
-    {
-        $this->config = $config;
-        $this->clientConfig = $clientConfig;
-        $this->accessConfig = $accessConfig;
-    }
-
     /**
      * @return string
      */
     public function run(): string
     {
-        $cloudFrontClient = new CloudFrontClient([
-            'profile' => $this->clientConfig->profile ?? 'default',
-            'version' => $this->clientConfig->version ?? 'latest',
-            'region' => $this->clientConfig->region
-        ]);
-
+        $cloudFrontClient = $this->getClient();
         return $this->getSignedUrl($cloudFrontClient);
     }
 

diff --git a/src/base/BaseService.php b/src/base/BaseService.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace RC4347\CloudFrontSigner\base;
+
+use Aws\CloudFront\CloudFrontClient;
+use RC4347\CloudFrontSigner\credentials\AccessConfig;
+use RC4347\CloudFrontSigner\credentials\ClientConfig;
+use RC4347\CloudFrontSigner\credentials\ExpireConfig;
+
+abstract class BaseService
+{
+    public ExpireConfig $config;
+    public ClientConfig $clientConfig;
+    public AccessConfig $accessConfig;
+
+    /**
+     * @param ExpireConfig $config
+     * @param ClientConfig $clientConfig
+     * @param AccessConfig $accessConfig
+     */
+    public function __construct(ExpireConfig $config, ClientConfig $clientConfig, AccessConfig $accessConfig)
+    {
+        $this->config = $config;
+        $this->clientConfig = $clientConfig;
+        $this->accessConfig = $accessConfig;
+    }
+
+    public function getClient()
+    {
+        return new CloudFrontClient([
+            'profile' => $this->clientConfig->profile ?? 'default',
+            'version' => $this->clientConfig->version ?? 'latest',
+            'region' => $this->clientConfig->region
+        ]);
+    }
+
+    public abstract function run();
+}