node-server-engine 1.3.2 → 1.3.4

package/src/utils/tlsConfig/tlsConfig.ts

@@ -1,37 +1,38 @@
-import fs from 'fs';
 import https, { Agent } from 'https';
 import { TlsConfig } from './tlsConfig.types';
 import { validateTlsConfig } from './tlsConfig.validate';
 import { EngineError } from 'entities/EngineError';
+import { getSecretOrFile } from 'utils';
 
 export let tlsConfig: undefined | TlsConfig;
 export let httpsAgent: undefined | Agent;
 
 /**
- * Load TLS config by its Environment setting.
+ * Load TLS config by its environment setting (local files or GCP secrets)
  */
 export function loadTlsConfig(): void {
-  // Check that environment variables are correctly set
   validateTlsConfig();
   tlsConfig = undefined;
 
   if (process.env.TLS_REQUEST_KEY || process.env.TLS_SERVER_KEY) {
-    tlsConfig = {
-      key: fs.readFileSync(
-        (process.env.TLS_REQUEST_KEY ?? process.env.TLS_SERVER_KEY) as string,
-        'utf-8'
-      ),
-      cert: fs.readFileSync(
-        (process.env.TLS_REQUEST_CERT ?? process.env.TLS_SERVER_CERT) as string,
-        'utf-8'
-      ),
-      ca: fs.readFileSync(
-        (process.env.TLS_REQUEST_CA ?? process.env.TLS_CA) as string,
-        'utf-8'
-      ),
-      passphrase: (process.env.TLS_REQUEST_KEY_PASSPHRASE ??
-        process.env.TLS_SERVER_KEY_PASSPHRASE) as string
-    } as TlsConfig;
+    // Fetch TLS secrets using unified utility
+    const key = getSecretOrFile(
+      process.env.TLS_REQUEST_KEY ?? process.env.TLS_SERVER_KEY!
+    );
+    const cert = getSecretOrFile(
+      process.env.TLS_REQUEST_CERT ?? process.env.TLS_SERVER_CERT!
+    );
+    const ca = getSecretOrFile(
+      process.env.TLS_REQUEST_CA ?? process.env.TLS_CA!
+    );
+
+    // Passphrase is read directly from env variables
+    const passphrase =
+      process.env.TLS_REQUEST_KEY_PASSPHRASE ??
+      process.env.TLS_SERVER_KEY_PASSPHRASE;
+
+    tlsConfig = { key, cert, ca, passphrase } as TlsConfig;
+
     httpsAgent = new https.Agent({
       key: tlsConfig.key,
       cert: tlsConfig.cert,
@@ -39,7 +40,8 @@ export function loadTlsConfig(): void {
       passphrase: tlsConfig.passphrase
     });
   }
-  if (!tlsConfig || !(tlsConfig.ca && tlsConfig.cert && tlsConfig.key)) {
+
+  if (!tlsConfig || !(tlsConfig.key && tlsConfig.cert && tlsConfig.ca)) {
     throw new EngineError({
       message: 'TLS environment variables are not set correctly'
     });

package/src/middleware/userResolver/userResolver.test.ts

@@ -1,35 +0,0 @@
-import { factory } from 'backend-test-tools';
-import { expect } from 'chai';
-import { Request, Response } from 'express';
-import { stub, fake } from 'sinon';
-import { userResolver } from './userResolver';
-
-describe('Middleware - User Resolver', function () {
-  it('should expand the user object with its data using its userId', async function () {
-    const me = factory.build('user');
-    const next = fake();
-    const request: Partial<Request> = { user: { id: me.id } };
-
-    // Call the resolver with the mocked request
-    await userResolver(request as Request, undefined as unknown as Response, next);
-
-    expect(next).to.have.been.called;
-    // expect(request.user).to.deep.equal(me);
-  });
-
-  it('should throw an error if there is no userId', async function () {
-    const me = factory.build('user');
-    const next = fake();
-    const request = {} as Request;
-    await expect(userResolver(request, undefined as unknown as Response, next))
-      .to.eventually.be.rejected;
-  });
-
-  // it('should throw an error if there is no such user', async function () {
-  //   const { id } = factory.build('user');
-  //   const next = fake();
-  //   const request = { user: { id } } as Request;
-  //   await expect(userResolver(request, undefined as unknown as Response, next))
-  //     .to.eventually.be.rejected;
-  // });
-});