From 9fc885839f96f99d873de77e364cdeda2a26a180 Mon Sep 17 00:00:00 2001 From: lohit Date: Fri, 12 Sep 2025 21:49:49 +0530 Subject: [PATCH] ca certs function updates (#5555) --- packages/bruno-cli/src/runner/run-single-request.js | 2 +- packages/bruno-electron/src/ipc/network/cert-utils.js | 2 +- packages/bruno-requests/src/utils/ca-cert.ts | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js index c9323ac09..fc7a7f6d6 100644 --- a/packages/bruno-cli/src/runner/run-single-request.js +++ b/packages/bruno-cli/src/runner/run-single-request.js @@ -155,7 +155,7 @@ const runSingleRequest = async function ( httpsAgentRequestFields['rejectUnauthorized'] = false; } else { const caCertFilePath = options['cacert']; - let caCertificatesData = await getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] }); + let caCertificatesData = getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] }); let caCertificates = caCertificatesData.caCertificates; httpsAgentRequestFields['ca'] = caCertificates || []; } diff --git a/packages/bruno-electron/src/ipc/network/cert-utils.js b/packages/bruno-electron/src/ipc/network/cert-utils.js index 0c51f34d9..7c2e43d38 100644 --- a/packages/bruno-electron/src/ipc/network/cert-utils.js +++ b/packages/bruno-electron/src/ipc/network/cert-utils.js @@ -27,7 +27,7 @@ const getCertsAndProxyConfig = async ({ } let caCertFilePath = preferencesUtil.shouldUseCustomCaCertificate() && preferencesUtil.getCustomCaCertificateFilePath(); - let caCertificatesData = await getCACertificates({ + let caCertificatesData = getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: preferencesUtil.shouldKeepDefaultCaCertificates() }); diff --git a/packages/bruno-requests/src/utils/ca-cert.ts b/packages/bruno-requests/src/utils/ca-cert.ts index 4d81c7c73..e304281dd 100644 --- a/packages/bruno-requests/src/utils/ca-cert.ts +++ b/packages/bruno-requests/src/utils/ca-cert.ts @@ -18,7 +18,7 @@ type T_CACertificatesResult = { let systemCertsCache: string[] | undefined; -async function getSystemCerts(): Promise { +function getSystemCerts(): string[] { if (systemCertsCache) return systemCertsCache; try { @@ -87,10 +87,10 @@ function getNodeExtraCACerts(): string[] { * * @param caCertFilePath - path to custom CA certificate file * @param shouldKeepDefaultCerts - whether to keep default CA certificates - * @returns {Promise} - CA certificates and their count + * @returns {T_CACertificatesResult} - CA certificates and their count */ -const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }: T_CACertificatesOptions): Promise => { +const getCACertificates = ({ caCertFilePath, shouldKeepDefaultCerts = true }: T_CACertificatesOptions): T_CACertificatesResult => { try { let caCertificates = ''; let caCertificatesCount = { @@ -126,7 +126,7 @@ const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true if (shouldKeepDefaultCerts) { // get system certs - systemCerts = await getSystemCerts(); + systemCerts = getSystemCerts(); caCertificatesCount.system = systemCerts.length; // get root certs @@ -135,7 +135,7 @@ const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true } } else { // get system certs - systemCerts = await getSystemCerts(); + systemCerts = getSystemCerts(); caCertificatesCount.system = systemCerts.length; // get root certs