improve generateKeyString method

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

@@ -64,7 +64,7 @@ export class G2GTransferService implements Pusher, Receiver {
     // Generate transfer key string
     let transferKeyString: string;
     try {
-      transferKeyString = TransferKey.generateKeyString(appSiteUrl, uuid);
+      transferKeyString = TransferKey.generateKeyString(uuid, appSiteUrl);
     }
     catch (err) {
       logger.error(err);

packages/app/src/utils/vo/transfer-key.ts

@@ -27,8 +27,8 @@ export class TransferKey {
     if (splitted.length !== 2) {
       throw Error(generalErrorPhrase);
     }
-    const appUrlString = splitted[0];
-    const key = splitted[1];
+    const key = splitted[0];
+    const appUrlString = splitted[1];
 
     let appUrl: URL | null;
     try {
@@ -43,12 +43,12 @@ export class TransferKey {
 
   /**
    * Generates transfer key string (e.g. https://example.com:8080__grw_internal_tranferkey__key)
-   * @param {URL} appUrl GROWI app site url
    * @param {string} key Key generated by GROWI
+   * @param {URL} appUrl GROWI app site url
    * @returns {string} Transfer key string
    */
-  static generateKeyString(appUrl: URL, key: string): string {
-    return `${appUrl.origin}${TransferKey._internalSeperator}${key}`;
+  static generateKeyString(key: string, appUrl: URL): string {
+    return `${key}${TransferKey._internalSeperator}${appUrl.origin}`;
   }
 
 }