Use baseUri.

Author: tminard

CHANGELOG.md

@@ -3,9 +3,8 @@
 ## 22.2.0 - 2025-10-dd
 
 ### Changed
-- `helpers.getKeystoreId` will use `config.server.host` first if defined
-  before falling back to `req.host` to improve reliability when operating
-  behind a reverse proxy.
+- `helpers.getKeystoreId` will use `config.server.host` rather than
+  `req.host` to align with other Bedrock service behavior.
 
 ## 22.1.0 - 2025-09-28
 

lib/helpers.js

@@ -7,11 +7,9 @@ import ipaddr from 'ipaddr.js';
 
 const {config} = bedrock;
 
-export function getKeystoreId({host, req, localId, routes}) {
-  if(!host) {
-    host = config.server.host || req.get('host');
-  }
-  return `https://${host}${routes.keystores}/${localId}`;
+export function getKeystoreId({localId, routes}) {
+  const {baseUri} = config.server;
+  return `${baseUri}${routes.keystores}/${localId}`;
 }
 
 export function verifyRequestIp({keystoreConfig, req}) {

lib/http.js

@@ -110,7 +110,7 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
 
       // create a keystore for the controller
       const random = await generateRandom();
-      const id = helpers.getKeystoreId({req, localId: random, routes});
+      const id = helpers.getKeystoreId({localId: random, routes});
       const config = {id, meterId, ...req.body};
       const record = await keystores.insert({config});
       res.status(201).location(id).json(record.config);

lib/middleware.js

@@ -32,7 +32,7 @@ export function createGetKeystoreConfig({routes}) {
   return asyncHandler(async function _getKeystoreConfig(req, res, next) {
     if(!req.webkms) {
       const keystoreId = helpers.getKeystoreId(
-        {req, localId: req.params.keystoreId, routes});
+        {localId: req.params.keystoreId, routes});
       const configRecord = await storage.get({
         id: keystoreId, req, returnRecord: true
       });