From 89e86f467f6a100c09dcbec5d4e0b2a77a5f0214 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Tue, 25 Oct 2022 10:03:16 +0200
Subject: [PATCH] chore: refactor https expiration logic

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 .../src/service/lib/hostFactory.ts            | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/backend-common/src/service/lib/hostFactory.ts b/packages/backend-common/src/service/lib/hostFactory.ts
index 616120e868..089bf610ed 100644
--- a/packages/backend-common/src/service/lib/hostFactory.ts
+++ b/packages/backend-common/src/service/lib/hostFactory.ts
@@ -21,7 +21,7 @@ import * as http from 'http';
 import * as https from 'https';
 import { Logger } from 'winston';
 import { HttpsSettings } from './config';
-import * as forge from 'node-forge';
+import forge from 'node-forge';
 
 const FIVE_DAYS_IN_MS = 5 * 24 * 60 * 60 * 1000;
 
@@ -106,19 +106,16 @@ async function getGeneratedCertificate(hostname: string, logger?: Logger) {
     certPath = resolvePath('.dev-cert.pem');
   }
 
-  let cert = undefined;
-  let remainingMs = 0;
   if (await fs.pathExists(certPath)) {
-    cert = await fs.readFile(certPath);
-    remainingMs = getCertificateExpiration(cert.toString(), logger);
-  }
-
-  if (cert && remainingMs > FIVE_DAYS_IN_MS) {
-    logger?.info('Using existing self-signed certificate');
-    return {
-      key: cert,
-      cert: cert,
-    };
+    const cert = await fs.readFile(certPath);
+    const remainingMs = getCertificateExpiration(cert.toString(), logger);
+    if (remainingMs > FIVE_DAYS_IN_MS) {
+      logger?.info('Using existing self-signed certificate');
+      return {
+        key: cert,
+        cert,
+      };
+    }
   }
 
   logger?.info('Generating new self-signed certificate');