chore(signing-utils): add ssh2 types and don't override file with gpg…

… signing (#205) misc fixes
mongodb-js · Jan 23, 2024 · 9b263ee · 9b263ee
1 parent 78b0e28
commit 9b263ee
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/signing-utils/package.json b/packages/signing-utils/package.json
@@ -55,7 +55,6 @@
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.35",
     "@types/sinon-chai": "^3.2.5",
-    "@types/ssh2": "^1.11.18",
     "chai": "^4.3.6",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
@@ -68,6 +67,7 @@
   },
   "dependencies": {
     "debug": "^4.3.4",
-    "ssh2": "^1.15.0"
+    "ssh2": "^1.15.0",
+    "@types/ssh2": "^1.11.19"
   }
 }
diff --git a/packages/signing-utils/src/signing-clients/remote-signing-client.spec.ts b/packages/signing-utils/src/signing-clients/remote-signing-client.spec.ts
@@ -46,7 +46,7 @@ describe('RemoteSigningClient', function () {
     const remoteSigningClient = new RemoteSigningClient(getMockedSSHClient(), {
       workingDirectory: workingDirectoryPath,
       signingScript: signingScript,
-      signingMethod: 'gpg',
+      signingMethod: 'jsign',
     });
 
     await remoteSigningClient.sign(fileToSign);

diff --git a/packages/signing-utils/src/signing-clients/remote-signing-client.ts b/packages/signing-utils/src/signing-clients/remote-signing-client.ts
@@ -69,8 +69,10 @@ export class RemoteSigningClient implements SigningClient {
       await this.signRemoteFile(path.basename(remotePath));
       debug(`SFTP: Signed file ${file}`);
 
-      await this.sshClient.downloadFile(remotePath, file);
-      debug(`SFTP: Downloaded signed file to ${file}`);
+      if (this.options.signingMethod === 'jsign') {
+        await this.sshClient.downloadFile(remotePath, file);
+        debug(`SFTP: Downloaded signed file to ${file}`);
+      }
 
       // For signing using gpg, `.sig` file is created along side the file being signed.
       // We also have to download it back and put it in the same path as original file.