Add plugin setting for SIH distribution URL

README.md

@@ -66,6 +66,12 @@ After setting up the S3 volume follow these instructions to install the plugin.
 
 4. Add `Toggle aws image processor` to your s3 volume field layout.
 
+## Plugin Settings
+
+` Serverless Distribution URL ` (optional)
+
+This field is for the Serverless Image Handler CloudFront Distribution URL, which frees up your asset volume distribution URL to be a regular CloudFront distribution URL. This means that any asset in the volume that does not pass through this plugin (rich text fields, certain SEO plugins, etc) will be served normally. 
+
 ## Usage
 
 In your twig template you can use:

composer.json

@@ -2,7 +2,7 @@
     "name": "dutchheight/aws-serverless-image-handler",
     "description": "Craft CMS plugin to generate resource URL",
     "type": "craft-plugin",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "keywords": [
         "craft",
         "cms",
@@ -32,7 +32,7 @@
     "extra": {
         "name": "aws-serverless-image-handler",
         "handle": "aws-serverless-image-handler",
-        "hasCpSettings": false,
+        "hasCpSettings": true,
         "hasCpSection": false,
         "changelogUrl": "???",
         "class": "dutchheight\\awsserverlessimagehandler\\Awsserverlessimagehandler"

src/Awsserverlessimagehandler.php

@@ -23,7 +23,7 @@
 
 use craft\web\twig\variables\CraftVariable;
 
-
+use dutchheight\awsserverlessimagehandler\models\Settings;
 use dutchheight\awsserverlessimagehandler\fields\ImageProperties;
 use dutchheight\awsserverlessimagehandler\variables\Variable;
 use dutchheight\awsserverlessimagehandler\services\HelperService;
@@ -54,6 +54,11 @@ class Awsserverlessimagehandler extends Plugin
      */
     public $schemaVersion = '1.0.0';
 
+    /**
+     * @var bool
+     */
+    public $hasCpSettings = true;
+
     // Public Methods
     // =========================================================================
 
@@ -82,7 +87,7 @@ public function getHelpers(): HelperService
 
     // Protected Methods
     // =========================================================================
-    
+
     protected function registerComponents() {
         $this->setComponents([
             'helpers' => HelperService::class
@@ -114,4 +119,19 @@ function (Event $event) {
             }
         );
     }
+
+    protected function createSettingsModel()
+    {
+        return new Settings();
+    }
+
+    protected function settingsHtml()
+    {
+        return Craft::$app->view->renderTemplate(
+            'aws-serverless-image-handler/settings',
+            [
+            'settings' => $this->getSettings()
+            ]
+        );
+    }
 }

src/models/Settings.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace dutchheight\awsserverlessimagehandler\models;
+
+use dutchheight\awsserverlessimagehandler\Awsserverlessimagehandler;
+
+use Craft;
+use craft\base\Model;
+
+class Settings extends Model
+{
+  public $serverlessDistributionURL = '';
+
+  public function rules()
+  {
+    return [
+      ['serverlessDistributionURL', 'string'],
+    ];
+  }
+
+  public function getSecretKey(): string
+  {
+    return Craft::parseEnv($this->serverlessDistributionURL);
+  }
+}

src/templates/settings.twig

@@ -0,0 +1,12 @@
+{% import "_includes/forms" as forms %}
+
+{{ forms.autosuggestField({
+    label: 'Serverless Distribution URL',
+    instructions: 'Enter your AWS Serverless Image Handler CloudFront Distribution URL here.',
+    name: 'serverlessDistributionURL', 
+    id: 'serverlessDistributionURL', 
+    required: false,
+    value: settings.serverlessDistributionURL,
+    suggestEnvVars: true,
+    suggestAliases: true,
+}) }}

src/variables/Variable.php

@@ -54,11 +54,14 @@ public function getImgUrl(Asset $image, array $edits = null, bool $allowWebP = t
             return $image->url;
         }
 
-        $volumeSubfolder = (Craft::parseEnv($image->getVolume()->subfolder) ?: $image->getVolume()->subfolder);
+        $distributionSettingUrl = Craft::parseEnv(Awsserverlessimagehandler::$plugin->settings->serverlessDistributionURL);
+        $volumeUrl = Craft::parseEnv($image->volume->url);
+        $distributionUrl = $distributionSettingUrl ?: $volumeUrl;
+        $volumeSubfolder = Craft::parseEnv($image->getVolume()->subfolder);
 
         $json = [
             "bucket" => $image->getVolume()->bucket,
-            "key" => $volumeSubfolder ? $volumeSubfolder . "/" . $image['filename'] : $image['filename'],
+            "key" => $volumeSubfolder ? $volumeSubfolder . "/" . $image->getPath() : $image->getPath(),
             "edits" => [
                 "resize" => [
                     "fit" => (isset($edits['fit']) ? $edits['fit'] : "cover"),
@@ -97,6 +100,6 @@ public function getImgUrl(Asset $image, array $edits = null, bool $allowWebP = t
             $json["edits"]["webp"] = [];
         }
 
-        echo (Craft::parseEnv($image->volume->url) ?: $image->volume->url) . base64_encode(json_encode($json));
+        echo $distributionUrl . base64_encode(json_encode($json));
     }
 }