ag-common 0.0.161 → 0.0.164

package/dist/api/helpers/openApiHelpers.d.ts

@@ -1,6 +1,7 @@
 import { ILambdaConfigs } from '../types';
 import { Construct } from 'constructs';
 import { aws_certificatemanager as certmgr, aws_route53 as route53 } from 'aws-cdk-lib';
+import { TokenAuthorizer } from 'aws-cdk-lib/aws-apigateway/lib/authorizers/lambda';
 export declare const openApiImpl: (p: {
     schema: unknown;
     stack: Construct;
@@ -20,4 +21,8 @@ export declare const openApiImpl: (p: {
         allowOrigins: string[];
         allowHeaders: string[];
     };
+    /**
+     * dictionary of named authorizer functions. these names are to be used in the lambdaConfig param
+     */
+    authorizers?: Record<string, TokenAuthorizer>;
 }) => void;

package/dist/api/helpers/openApiHelpers.js

@@ -33,7 +33,7 @@ const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortSt
     });
     return api;
 };
-const setupLambda = ({ lambdaConfig, pathV, verb, seenPermissions, }) => {
+const setupLambda = ({ lambdaConfig, pathV, verb, seenPermissions, authorizers, }) => {
     var _a, _b, _c, _d;
     const pathCompute = pathV + '/' + verb;
     const lp = lambdaConfig === null || lambdaConfig === void 0 ? void 0 : lambdaConfig[pathCompute];
@@ -52,13 +52,30 @@ const setupLambda = ({ lambdaConfig, pathV, verb, seenPermissions, }) => {
     const writeTables = (0, array_1.distinctBy)([...(((_c = def === null || def === void 0 ? void 0 : def.dynamo) === null || _c === void 0 ? void 0 : _c.writes) || []), ...(((_d = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _d === void 0 ? void 0 : _d.writes) || [])], (s) => s.shortName);
     const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(array_1.notEmpty);
     const layers = [...(def.layers || []), ...((lp === null || lp === void 0 ? void 0 : lp.layers) || [])].filter(array_1.notEmpty);
+    let authorizerName = lp === null || lp === void 0 ? void 0 : lp.authorizerName;
+    if (authorizerName === undefined) {
+        authorizerName = def.authorizerName;
+    }
+    if (authorizerName && (!authorizers || !authorizers[authorizerName])) {
+        throw new Error('unseen auth name:' + authorizerName);
+    }
+    const authorizer = !authorizerName
+        ? undefined
+        : authorizers === null || authorizers === void 0 ? void 0 : authorizers[authorizerName];
     const env = Object.assign(Object.assign({}, (def.env || {})), ((lp === null || lp === void 0 ? void 0 : lp.env) || {}));
     const tables = [...readTables, ...writeTables];
     const environment = env;
     Object.values(tables).forEach((v) => {
         environment[v.shortName] = v.table.tableName;
     });
-    return { environment, readTables, writeTables, policies, layers };
+    return {
+        environment,
+        readTables,
+        writeTables,
+        policies,
+        layers,
+        authorizer,
+    };
 };
 const addApiPaths = (api, pathList, apiRoots) => {
     let pathBuild = '';
@@ -91,11 +108,12 @@ const openApiImpl = (p) => {
     paths.forEach(({ fullPath, verbs, pathList }) => {
         const apiPath = addApiPaths(api, pathList, apiRoots);
         verbs.forEach((verb) => {
-            const { environment, readTables, writeTables, policies, layers } = setupLambda({
+            const { environment, readTables, writeTables, policies, layers, authorizer, } = setupLambda({
                 lambdaConfig,
                 pathV: fullPath,
                 verb,
                 seenPermissions,
+                authorizers: p.authorizers,
             });
             const lambdaName = lambdaNameSafe(`${p.shortStackName}-${fullPath}-${verb}-${NODE_ENV}`);
             const entry = `${endpointsBase}${fullPath}/${verb.toUpperCase()}.ts`;
@@ -119,7 +137,7 @@ const openApiImpl = (p) => {
             writeTables.forEach((t) => t.table.grantReadWriteData(lambdaV));
             policies.forEach((p1) => lambdaV.addToRolePolicy(p1));
             //
-            apiPath.addMethod(verb.toUpperCase(), new aws_cdk_lib_1.aws_apigateway.LambdaIntegration(lambdaV, {}));
+            apiPath.addMethod(verb.toUpperCase(), new aws_cdk_lib_1.aws_apigateway.LambdaIntegration(lambdaV, {}), { authorizer });
         });
     });
     Object.keys(lambdaConfig).forEach((k) => {

package/dist/api/types/index.d.ts

@@ -25,7 +25,14 @@ export interface ILambdaConfig {
     policies?: iam.PolicyStatement[];
     env?: Record<string, string>;
     layers?: lambda.ILayerVersion[];
+    /**
+     * use the name of the lambda authorizer passed in in the openApiImpl config
+     */
+    authorizerName?: string;
 }
+/**
+ * 'default' will be applied to all functions
+ */
 export interface ILambdaConfigs {
     [pathHyphenVerb: string]: ILambdaConfig & {
         default?: ILambdaConfig;

package/dist/ui/helpers/cognito.d.ts

@@ -3,7 +3,6 @@ export declare type TOnMessage = (m: string, options?: {
 }) => void;
 export interface ICognitoAuth {
     AWSRegion: string;
-    poolUrl: string;
     identityPool?: string;
     UserPoolId: string;
     ClientId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.161",
+  "version": "0.0.164",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.x",
-    "aws-sdk": "2.1075.0",
+    "aws-sdk": "2.1080.0",
     "axios": "0.26.0",
     "constructs": "10.x",
     "jsonwebtoken": "8.5.1",
@@ -29,15 +29,15 @@
   },
   "devDependencies": {
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "17.0.18",
+    "@types/node": "17.0.21",
     "@types/react": "17.0.39",
     "@types/react-dom": "17.0.11",
-    "@types/styled-components": "5.1.22",
-    "@typescript-eslint/eslint-plugin": "5.12.0",
-    "@typescript-eslint/parser": "5.12.0",
+    "@types/styled-components": "5.1.23",
+    "@typescript-eslint/eslint-plugin": "5.12.1",
+    "@typescript-eslint/parser": "5.12.1",
     "eslint": "8.9.0",
     "eslint-config-airbnb-typescript": "16.1.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint-config-prettier": "8.4.0",
     "eslint-config-react-app": "7.0.0",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsx-a11y": "6.5.1",