@apolitical/server 4.3.0-pla-471.1 → 4.3.0-pla-471.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "4.3.0-pla-471.1",
+  "version": "4.3.0-pla-471.3",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/container.js

@@ -56,6 +56,7 @@ const expressService = require('./services/express.service');
 const healthService = require('./services/health.service');
 const jwtService = require('./services/jwt.service');
 const serverService = require('./services/server.service');
+const secretManagerService = require('./services/secret-manager.service');
 const secretsService = require('./services/secrets.service');
 
 // DI container
@@ -116,6 +117,7 @@ container.register({
   healthService: asFunction(healthService).singleton(),
   jwtService: asFunction(jwtService).singleton(),
   serverService: asFunction(serverService).singleton(),
+  secretManagerService: asFunction(secretManagerService).singleton(),
   secretsService: asFunction(secretsService).singleton(),
 });
 

package/src/index.js

@@ -1,12 +1,8 @@
 'use strict';
 
 const { resolve } = require('./container');
-const { SecretManagerService } = require('./services/secret-manager.service');
 
 // OTel must load before the Express server is started
 resolve('otelLoader')();
 
-const serverService = resolve('serverService');
-serverService.SecretManagerService = SecretManagerService;
-
-module.exports = serverService;
+module.exports = resolve('serverService');

package/src/services/secret-manager.service.js

@@ -1,18 +1,8 @@
 'use strict';
 
-const { SecretManagerServiceClient } = require('@google-cloud/secret-manager');
+module.exports = ({ secretManager, logger }) => {
+  let clientPromise = null;
 
-/**
- * Thin wrapper around Google Cloud Secret Manager.
- *
- * Every method is static because the class is consumed before the DI
- * container is available (e.g. inside config loading at startup).
- * The underlying client is lazily created and reused across all calls.
- *
- * Aligned with the backend/v2 implementation at:
- * backend/v2/libs/externals/gcp/secrets/src/secret-manager.service.ts
- */
-class SecretManagerService {
   /**
    * Derive the secret name prefix from the PLATFORM_BASE_URL subdomain.
    * - https://apolitical.co                      → "live"
@@ -21,7 +11,7 @@ class SecretManagerService {
    * - https://localhost                          → "tilt" (Local Tilt)
    * - http://localhost                           → "pnpm" (Local standalone)
    */
-  static getSecretPrefix(useLocal) {
+  function getSecretPrefix(useLocal) {
     const baseURL = String(process.env.PLATFORM_BASE_URL ?? '');
     try {
       const hostname = new URL(baseURL).hostname;
@@ -35,14 +25,14 @@ class SecretManagerService {
     return useLocal ? 'pnpm' : 'beta';
   }
 
-  static async _getClient() {
-    if (!this._clientPromise) {
-      this._clientPromise = (async () => {
-        console.log('[SecretManager] Initialising client.');
-        return new SecretManagerServiceClient();
+  function getClient() {
+    if (!clientPromise) {
+      clientPromise = (async () => {
+        logger.info('[SecretManager] Initialising client.');
+        return new secretManager.SecretManagerServiceClient();
       })();
     }
-    return this._clientPromise;
+    return clientPromise;
   }
 
   /**
@@ -51,11 +41,11 @@ class SecretManagerService {
    * The full secret name is built as `{prefix}_{secretBaseName}`, where the
    * prefix is derived from PLATFORM_BASE_URL (e.g. "beta", "live").
    */
-  static async accessSecret(secretBaseName, options) {
-    const client = await this._getClient();
+  async function accessSecret(secretBaseName, options) {
+    const client = await getClient();
     const projectId = process.env.GCP_PROJECT_ID ?? (await client.auth.getProjectId());
 
-    const prefix = this.getSecretPrefix(options?.useLocal);
+    const prefix = getSecretPrefix(options?.useLocal);
     const secretName = `${prefix}_${secretBaseName}`;
     const version = options?.version ?? 'latest';
     const name = `projects/${projectId}/secrets/${secretName}/versions/${version}`;
@@ -68,6 +58,9 @@ class SecretManagerService {
 
     return typeof payload === 'string' ? payload : payload.toString('utf8');
   }
-}
 
-module.exports = { SecretManagerService };
+  return {
+    getSecretPrefix,
+    accessSecret,
+  };
+};

package/src/services/server.service.js

@@ -8,6 +8,7 @@ module.exports = ({
   jwtService,
   serverError,
   requestHelper,
+  secretManagerService,
   secretsService,
 }) => {
   // Register shutdown to clean up any resources used by the express app
@@ -23,6 +24,7 @@ module.exports = ({
       authorisation: authorisationMiddleware,
     },
     request: requestHelper,
+    secretManager: secretManagerService,
     secrets: secretsService,
   };
 };