Taichi Masuyama 3 anni fa
parent
commit
a2e64b2fed

+ 3 - 3
packages/app/src/server/routes/apiv3/g2g-transfer.ts

@@ -303,9 +303,9 @@ module.exports = (crowi: Crowi): Router => {
 
     // Ask growi info
     // TODO: Ask progress as well
-    let fromGROWIInfo: IDataGROWIInfo;
+    let toGROWIInfo: IDataGROWIInfo;
     try {
-      fromGROWIInfo = await g2gTransferPusherService.askGROWIInfo(tk);
+      toGROWIInfo = await g2gTransferPusherService.askGROWIInfo(tk);
     }
     catch (err) {
       logger.error(err);
@@ -313,7 +313,7 @@ module.exports = (crowi: Crowi): Router => {
     }
 
     // Check if can transfer
-    const canTransfer = await g2gTransferPusherService.canTransfer(fromGROWIInfo);
+    const canTransfer = await g2gTransferPusherService.canTransfer(toGROWIInfo);
     if (!canTransfer) {
       logger.debug('Could not transfer.');
       return res.apiv3Err(new ErrorV3('GROWI is incompatible to transfer data.', 'growi_incompatible_to_transfer'));

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

@@ -105,7 +105,7 @@ export class G2GTransferPusherService implements Pusher {
     return toGROWIInfo;
   }
 
-  public async canTransfer(fromGROWIInfo: IDataGROWIInfo): Promise<boolean> {
+  public async canTransfer(toGROWIInfo: IDataGROWIInfo): Promise<boolean> {
     // Check if Transfer key is alive
     // Ask toGROWI about toGROWIInfo
     // Compare GROWIInfos