Changes to plugin and middleware

Signed-off-by: Christopher Andrew Hinchey <[email protected]>
mitre · Aug 24, 2023 · 196d2b6 · 196d2b6
1 parent 20ca067
commit 196d2b6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/config/middlewares.js b/config/middlewares.js
@@ -1,13 +1,7 @@
+// ~/strapi-aws-s3/backend/config/middlewares.js
+
 module.exports = [
-  "strapi::errors",
-  "strapi::cors",
-  "strapi::poweredBy",
-  "strapi::logger",
-  "strapi::query",
-  "strapi::body",
-  "strapi::session",
-  "strapi::favicon",
-  "strapi::public",
+  'strapi::errors',
   {
     name: 'strapi::security',
     config: {
@@ -19,19 +13,27 @@ module.exports = [
             "'self'",
             'data:',
             'blob:',
-            'market-assets.strapi.io',
+            'dl.airtable.com',
             'saf-site.s3.us-east-1.amazonaws.com',
           ],
           'media-src': [
             "'self'",
             'data:',
             'blob:',
-            'market-assets.strapi.io',
+            'dl.airtable.com',
             'saf-site.s3.us-east-1.amazonaws.com',
           ],
           upgradeInsecureRequests: null,
         },
       },
     },
   },
-];
+  'strapi::cors',
+  'strapi::poweredBy',
+  'strapi::logger',
+  'strapi::query',
+  'strapi::body',
+  'strapi::session',
+  'strapi::favicon',
+  'strapi::public',
+];
diff --git a/config/plugins.js b/config/plugins.js
@@ -8,17 +8,13 @@ module.exports = ({ env }) => ({
     config: {
       provider: 'aws-s3',
       providerOptions: {
-        baseUrl: env('CDN_URL'),
-        rootPath: env('CDN_ROOT_PATH'),
-        s3Options: {
-          accessKeyId: env('AWS_ACCESS_KEY_ID'),
-          secretAccessKey: env('AWS_ACCESS_SECRET'),
-          region: env('AWS_REGION'),
-          params: {
-            ACL: env('AWS_ACL', 'public-read'),
-            signedUrlExpires: env('AWS_SIGNED_URL_EXPIRES', 15 * 60),
-            Bucket: env('AWS_BUCKET'),
-          },
+        accessKeyId: env('AWS_ACCESS_KEY_ID'),
+        secretAccessKey: env('AWS_ACCESS_SECRET'),
+        region: env('AWS_REGION'),
+        params: {
+          ACL: env('AWS_ACL', 'public-read'),
+          signedUrlExpires: env('AWS_SIGNED_URL_EXPIRES', 15 * 60),
+          Bucket: env('AWS_BUCKET'),
         },
       },
       actionOptions: {