ソースを参照

Merge pull request #13 from hakumizuki/feat/g2g-nextjs-copy-attachments

添付ファイルのコピー
Haku Mizuki 3 年 前
コミット
7b819c8698

+ 1 - 1
packages/app/src/server/service/config-loader.ts

@@ -53,7 +53,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     ns:      'crowi',
     key:     'app:fileUploadType',
     key:     'app:fileUploadType',
     type:    ValueType.STRING,
     type:    ValueType.STRING,
-    default: 'aws',
+    default: 'none',
   },
   },
   FILE_UPLOAD_USES_ONLY_ENV_VAR_FOR_FILE_UPLOAD_TYPE: {
   FILE_UPLOAD_USES_ONLY_ENV_VAR_FOR_FILE_UPLOAD_TYPE: {
     ns:      'crowi',
     ns:      'crowi',

+ 19 - 2
packages/app/src/server/service/g2g-transfer.ts

@@ -190,9 +190,26 @@ export class G2GTransferReceiverService implements Receiver {
   }
   }
 
 
   public async answerGROWIInfo(): Promise<IDataGROWIInfo> {
   public async answerGROWIInfo(): Promise<IDataGROWIInfo> {
-    const userUpperLimit = this.crowi.configManager.getConfig('crowi', 'security:userUpperLimit');
+    const configManager = this.crowi.configManager;
+    const userUpperLimit = configManager.getConfig('crowi', 'security:userUpperLimit');
     const version = this.crowi.version;
     const version = this.crowi.version;
-    const attachmentInfo = {}; // TODO: Impl
+    const attachmentInfo = {
+      type: configManager.getConfig('crowi', 'app:fileUploadType'),
+      bucket: undefined,
+      customEndpoint: undefined,
+    };
+
+    // put storage location info to check identificat
+    switch (attachmentInfo.type) {
+      case 'aws':
+        attachmentInfo.bucket = configManager.getConfig('crowi', 'aws:s3Bucket');
+        attachmentInfo.customEndpoint = configManager.getConfig('crowi', 'aws:s3CustomEndpoint');
+        break;
+      case 'gcs':
+        attachmentInfo.bucket = configManager.getConfig('crowi', 'gcs:bucket');
+        break;
+      default:
+    }
 
 
     return { userUpperLimit, version, attachmentInfo };
     return { userUpperLimit, version, attachmentInfo };
   }
   }