Custom fixes - PRs that aren't merged from servdhost/craft-remote-ass…

…ets (#1)

composer.json

@@ -2,7 +2,7 @@
     "name": "servd/craft-remote-assets",
     "description": "Move CP assets to an external filesystem such as S3",
     "type": "craft-plugin",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "keywords": [
         "craft",
         "cms",
@@ -24,8 +24,7 @@
     ],
     "require": {
         "craftcms/cms": "^3.0.0",
-        "aws/aws-sdk-php": "^3.61.0",
-        "google/cloud-storage": "^1.3.0"
+        "aws/aws-sdk-php": "^3.173.23"
     },
     "autoload": {
         "psr-4": {

src/S3RemoteAssetStore.php

@@ -51,8 +51,15 @@ public function putFile($key, $local, $contentType)
     public function getURLForKey($key)
     {
         $config = CraftRemoteAssets::getInstance()->getSettings()->s3Config;
-        return 'https://s3-' .
-            $config['region'] .
+
+        // If a CloudFront CDN URL has been provided, append only the 'root' and asset $key
+        if (!empty($config['cloudfrontUrl'])) {
+            return $config['cloudfrontUrl'] . '/' .
+                $config['root'] . '/' .
+                $key;
+        }
+
+        return 'https://s3' .
             '.amazonaws.com/' .
             $config['bucket'] . '/' .
             $config['root'] . '/' .

src/models/Settings.php

@@ -34,7 +34,7 @@ class Settings extends Model
     public function rules()
     {
         return [
-            [['use', 's3Config', 'gcConfig'], 'required'],
+            [['use', 's3Config', 'gsConfig'], 'required'],
         ];
     }
 }