@squiz/db-lib 1.39.1-alpha.10 → 1.39.1-alpha.13

package/.npm/_logs/{2023-06-26T09_07_09_141Z-debug-0.log → 2023-06-27T04_52_08_715Z-debug-0.log}

@@ -6,32 +6,32 @@
 5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 1ms
 6 timing config:load:builtin Completed in 1ms
 7 timing config:load:cli Completed in 2ms
-8 timing config:load:env Completed in 1ms
+8 timing config:load:env Completed in 2ms
 9 info found workspace root at /builds/developer-experience/cmp
 10 timing config:load:file:/builds/developer-experience/cmp/.npmrc Completed in 0ms
-11 timing config:load:project Completed in 23ms
+11 timing config:load:project Completed in 24ms
 12 timing config:load:file:/root/.npmrc Completed in 1ms
-13 timing config:load:user Completed in 2ms
+13 timing config:load:user Completed in 1ms
 14 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
 15 timing config:load:global Completed in 0ms
 16 timing config:load:setEnvs Completed in 1ms
-17 timing config:load Completed in 32ms
-18 timing npm:load:configload Completed in 32ms
-19 timing npm:load:mkdirpcache Completed in 0ms
+17 timing config:load Completed in 34ms
+18 timing npm:load:configload Completed in 34ms
+19 timing npm:load:mkdirpcache Completed in 1ms
 20 timing npm:load:mkdirplogs Completed in 0ms
 21 verbose title npm run compile
 22 verbose argv "run" "compile" "--"
-23 timing npm:load:setTitle Completed in 1ms
+23 timing npm:load:setTitle Completed in 2ms
 24 timing config:load:flatten Completed in 4ms
 25 timing npm:load:display Completed in 6ms
-26 verbose logfile logs-max:10 dir:/builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-06-26T09_07_09_141Z-
-27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-06-26T09_07_09_141Z-debug-0.log
+26 verbose logfile logs-max:10 dir:/builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-06-27T04_52_08_715Z-
+27 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-06-27T04_52_08_715Z-debug-0.log
 28 timing npm:load:logFile Completed in 3ms
 29 timing npm:load:timers Completed in 1ms
 30 timing npm:load:configScope Completed in 0ms
-31 timing npm:load Completed in 46ms
+31 timing npm:load Completed in 49ms
 32 silly logfile done cleaning log files
-33 timing command:run Completed in 3242ms
+33 timing command:run Completed in 4500ms
 34 verbose exit 0
-35 timing npm Completed in 3300ms
+35 timing npm Completed in 4563ms
 36 info ok

package/lib/index.js

