serverless-offline 10.3.1 → 10.3.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "10.3.1",
+  "version": "10.3.2",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {

package/src/events/http/Http.js

@@ -1,19 +1,11 @@
-import { log } from '@serverless/utils/log.js'
 import HttpEventDefinition from './HttpEventDefinition.js'
 import HttpServer from './HttpServer.js'
-import { orange } from '../../config/colors.js'
-import { createApiKey } from '../../utils/index.js'
 
 export default class Http {
-  #hasPrivateHttpEvent = false
-
   #httpServer = null
 
-  #options = null
-
   constructor(serverless, options, lambda) {
     this.#httpServer = new HttpServer(serverless, options, lambda)
-    this.#options = options
   }
 
   start() {
@@ -38,36 +30,8 @@ export default class Http {
   create(events) {
     events.forEach(({ functionKey, handler, http }) => {
       this.#createEvent(functionKey, http, handler)
-
-      if (http.private) {
-        this.#hasPrivateHttpEvent = true
-      }
     })
 
-    if (this.#hasPrivateHttpEvent) {
-      if (this.#options.apiKey) {
-        log.notice()
-        log.warning(
-          orange(`'--apiKey' is deprecated and will be removed in the next major version.
-  Please define the apiKey value in the 'provider.apiGateway.apiKeys' section of the serverless config.
-  If you are experiencing any issues please let us know: https://github.com/dherault/serverless-offline/issues`),
-        )
-        log.notice()
-      } else {
-        this.#options.apiKey = createApiKey()
-      }
-
-      log.notice(`Key with token: ${this.#options.apiKey}`)
-
-      if (this.#options.noAuth) {
-        log.notice(
-          `Authorizers are turned off. You do not need to use 'x-api-key' header.`,
-        )
-      } else {
-        log.notice(`Remember to use 'x-api-key' on the request headers.`)
-      }
-    }
-
     this.#httpServer.writeRoutesTerminal()
   }
 

package/src/events/http/HttpServer.js

@@ -20,8 +20,10 @@ import {
 import LambdaProxyIntegrationEventV2 from './lambda-events/LambdaProxyIntegrationEventV2.js'
 import parseResources from './parseResources.js'
 import payloadSchemaValidator from './payloadSchemaValidator.js'
+import { orange } from '../../config/colors.js'
 import logRoutes from '../../utils/logRoutes.js'
 import {
+  createApiKey,
   detectEncoding,
   generateHapiPath,
   getApiKeysValues,
@@ -36,21 +38,19 @@ const { assign, entries, keys } = Object
 export default class HttpServer {
   #apiKeysValues = null
 
+  #hasPrivateHttpEvent = false
+
   #lambda = null
 
   #options = null
 
-  #serverless = null
-
   #server = null
 
+  #serverless = null
+
   #terminalInfo = []
 
   constructor(serverless, options, lambda) {
-    this.#apiKeysValues = getApiKeysValues(
-      serverless.service.provider.apiGateway?.apiKeys ?? [],
-    )
-
     this.#lambda = lambda
     this.#options = options
     this.#serverless = serverless
@@ -435,10 +435,7 @@ export default class HttpServer {
         const apiKey = request.headers['x-api-key']
 
         if (apiKey) {
-          if (
-            apiKey !== this.#options.apiKey &&
-            !this.#apiKeysValues.has(apiKey)
-          ) {
+          if (!this.#apiKeysValues.has(apiKey)) {
             log.debug(
               `Method '${method}' of function '${functionKey}' token '${apiKey}' not valid.`,
             )
@@ -452,10 +449,7 @@ export default class HttpServer {
         ) {
           const { usageIdentifierKey } = request.auth.credentials
 
-          if (
-            usageIdentifierKey !== this.#options.apiKey &&
-            !this.#apiKeysValues.has(usageIdentifierKey)
-          ) {
+          if (!this.#apiKeysValues.has(usageIdentifierKey)) {
             log.debug(
               `Method '${method}' of function '${functionKey}' token '${usageIdentifierKey}' not valid.`,
             )
@@ -898,6 +892,40 @@ export default class HttpServer {
   }
 
   createRoutes(functionKey, httpEvent, handler) {
+    if (!this.#hasPrivateHttpEvent && httpEvent.private) {
+      this.#hasPrivateHttpEvent = true
+
+      if (this.#options.apiKey) {
+        log.notice()
+        log.warning(
+          orange(`'--apiKey' is deprecated and will be removed in the next major version.
+  Please define the apiKey value in the 'provider.apiGateway.apiKeys' section of the serverless config.
+  If you are experiencing any issues please let us know: https://github.com/dherault/serverless-offline/issues`),
+        )
+        log.notice()
+      }
+
+      if (this.#options.noAuth) {
+        log.notice(
+          `Authorizers are turned off. You do not need to use 'x-api-key' header.`,
+        )
+      } else {
+        log.notice(`Remember to use 'x-api-key' on the request headers.`)
+      }
+
+      if (this.#apiKeysValues == null) {
+        const apiKey = this.#options.apiKey ?? createApiKey()
+
+        log.notice(`Key with token: ${apiKey}`)
+
+        this.#apiKeysValues = getApiKeysValues(
+          this.#serverless.service.provider.apiGateway?.apiKeys ?? [],
+        )
+
+        this.#apiKeysValues.add(apiKey)
+      }
+    }
+
     let method
     let path
     let hapiPath