chore: minor refactoring to reduce lines and add tests

4 files changed, 24 insertions, 23 deletions

diff --git a/src/helpers/certs-helpers.ts b/src/helpers/certs-helpers.ts
index a81e7e365..a6c83f5c4 100644
--- a/src/helpers/certs-helpers.ts
+++ b/src/helpers/certs-helpers.ts
@@ -1,12 +1,9 @@
 import { readdirSync, readFileSync, ensureDirSync } from 'fs-extra';
 import { join } from 'node:path';
 import { userDataCertsPath } from '../environment-remote';
+import { removeNewLines } from '../jsUtils';
 
-export function removeNewLines(string: string) {
-  return string.replaceAll(/\r?\n|\r/g, '');
-}
-
-export function readCerts() {
+export function checkIfCertIsPresent(certData: string): boolean {
   const certsFolder = userDataCertsPath();
 
   ensureDirSync(certsFolder);
@@ -21,5 +18,5 @@ export function readCerts() {
     certs.push(removeNewLines(cert));
   }
 
-  return certs;
+  return certs.length > 0 && certs.includes(removeNewLines(certData));
 }
diff --git a/src/index.ts b/src/index.ts
index 8419d5cf9..fe254b4f6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -50,7 +50,7 @@ import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
 import { translateTo } from './helpers/translation-helpers';
 import { darkThemeGrayDarkest } from './themes/legacy';
-import { readCerts, removeNewLines } from './helpers/certs-helpers';
+import { checkIfCertIsPresent } from './helpers/certs-helpers';
 
 const debug = require('./preload-safe-debug')('Ferdium:App');
 
@@ -773,21 +773,6 @@ app.on(
       return;
     }
 
-    const trustedCerts = readCerts();
-    if (!trustedCerts) {
-      callback(false);
-      return;
-    }
-
-    const isTrustedCert = trustedCerts.includes(
-      removeNewLines(certificate.data),
-    );
-
-    if (isTrustedCert) {
-      callback(true);
-      return;
-    }
-
-    callback(false);
+    callback(checkIfCertIsPresent(certificate.data));
   },
 );
diff --git a/src/jsUtils.ts b/src/jsUtils.ts
index 0095028ef..31d6a2121 100644
--- a/src/jsUtils.ts
+++ b/src/jsUtils.ts
@@ -30,3 +30,6 @@ export const acceleratorString = (
   prefix: string = '(',
   suffix: string = ')',
 ) => (index <= 10 ? `${prefix}${keyCombo}+${index % 10}${suffix}` : '');
+
+export const removeNewLines = (input: string): string =>
+  input.replaceAll(/\r?\n|\r/g, '');
diff --git a/test/jsUtils.test.ts b/test/jsUtils.test.ts
index 138158611..0662c3c48 100644
--- a/test/jsUtils.test.ts
+++ b/test/jsUtils.test.ts
@@ -151,4 +151,20 @@ describe('jsUtils', () => {
       expect(jsUtils.acceleratorString(11, 'abc')).toEqual('');
     });
   });
+
+  describe('removeNewLines', () => {
+    it('handles unix style new lines', () => {
+      expect(jsUtils.removeNewLines('abc def\nghi')).toEqual('abc defghi');
+    });
+
+    it('handles windows style new lines', () => {
+      expect(jsUtils.removeNewLines('abc def\r\nghi')).toEqual('abc defghi');
+    });
+
+    it('handles new lines in the beginning, middle and ending of the string', () => {
+      expect(jsUtils.removeNewLines('\nabc def\r\nghi\n')).toEqual(
+        'abc defghi',
+      );
+    });
+  });
 });