@@ -49348,8 +49348,8 @@ var require_CloudflareApiKeyService = __commonJS({
     var UnAuthenticatedRequestError_1 = require_UnAuthenticatedRequestError();
     var dx_logger_lib_1 = require_lib4();
     var validKeys = {
-      keys: [],
-      "matrix-keys": []
+      "matrix-keys": [],
+      "inter-service-keys": []
     };
     var refreshInterval;
     var REFRESH_TIMER = 7 * 24 * 3600 * 1e3;
@@ -49364,17 +49364,28 @@ var require_CloudflareApiKeyService = __commonJS({
         }
         this.logger = logger2;
       }
-      keyIsValid(key) {
-        if (validKeys.keys.length == 0) {
+      /**
+       * @deprecated Suggest moving towards using JWT authentication.
+       */
+      matrixKeyIsValid(key, request) {
+        var _a;
+        if (validKeys["matrix-keys"].length == 0) {
           throw new UnAuthenticatedRequestError_1.UnAuthenticatedRequestError("No api keys to check against");
         }
-        return validKeys.keys.includes(key);
+        if (validKeys["matrix-keys"].includes(key)) {
+          this.logger.info("Request authenticated using legacy Matrix API key", {
+            url: request.url,
+            userAgent: (_a = request.headers) === null || _a === void 0 ? void 0 : _a["user-agent"]
+          });
+          return true;
+        }
+        return false;
       }
-      matrixKeyIsValid(key) {
-        if (validKeys["matrix-keys"].length == 0) {
-          throw new UnAuthenticatedRequestError_1.UnAuthenticatedRequestError("No api keys to check against");
+      interServiceKeyIsValid(key) {
+        if (validKeys["inter-service-keys"].length == 0) {
+          throw new UnAuthenticatedRequestError_1.UnAuthenticatedRequestError("No inter service api keys to check against");
         }
-        return validKeys["matrix-keys"].includes(key);
+        return validKeys["inter-service-keys"].includes(key);
       }
       async getValidApiKeys() {
         let secretValue;
@@ -49391,7 +49402,7 @@ var require_CloudflareApiKeyService = __commonJS({
             throw new Error("cloudflare api key SecretString undefined");
           }
           const secret = JSON.parse(secretValue.SecretString);
-          if (secret.keys) {
+          if (secret["matrix-keys"] && secret["inter-service-keys"]) {
             return secret;
           }
           throw new Error("api keys retrieved and decoded successfully but contained no values");
@@ -49402,7 +49413,8 @@ var require_CloudflareApiKeyService = __commonJS({
       async refreshApiKeys() {
         this.logger.info("refreshing keys");
         validKeys = await this.getValidApiKeys();
-        this.logger.info(`number of valid keys found: ${validKeys.keys.length}`);
+        this.logger.info(`found ${validKeys["matrix-keys"].length} valid matrix keys`);
+        this.logger.info(`found ${validKeys["inter-service-keys"].length} valid inter service keys`);
         if (!refreshInterval) {
           refreshInterval = setInterval(async () => {
             await this.refreshApiKeys();
@@ -49410,8 +49422,8 @@ var require_CloudflareApiKeyService = __commonJS({
         }
       }
       // temporary method, to be removed when DXP auth is properly implemented
-      getMatrixKeys() {
-        return validKeys["matrix-keys"];
+      getInterServiceKeys() {
+        return validKeys["inter-service-keys"];
       }
     };
     exports2.CloudflareApiKeyService = CloudflareApiKeyService;
@@ -49424,16 +49436,25 @@ var require_DevelopmentApiKeyService = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DevelopmentApiKeyService = void 0;
+    var dx_logger_lib_1 = require_lib4();
     var DevelopmentApiKeyService = class {
-      keyIsValid() {
-        return true;
+      constructor(logger2) {
+        this.logger = logger2 || (0, dx_logger_lib_1.getLogger)({ name: "DevelopmentApiKeyService" });
       }
-      matrixKeyIsValid() {
+      matrixKeyIsValid(key, request) {
+        var _a;
+        this.logger.info("Request authenticated using legacy Matrix API key", {
+          url: request.url,
+          userAgent: (_a = request.headers) === null || _a === void 0 ? void 0 : _a["user-agent"]
+        });
         return true;
       }
+      interServiceKeyIsValid(key) {
+        return Boolean(key && this.getInterServiceKeys().includes(key));
+      }
       // temporary method, to be removed when DXP auth is properly implemented
-      getMatrixKeys() {
-        return ["matrix-api-key"];
+      getInterServiceKeys() {
+        return ["inter-service-api-key"];
       }
     };
     exports2.DevelopmentApiKeyService = DevelopmentApiKeyService;
@@ -49467,31 +49488,6 @@ var require_getApiKeyService = __commonJS({
   }
 });
 
-// ../dx-common-lib/lib/server-utils/apiKeyMiddleware.js
-var require_apiKeyMiddleware = __commonJS({
-  "../dx-common-lib/lib/server-utils/apiKeyMiddleware.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.apiKeyMiddleware = void 0;
-    var UnAuthenticatedRequestError_1 = require_UnAuthenticatedRequestError();
-    function apiKeyMiddleware(apiKeyService) {
-      return function(req, res, next) {
-        const key = req.header("x-api-key");
-        if (req.path == "/health") {
-          next();
-          return;
-        }
-        if (apiKeyService.keyIsValid(key) || apiKeyService.matrixKeyIsValid(key)) {
-          next();
-          return;
-        }
-        throw new UnAuthenticatedRequestError_1.UnAuthenticatedRequestError(`API KEY IS INVALID`);
-      };
-    }
-    exports2.apiKeyMiddleware = apiKeyMiddleware;
-  }
-});
-
 // ../dx-common-lib/lib/cache/applyDefaultRulesToCacheControlObject.js
 var require_applyDefaultRulesToCacheControlObject = __commonJS({
   "../dx-common-lib/lib/cache/applyDefaultRulesToCacheControlObject.js"(exports2) {
@@ -58310,7 +58306,6 @@ var require_lib6 = __commonJS({
     __exportStar2(require_CloudflareApiKeyService(), exports2);
     __exportStar2(require_DevelopmentApiKeyService(), exports2);
     __exportStar2(require_getApiKeyService(), exports2);
-    __exportStar2(require_apiKeyMiddleware(), exports2);
     __exportStar2(require_cache(), exports2);
     __exportStar2(require_formattedTextToHtmlString(), exports2);
     __exportStar2(require_json_order(), exports2);