Cloud storage for assets #256

evershopcommerce · Nov 2, 2023 · 4207bdd · 4207bdd
1 parent 0d0a6bf
commit 4207bdd
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 16 deletions.
diff --git a/packages/azure_file_storage/README.md b/packages/azure_file_storage/README.md
@@ -50,7 +50,10 @@ Edit the `config/default.json` file in the root directory of your EverShop insta
 ```json
 {
   ...,
-  "file_storage": "azure"
+  "system": {
+    ...,
+    "file_storage": "azure"
+  }
 }
 ```
 

diff --git a/packages/azure_file_storage/api/fileBrowser/azureFileBrowser.js b/packages/azure_file_storage/api/fileBrowser/azureFileBrowser.js
@@ -9,7 +9,7 @@ const {
 
 let blobServiceClient;
 let containerName;
-if (getConfig('file_storage') === 'azure') {
+if (getConfig('system.file_storage') === 'azure') {
   blobServiceClient = BlobServiceClient.fromConnectionString(
     getEnv('AZURE_STORAGE_CONNECTION_STRING')
   );
@@ -18,7 +18,7 @@ if (getConfig('file_storage') === 'azure') {
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not Azure, call the next middleware function
-  if (getConfig('file_storage') !== 'azure') {
+  if (getConfig('system.file_storage') !== 'azure') {
     next();
   } else {
     try {

diff --git a/packages/azure_file_storage/api/fileDelete/azureFileDelete.js b/packages/azure_file_storage/api/fileDelete/azureFileDelete.js
@@ -10,15 +10,15 @@ const {
 
 let blobServiceClient;
 let containerName;
-if (getConfig('file_storage') === 'azure') {
+if (getConfig('system.file_storage') === 'azure') {
   blobServiceClient = BlobServiceClient.fromConnectionString(
     getEnv('AZURE_STORAGE_CONNECTION_STRING')
   );
   containerName = getEnv('AZURE_STORAGE_CONTAINER_NAME', 'images');
 }
 
 module.exports = async (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 'azure') {
+  if (getConfig('system.file_storage') !== 'azure') {
     next();
   } else {
     try {

diff --git a/packages/azure_file_storage/api/folderCreate/azureFolderCreate.js b/packages/azure_file_storage/api/folderCreate/azureFolderCreate.js
@@ -10,7 +10,7 @@ const {
 
 let blobServiceClient;
 let containerName;
-if (getConfig('file_storage') === 'azure') {
+if (getConfig('system.file_storage') === 'azure') {
   blobServiceClient = BlobServiceClient.fromConnectionString(
     getEnv('AZURE_STORAGE_CONNECTION_STRING')
   );
@@ -19,7 +19,7 @@ if (getConfig('file_storage') === 'azure') {
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not Azure, call the next middleware function
-  if (getConfig('file_storage') !== 'azure') {
+  if (getConfig('system.file_storage') !== 'azure') {
     next();
   } else {
     try {

diff --git a/...p/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js b/...p/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js
@@ -8,7 +8,7 @@ const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
 const { debug } = require('@evershop/evershop/src/lib/log/debuger');
 
 module.exports = async function localGenerateProductImageVariant(data) {
-  if (getConfig('file_storage') === 'local') {
+  if (getConfig('system.file_storage') === 'local') {
     try {
       const imagePath = data.origin_image.replace('/assets', '');
       const mediaPath = path.join(CONSTANTS.MEDIAPATH, imagePath);

diff --git a/packages/evershop/src/modules/cms/api/fileBrowser/browser.js b/packages/evershop/src/modules/cms/api/fileBrowser/browser.js
@@ -10,7 +10,7 @@ const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 'local') {
+  if (getConfig('system.file_storage') !== 'local') {
     next();
   } else {
     const path = request.params[0] || '';

diff --git a/packages/evershop/src/modules/cms/api/fileDelete/deleteFile.js b/packages/evershop/src/modules/cms/api/fileDelete/deleteFile.js
@@ -9,7 +9,7 @@ const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 'local') {
+  if (getConfig('system.file_storage') !== 'local') {
     next();
   } else {
     const path = request.params[0] || '';

diff --git a/packages/evershop/src/modules/cms/api/folderCreate/createFolder.js b/packages/evershop/src/modules/cms/api/folderCreate/createFolder.js
@@ -9,7 +9,7 @@ const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 'local') {
+  if (getConfig('system.file_storage') !== 'local') {
     next();
   } else {
     const { path } = request.body || '';

diff --git a/packages/evershop/src/modules/cms/api/imageUpload/[multerFile]upload.js b/packages/evershop/src/modules/cms/api/imageUpload/[multerFile]upload.js
@@ -9,7 +9,7 @@ const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 'local') {
+  if (getConfig('system.file_storage') !== 'local') {
     next();
   } else if (!request.files || request.files.length === 0) {
     response.status(INVALID_PAYLOAD).json({

diff --git a/packages/evershop/src/modules/cms/bootstrap.js b/packages/evershop/src/modules/cms/bootstrap.js
@@ -17,4 +17,7 @@ module.exports = () => {
     copyRight: `© 2022 Evershop. All Rights Reserved.`
   };
   config.util.setModuleDefaults('themeConfig', themeConfig);
+  config.util.setModuleDefaults('system', {
+    file_storage: 'local'
+  });
 };
diff --git a/packages/evershop/src/modules/cms/services/getMulter.js b/packages/evershop/src/modules/cms/services/getMulter.js
@@ -44,8 +44,7 @@ const diskStorage = multer.diskStorage({
 });
 
 module.exports.getMulter = () => {
-  const storageProvider = getConfig('file_storage', 'local');
-
+  const storageProvider = getConfig('system.file_storage', 'local');
   if (storageProvider === 'local') {
     return multer({ storage: diskStorage, fileFilter });
   } else {

diff --git a/packages/s3_file_storage/README.md b/packages/s3_file_storage/README.md
@@ -52,7 +52,10 @@ Edit the `config/default.json` file in the root directory of your EverShop insta
 ```json
 {
   ...,
-  "file_storage": "s3"
+  "system": {
+    ...,
+    "file_storage": "s3"
+  }
 }
 ```
 

diff --git a/packages/s3_file_storage/api/folderCreate/awsFolderCreate.js b/packages/s3_file_storage/api/folderCreate/awsFolderCreate.js
@@ -14,7 +14,7 @@ const bucketName = getEnv('AWS_BUCKET_NAME');
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not S3, call the next middleware function
-  if (getConfig('file_storage') !== 's3') {
+  if (getConfig('system.file_storage') !== 's3') {
     next();
   } else {
     try {