quidproquo-actionprocessor-awslambda 0.0.73 → 0.0.75

package/lib/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.js

@@ -59,7 +59,7 @@ const getProcessAutoRespond = (qpqConfig) => {
                 headers: quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(qpqConfig, payload.matchResult.config || {}, payload.transformedEventParams.headers),
             });
         }
-        const authValid = yield (0, isAuthValid_1.isAuthValid)(qpqConfig, quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('Authorization', payload.transformedEventParams.headers), (_a = payload.matchResult.config) === null || _a === void 0 ? void 0 : _a.routeAuthSettings);
+        const authValid = yield (0, isAuthValid_1.isAuthValid)(qpqConfig, quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('Authorization', payload.transformedEventParams.headers), quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('x-api-key', payload.transformedEventParams.headers), (_a = payload.matchResult.config) === null || _a === void 0 ? void 0 : _a.routeAuthSettings);
         if (!authValid) {
             return (0, quidproquo_core_1.actionResult)({
                 status: 401,

package/lib/getActionProcessor/core/event/utils/isAuthValid.d.ts

@@ -1,3 +1,3 @@
 import { QPQConfig } from 'quidproquo-core';
 import { RouteAuthSettings } from 'quidproquo-webserver';
-export declare const isAuthValid: (qpqConfig: QPQConfig, authHeader?: string | null, authSettings?: RouteAuthSettings) => Promise<boolean>;
+export declare const isAuthValid: (qpqConfig: QPQConfig, authHeader?: string | null, apiKeyHeader?: string | null, authSettings?: RouteAuthSettings) => Promise<boolean>;

package/lib/getActionProcessor/core/event/utils/isAuthValid.js

@@ -14,9 +14,9 @@ const quidproquo_core_1 = require("quidproquo-core");
 const verifyJwt_1 = require("../../../../logic/cognito/verifyJwt");
 const getExportedValue_1 = require("../../../../logic/cloudformation/getExportedValue");
 const awsNamingUtils_1 = require("../../../../awsNamingUtils");
-const isAuthValid = (qpqConfig, authHeader, authSettings) => __awaiter(void 0, void 0, void 0, function* () {
+const isAuthValidForCognito = (qpqConfig, authSettings, authHeader) => __awaiter(void 0, void 0, void 0, function* () {
     // If there are no auth settings ~ Its valid.
-    if (!authSettings || !authSettings.userDirectoryName) {
+    if (!authSettings.userDirectoryName) {
         return true;
     }
     // We need a header to be able to auth
@@ -38,4 +38,21 @@ const isAuthValid = (qpqConfig, authHeader, authSettings) => __awaiter(void 0, v
     // Verify the token
     return yield (0, verifyJwt_1.verifyJwt)(accessToken, userPoolId, userPoolClientId, 'access');
 });
+const isAuthValidForApiKeys = (authSettings, apiKeyHeader) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiKeys = authSettings.apiKeys || [];
+    if (apiKeys.length === 0) {
+        return true;
+    }
+    const index = apiKeys.findIndex((apiKey) => apiKey.value === apiKeyHeader);
+    return index >= 0;
+});
+const isAuthValid = (qpqConfig, authHeader, apiKeyHeader, authSettings) => __awaiter(void 0, void 0, void 0, function* () {
+    // If there are no auth settings ~ Its valid.
+    if (!authSettings) {
+        return true;
+    }
+    const cognitoValid = yield isAuthValidForCognito(qpqConfig, authSettings, authHeader);
+    const authKeysValid = yield isAuthValidForApiKeys(authSettings, apiKeyHeader);
+    return cognitoValid && authKeysValid;
+});
 exports.isAuthValid = isAuthValid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",