@sylvesterllc/aws-constructs 1.0.64 → 1.0.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/app-config.test.ts +7 -1
- package/dist/constructs/MicroService.js +3 -1
- package/dist/resources/gateway/CreateApiAndAttachLambdas.d.ts +1 -1
- package/dist/resources/gateway/CreateApiAndAttachLambdas.js +6 -6
- package/dist/resources/lambda-authorizer/TsgRequestAuthorizer.d.ts +3 -1
- package/dist/resources/lambda-authorizer/TsgRequestAuthorizer.js +5 -3
- package/dist/resources/lambda-authorizer/createAuthorizerHelpers.d.ts +2 -1
- package/dist/resources/lambda-authorizer/createAuthorizerHelpers.js +9 -4
- package/package.json +1 -1
- package/src/constructs/MicroService.ts +4 -1
- package/src/resources/gateway/CreateApiAndAttachLambdas.ts +5 -5
- package/src/resources/lambda-authorizer/TsgRequestAuthorizer.ts +3 -2
- package/src/resources/lambda-authorizer/createAuthorizerHelpers.ts +11 -3
|
@@ -15,10 +15,16 @@ describe('app Config', () => {
|
|
|
15
15
|
|
|
16
16
|
test('Application Config', () => {
|
|
17
17
|
|
|
18
|
+
|
|
19
|
+
expect(appConfig!.RESOURCES.AUTHORIZER).toBeTruthy();
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
test.skip('Application Config', () => {
|
|
23
|
+
|
|
18
24
|
expect(appConfig!.RESOURCES.AUTHORIZER).toBeTruthy();
|
|
19
25
|
});
|
|
20
26
|
|
|
21
|
-
test('Require Authorizer', () => {
|
|
27
|
+
test.skip('Require Authorizer', () => {
|
|
22
28
|
|
|
23
29
|
const requireAuthorizer = (appConfig!.RESOURCES.AUTHORIZER && appConfig!.RESOURCES.AUTHORIZER.type) ? true : false;
|
|
24
30
|
expect(requireAuthorizer).toBe(true);
|
|
@@ -50,6 +50,8 @@ class MicroService extends constructs_1.Construct {
|
|
|
50
50
|
if (this.requireSeedDatabase) {
|
|
51
51
|
(0, createSeedDatabaseCustomResource_1.createSeedDatabaseCustomResource)(scope, this.appConfig, tables[0], layers);
|
|
52
52
|
}
|
|
53
|
+
console.log('myConfig', this.appConfig);
|
|
54
|
+
console.log('Authorizer Type::: ', this.appConfig.RESOURCES.AUTHORIZER?.type);
|
|
53
55
|
// CREATE API GATEWAY AND LAMBDA HERE
|
|
54
56
|
const apiGateway = new CreateApiAndAttachLambdas_1.CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers, tables);
|
|
55
57
|
}
|
|
@@ -59,4 +61,4 @@ class MicroService extends constructs_1.Construct {
|
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
exports.MicroService = MicroService;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWljcm9TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0cnVjdHMvTWljcm9TZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF1QztBQUV2QyxxRUFBb0U7QUFDcEUsOERBQXFEO0FBQ3JELGtFQUFnRTtBQUNoRSw4RUFBMkU7QUFDM0UsbURBQWdEO0FBQ2hELDZDQUFtQztBQUVuQyw4RkFBMkY7QUFDM0YsbUhBQWdIO0FBQ2hILE1BQWEsWUFBYSxTQUFRLHNCQUFTO0lBRXBCLG1CQUFtQixDQUFVO0lBQ3RDLG1CQUFtQixHQUFZLEtBQUssQ0FBQztJQUM1QixlQUFlLEdBQVksS0FBSyxDQUFDO0lBQzFDLFNBQVMsQ0FBWTtJQUUvQixZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXdCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLG1CQUFtQixHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTTtZQUN0RCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsbUJBQW1CLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxpQkFBaUI7WUFDakUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBRXZELElBQUksQ0FBQyxlQUFlLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLGFBQWE7WUFDakQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUU3RCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDekIsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFnQjtRQUUzQixJQUFJLE1BQU0sR0FBd0IsU0FBUyxDQUFDO1FBQzVDLElBQUksWUFBWSxHQUErQixTQUFTLENBQUM7UUFFekQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFO1lBQ2hDLCtFQUErRTtZQUMvRSx1QkFBdUI7WUFDdEIsTUFBTSxTQUFTLEdBQUcsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7U0FDOUY7UUFFRCxJQUFJLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDdEIsWUFBWSxHQUFHLElBQUEscUNBQWlCLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksZUFBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBRXBELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQztRQUU1QixzQ0FBc0M7UUFDdEMsSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSw2QkFBYyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFekQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUM7U0FDakM7UUFFRCxJQUFJLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtZQUMxQixJQUFBLG1FQUFnQyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLE1BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztTQUMvRTtRQUVNLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUV4QyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUNwRixzQ0FBc0M7UUFDdEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxxREFBeUIsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXZHLENBQUM7SUFFUyxTQUFTLENBQUMsS0FBZ0I7UUFDaEMsa0JBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xELGtCQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNsRSxDQUFDO0NBQ0o7QUF2RUQsb0NBdUVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVGFibGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWR5bmFtb2RiXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgTWljcm9zZXJ2aWNlUHJvcHMgfSBmcm9tIFwiLi4vaW50ZXJmYWNlcy9NaWNyb3NlcnZpY2VQcm9wc1wiO1xuaW1wb3J0IHsgQ3JlYXRlRHluYW1vRGIgfSBmcm9tIFwiLi4vcmVzb3VyY2VzL2R5bmFtb2RiL0NyZWF0ZUR5bmFtb1wiO1xuaW1wb3J0IHsgQXBpIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L2NyZWF0ZUFwaVwiO1xuaW1wb3J0IHsgZ2V0U2VjcmV0TWFuYWdlciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvc2VjdXJpdHlNYW5hZ2VyXCI7XG5pbXBvcnQgeyBjcmVhdGVDb21tb25MYXllciB9IGZyb20gXCIuLi9yZXNvdXJjZXMvaGVscGVycy9jcmVhdGVDb21tb25MYXllclwiO1xuaW1wb3J0IHsgQXBwQ29uZmlnIH0gZnJvbSBcIi4uL2NvbmZpZy9BcHBDb25maWdcIjtcbmltcG9ydCB7IFRhZ3MgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IExheWVyVmVyc2lvbiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtbGFtYmRhXCI7XG5pbXBvcnQgeyBDcmVhdGVBcGlBbmRBdHRhY2hMYW1iZGFzIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9nYXRld2F5L0NyZWF0ZUFwaUFuZEF0dGFjaExhbWJkYXNcIjtcbmltcG9ydCB7IGNyZWF0ZVNlZWREYXRhYmFzZUN1c3RvbVJlc291cmNlIH0gZnJvbSBcIi4uL3Jlc291cmNlcy9jdXN0b21SZXNvdXJjZS9jcmVhdGVTZWVkRGF0YWJhc2VDdXN0b21SZXNvdXJjZVwiO1xuZXhwb3J0IGNsYXNzIE1pY3JvU2VydmljZSBleHRlbmRzIENvbnN0cnVjdCB7XG5cbiAgICBwcm90ZWN0ZWQgcmVhZG9ubHkgcmVxdWlyZUR5bmFtb1RhYmxlczogYm9vbGVhbjtcbiAgICBwcm90ZWN0ZWQgcmVxdWlyZVNlZWREYXRhYmFzZTogYm9vbGVhbiA9IGZhbHNlO1xuICAgIHByb3RlY3RlZCByZWFkb25seSBoYXNMYW1iZGFMYXllcnM6IGJvb2xlYW4gPSBmYWxzZTsgIFxuICAgIHByb3RlY3RlZCBhcHBDb25maWc6IEFwcENvbmZpZztcblxuICAgIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBNaWNyb3NlcnZpY2VQcm9wcykge1xuICAgICAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgICAgIHRoaXMuYXBwQ29uZmlnID0gbmV3IEFwcENvbmZpZyhwcm9wcyk7ICBcbiAgICAgICAgXG4gICAgICAgIGNvbnNvbGUubG9nKCd0aGlzLmFwcENvbmZpZycsIHRoaXMuYXBwQ29uZmlnKTtcbiAgICAgICAgY29uc29sZS5sb2coJ3Byb3BzJywgcHJvcHMpO1xuICAgICAgICBcbiAgICAgICAgdGhpcy5yZXF1aXJlRHluYW1vVGFibGVzID0gKHByb3BzLlJFU09VUkNFUy5EWU5BTU8/LlRBQkxFUyAmJlxuICAgICAgICAgICAgcHJvcHMuUkVTT1VSQ0VTLkRZTkFNTy5UQUJMRVMubGVuZ3RoID4gMCkgPyB0cnVlIDogZmFsc2U7XG5cbiAgICAgICAgdGhpcy5yZXF1aXJlU2VlZERhdGFiYXNlID0gKHByb3BzLlJFU09VUkNFUy5EWU5BTU8/LlVTRV9TRUVEX0RBVEFCQVNFICYmIFxuICAgICAgICAgICAgcHJvcHMuUkVTT1VSQ0VTLkRZTkFNTy5TRUVEX0xBTUJEQSkgPyB0cnVlIDogZmFsc2U7XG5cbiAgICAgICAgdGhpcy5oYXNMYW1iZGFMYXllcnMgPSAocHJvcHMuUkVTT1VSQ0VTLkxBTUJEQV9MQVlFUlMgJiYgXG4gICAgICAgICAgICBwcm9wcy5SRVNPVVJDRVMuTEFNQkRBX0xBWUVSUy5sZW5ndGggPiAwKSA/IHRydWUgOiBmYWxzZTtcblxuICAgICAgICB0aGlzLm9uSW5pdChzY29wZSk7XG5cbiAgICAgICAgdGhpcy5jcmVhdGVUYWcoc2NvcGUpXG4gICAgfVxuXG4gICAgcHJpdmF0ZSBvbkluaXQoc2NvcGU6IENvbnN0cnVjdCkge1xuXG4gICAgICAgIGxldCB0YWJsZXM6IFRhYmxlW10gfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG4gICAgICAgIGxldCBjb21tb25MYXllcnM6IExheWVyVmVyc2lvbltdIHwgdW5kZWZpbmVkID0gdW5kZWZpbmVkO1xuXG4gICAgICAgIGlmIChwcm9jZXNzLmVudi5TRUNSRVRfTUFOQUdFUl9BUk4pIHtcbiAgICAgICAgICAgIC8vIHRocm93IG5ldyBFcnJvcihgWW91IG11c3QgcHJvdmlkZSB0aGUgQVJOIGZvciB0aGUgeW91ciBDb25maWd1cmF0aW9uIFNlY3JldCBcbiAgICAgICAgICAgIC8vICAgICBNYW5hZ2VyYCk7ICAgICAgXG4gICAgICAgICAgICAgY29uc3Qgc2VjcmV0TWdyID0gZ2V0U2VjcmV0TWFuYWdlcihzY29wZSwgdGhpcy5hcHBDb25maWcsIHByb2Nlc3MuZW52LlNFQ1JFVF9NQU5BR0VSX0FSTik7ICAgICAgICAgICAgXG4gICAgICAgIH1cblxuICAgICAgICBpZiAodGhpcy5oYXNMYW1iZGFMYXllcnMpIHtcbiAgICAgICAgICAgIGNvbW1vbkxheWVycyA9IGNyZWF0ZUNvbW1vbkxheWVyKHNjb3BlLCB0aGlzLmFwcENvbmZpZyk7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBnYXRld2F5ID0gbmV3IEFwaShzY29wZSwgdGhpcy5hcHBDb25maWcpLkFQSXM7XG5cbiAgICAgICAgY29uc3QgbGF5ZXJzID0gY29tbW9uTGF5ZXJzO1xuXG4gICAgICAgIC8vIENyZWF0ZXMgRHluYW1vRGIgVGFibGVzIGlmIHJlcXVpcmVkXG4gICAgICAgIGlmICh0aGlzLnJlcXVpcmVEeW5hbW9UYWJsZXMpIHtcbiAgICAgICAgICAgIGNvbnN0IGR5bmFtbyA9IG5ldyBDcmVhdGVEeW5hbW9EYihzY29wZSwgdGhpcy5hcHBDb25maWcpO1xuXG4gICAgICAgICAgICB0YWJsZXMgPSBkeW5hbW8uQ3JlYXRlZFRhYmxlcztcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0aGlzLnJlcXVpcmVTZWVkRGF0YWJhc2UpIHtcbiAgICAgICAgICAgIGNyZWF0ZVNlZWREYXRhYmFzZUN1c3RvbVJlc291cmNlKHNjb3BlLCB0aGlzLmFwcENvbmZpZywgdGFibGVzIVswXSwgbGF5ZXJzKTtcbiAgICAgICAgfVxuXG4gICAgICAgICAgICAgICBjb25zb2xlLmxvZygnbXlDb25maWcnLCB0aGlzLmFwcENvbmZpZyk7XG5cbiAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCdBdXRob3JpemVyIFR5cGU6OjogJywgdGhpcy5hcHBDb25maWcuUkVTT1VSQ0VTLkFVVEhPUklaRVI/LnR5cGUpXG4gICAgICAgIC8vIENSRUFURSBBUEkgR0FURVdBWSBBTkQgTEFNQkRBIEhFUkUgXG4gICAgICAgIGNvbnN0IGFwaUdhdGV3YXkgPSBuZXcgQ3JlYXRlQXBpQW5kQXR0YWNoTGFtYmRhcyhzY29wZSwgdGhpcy5hcHBDb25maWcsIGdhdGV3YXlbMF0sIGxheWVycyx0YWJsZXMpO1xuICAgICAgIFxuICAgIH1cblxuICAgIHByb3RlY3RlZCBjcmVhdGVUYWcoc2NvcGU6IENvbnN0cnVjdCkge1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ0FwcCcsIHRoaXMuYXBwQ29uZmlnLkFwcE5hbWUpO1xuICAgICAgICBUYWdzLm9mKHNjb3BlKS5hZGQoJ1Jlc291Y2VQcmVmaXgnLCB0aGlzLmFwcENvbmZpZy5BcHBQcmVmaXgpO1xuICAgIH1cbn0iXX0=
|
|
@@ -11,7 +11,7 @@ export declare class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaRes
|
|
|
11
11
|
private layers?;
|
|
12
12
|
private tables?;
|
|
13
13
|
protected requireAuthorizer: boolean;
|
|
14
|
-
protected
|
|
14
|
+
protected authorizerType?: TsgAuthorizerType;
|
|
15
15
|
constructor(scope: Construct, config: AppConfig, gatewayApi: IRestApi, layers?: LayerVersion[] | undefined, tables?: ITable[] | undefined);
|
|
16
16
|
protected createResource(scope: Construct): ApiLambdaResult[] | null;
|
|
17
17
|
protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
|
|
@@ -13,7 +13,7 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
|
13
13
|
layers;
|
|
14
14
|
tables;
|
|
15
15
|
requireAuthorizer;
|
|
16
|
-
|
|
16
|
+
authorizerType;
|
|
17
17
|
constructor(scope, config, gatewayApi, layers, tables) {
|
|
18
18
|
super(scope, config);
|
|
19
19
|
this.gatewayApi = gatewayApi;
|
|
@@ -23,7 +23,7 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
|
23
23
|
this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER &&
|
|
24
24
|
this.config.RESOURCES.AUTHORIZER.type) ? true : false;
|
|
25
25
|
if (this.requireAuthorizer) {
|
|
26
|
-
this.
|
|
26
|
+
this.authorizerType = this.config.RESOURCES.AUTHORIZER?.type;
|
|
27
27
|
}
|
|
28
28
|
else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {
|
|
29
29
|
throw new Error(`You must provide an authorizer type if a Authorizer is required`);
|
|
@@ -59,14 +59,14 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
|
59
59
|
}
|
|
60
60
|
createAuthorizer() {
|
|
61
61
|
let authorizer = undefined;
|
|
62
|
-
if (this.requireAuthorizer && this.
|
|
62
|
+
if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType_1.TsgAuthorizerType.TOKEN_AUTHORIZER) {
|
|
63
63
|
authorizer = new TsgJwtTokenAuthorizer_1.TsgJwtTokenAuthorizer(this.scope, this.config).JwtAuthorizer;
|
|
64
64
|
authorizer?._attachToApi(this.gatewayApi);
|
|
65
65
|
authorizer?.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
|
|
66
66
|
return authorizer;
|
|
67
67
|
}
|
|
68
|
-
else if (this.requireAuthorizer && this.
|
|
69
|
-
authorizer = new TsgRequestAuthorizer_1.TsgRequestAuthorizer(this.scope, this.config).RequestAuthorizer;
|
|
68
|
+
else if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType_1.TsgAuthorizerType.REQUEST_AUTHORIZER) {
|
|
69
|
+
authorizer = new TsgRequestAuthorizer_1.TsgRequestAuthorizer(this.scope, this.config, this.layers, this.tables).RequestAuthorizer;
|
|
70
70
|
authorizer?._attachToApi(this.gatewayApi);
|
|
71
71
|
authorizer?.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
|
|
72
72
|
return authorizer;
|
|
@@ -97,4 +97,4 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
exports.CreateApiAndAttachLambdas = CreateApiAndAttachLambdas;
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,4EAAyE;AAEzE,sFAAmF;AACnF,6CAAuD;AACvD,oFAAiF;AACjF,yDAAsD;AAKtD,0DAAiD;AAEjD,MAAa,yBAA0B,SAAQ,2BAA6B;IAO5D;IACA;IACA;IAPF,iBAAiB,CAAU;IAC3B,UAAU,CAAqB;IAEzC,YAAY,KAAgB,EACxB,MAAiB,EACT,UAAoB,EACpB,MAAuB,EACvB,MAAiB;QACzB,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHb,eAAU,GAAV,UAAU,CAAU;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAW;QAGzB,OAAO,CAAC,GAAG,CAAC,qDAAqD,EAAE,MAAM,CAAC,CAAC;QAE3E,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU;YACtD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAE1D,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;SAC5D;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YACnF,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAE,CAAC;IACxD,CAAC;IAES,cAAc,CAAC,KAAgB;QAErC,IAAI,UAAU,GAA2D,SAAS,CAAC;QAEnF,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACxC;QAED,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvE,gDAAgD;QAChD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3D;QAED,uDAAuD;QACvD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,IAAI,SAAS,CAAC,CAAC;QAEvF,MAAM,MAAM,GAAoB;YAC5B,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,UAAU,EAAE,UAAU;SACzB,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAES,YAAY,CAAI,KAAgB,EAAE,aAAkB;QAE1D,IAAI,CAAC,gBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,uBAAS,CAAC,KAAK,EAAE,eAAe,GAAG,EAAE,EAAE;gBACvC,KAAK,EAAE,CAAC,CAAC,UAAU,EAAE,aAAc;aACtC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,gBAAgB;QAEpB,IAAI,UAAU,GAAoD,SAAS,CAAC;QAE5E,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,gBAAgB,EAAE;YAElF,UAAU,GAAG,IAAI,6CAAqB,CAAC,IAAI,CAAC,KAAK,EAC7C,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAE/B,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SAErB;aAAM,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,qCAAiB,CAAC,kBAAkB,EAAE;YAC3F,UAAU,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,KAAK,EAC5C,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAsC,CAAC;YAExD,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,UAAU,EAAE,kBAAkB,CAAC,2BAAa,CAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,UAAU,CAAC;SACrB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAAC,MAAgB,EAAE,OAAyB;QAEpE,IAAI,MAAM,EAAE;YACR,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;gBAEvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;oBAE7B,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAErC,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEO,SAAS,CAAC,MAAiB,EAC/B,OAAiB,EACjB,OAAyB,EACzB,UAA8C;QAE9C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAmB,EAAE,EAAE;YAErD,MAAM,QAAQ,GAAG,2BAAY,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhE,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACxC;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YAE7D,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACxD;YAED,qBAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA3HD,8DA2HC","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { CfnOutput, RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {\n    \n    protected requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);\n        \n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n        this.createdResources = this.createResource(scope)!;\n    }\n\n    protected createResource(scope: Construct): ApiLambdaResult[] | null {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer();\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);\n\n        const result: ApiLambdaResult = {\n            api: this.gatewayApi,\n            authorizer: authorizer\n        };\n        return [result];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        \n        this.createdResources!.forEach((x, idx) => {\n            new CfnOutput(scope, `Authorizerr-${idx}`, {\n                value: x.authorizer?.authorizerArn!\n            });\n        });\n    }    \n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.REQUEST_AUTHORIZER) {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n        return null;\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");\n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        });\n    }\n}"]}
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { CfnOutput, RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {\n    \n    protected requireAuthorizer: boolean;\n    protected authorizerType?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);\n        \n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizerType = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n        this.createdResources = this.createResource(scope)!;\n    }\n\n    protected createResource(scope: Construct): ApiLambdaResult[] | null {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer();\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);\n\n        const result: ApiLambdaResult = {\n            api: this.gatewayApi,\n            authorizer: authorizer\n        };\n        return [result];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        \n        this.createdResources!.forEach((x, idx) => {\n            new CfnOutput(scope, `Authorizerr-${idx}`, {\n                value: x.authorizer?.authorizerArn!\n            });\n        });\n    }    \n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType.REQUEST_AUTHORIZER) {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config, this.layers, this.tables).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n        return null;\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");\n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        });\n    }\n}"]}
|
|
@@ -3,10 +3,12 @@ import { Construct } from "constructs";
|
|
|
3
3
|
import { AppConfig } from "../../config/AppConfig";
|
|
4
4
|
import { BaseResource } from "../base/baseResource";
|
|
5
5
|
import { LayerVersion } from "aws-cdk-lib/aws-lambda";
|
|
6
|
+
import { ITableV2 } from "aws-cdk-lib/aws-dynamodb";
|
|
6
7
|
export declare class TsgRequestAuthorizer extends BaseResource<RequestAuthorizer> {
|
|
7
8
|
private layers?;
|
|
9
|
+
private tables?;
|
|
8
10
|
get RequestAuthorizer(): RequestAuthorizer | undefined;
|
|
9
|
-
constructor(scope: Construct, config: AppConfig, layers?: LayerVersion[] | undefined);
|
|
11
|
+
constructor(scope: Construct, config: AppConfig, layers?: LayerVersion[] | undefined, tables?: ITableV2[] | undefined);
|
|
10
12
|
protected createResource(scope: Construct): RequestAuthorizer[] | null;
|
|
11
13
|
protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
|
|
12
14
|
}
|
|
@@ -7,15 +7,17 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
|
7
7
|
const createAuthorizerHelpers_1 = require("./createAuthorizerHelpers");
|
|
8
8
|
class TsgRequestAuthorizer extends baseResource_1.BaseResource {
|
|
9
9
|
layers;
|
|
10
|
+
tables;
|
|
10
11
|
get RequestAuthorizer() {
|
|
11
12
|
return (this.createdResources && this.createdResources.length > 0) ? this.createdResources[0] : undefined;
|
|
12
13
|
}
|
|
13
|
-
constructor(scope, config, layers) {
|
|
14
|
+
constructor(scope, config, layers, tables) {
|
|
14
15
|
super(scope, config);
|
|
15
16
|
this.layers = layers;
|
|
17
|
+
this.tables = tables;
|
|
16
18
|
}
|
|
17
19
|
createResource(scope) {
|
|
18
|
-
const authorizer = (0, createAuthorizerHelpers_1.createAuthorizer)(scope, this.config, this.layers);
|
|
20
|
+
const authorizer = (0, createAuthorizerHelpers_1.createAuthorizer)(scope, this.config, this.layers, this.tables);
|
|
19
21
|
return [authorizer];
|
|
20
22
|
}
|
|
21
23
|
createOutput(scope, createdAssets) {
|
|
@@ -30,4 +32,4 @@ class TsgRequestAuthorizer extends baseResource_1.BaseResource {
|
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
exports.TsgRequestAuthorizer = TsgRequestAuthorizer;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHNnUmVxdWVzdEF1dGhvcml6ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2xhbWJkYS1hdXRob3JpemVyL1RzZ1JlcXVlc3RBdXRob3JpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtEQUErRDtBQUcvRCx1REFBb0Q7QUFFcEQsNkNBQXdDO0FBQ3hDLHVFQUE2RDtBQUs3RCxNQUFhLG9CQUFxQixTQUFRLDJCQUErQjtJQU1aO0lBQWlDO0lBSjFGLElBQUksaUJBQWlCO1FBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLElBQUksSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDOUcsQ0FBQztJQUVELFlBQVksS0FBZ0IsRUFBRSxNQUFpQixFQUFVLE1BQXVCLEVBQVUsTUFBbUI7UUFDekcsS0FBSyxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQURnQyxXQUFNLEdBQU4sTUFBTSxDQUFpQjtRQUFVLFdBQU0sR0FBTixNQUFNLENBQWE7SUFFN0csQ0FBQztJQUVTLGNBQWMsQ0FBQyxLQUFnQjtRQUNyQyxNQUFNLFVBQVUsR0FBRyxJQUFBLDBDQUFnQixFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2xGLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN4QixDQUFDO0lBRVMsWUFBWSxDQUFJLEtBQWdCLEVBQUUsYUFBa0I7UUFDMUQsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQzVCLElBQUksS0FBSyxZQUFZLGtDQUFpQixFQUFFO2dCQUNwQyxtQ0FBbUM7Z0JBQ25DLElBQUksdUJBQVMsQ0FBQyxLQUFLLEVBQUUsc0JBQXNCLEVBQUU7b0JBQ3pDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxLQUFLLENBQUMsYUFBYSxFQUFFO2lCQUM3RCxDQUFDLENBQUM7YUFDTjtRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNKO0FBekJELG9EQXlCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlcXVlc3RBdXRob3JpemVyIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1hcGlnYXRld2F5XCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgQXBwQ29uZmlnIH0gZnJvbSBcIi4uLy4uL2NvbmZpZy9BcHBDb25maWdcIjtcbmltcG9ydCB7IEJhc2VSZXNvdXJjZSB9IGZyb20gXCIuLi9iYXNlL2Jhc2VSZXNvdXJjZVwiO1xuXG5pbXBvcnQgeyBDZm5PdXRwdXQgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IGNyZWF0ZUF1dGhvcml6ZXIgfSBmcm9tIFwiLi9jcmVhdGVBdXRob3JpemVySGVscGVyc1wiO1xuaW1wb3J0IHsgTGF5ZXJWZXJzaW9uIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sYW1iZGFcIjtcbmltcG9ydCB7IElUYWJsZVYyIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1keW5hbW9kYlwiO1xuXG5cbmV4cG9ydCBjbGFzcyBUc2dSZXF1ZXN0QXV0aG9yaXplciBleHRlbmRzIEJhc2VSZXNvdXJjZTxSZXF1ZXN0QXV0aG9yaXplcj4ge1xuXG4gICAgZ2V0IFJlcXVlc3RBdXRob3JpemVyKCkge1xuICAgICAgICByZXR1cm4gKHRoaXMuY3JlYXRlZFJlc291cmNlcyAmJiB0aGlzLmNyZWF0ZWRSZXNvdXJjZXMubGVuZ3RoID4gMCkgPyB0aGlzLmNyZWF0ZWRSZXNvdXJjZXNbMF0gOiB1bmRlZmluZWQ7XG4gICAgfVxuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgY29uZmlnOiBBcHBDb25maWcsIHByaXZhdGUgbGF5ZXJzPzogTGF5ZXJWZXJzaW9uW10sIHByaXZhdGUgdGFibGVzPzogSVRhYmxlVjJbXSkge1xuICAgICAgICBzdXBlcihzY29wZSwgY29uZmlnKTtcbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgY3JlYXRlUmVzb3VyY2Uoc2NvcGU6IENvbnN0cnVjdCk6IFJlcXVlc3RBdXRob3JpemVyW10gfCBudWxsIHtcbiAgICAgICAgY29uc3QgYXV0aG9yaXplciA9IGNyZWF0ZUF1dGhvcml6ZXIoc2NvcGUsIHRoaXMuY29uZmlnLCB0aGlzLmxheWVycywgdGhpcy50YWJsZXMpO1xuICAgICAgICByZXR1cm4gW2F1dGhvcml6ZXJdO1xuICAgIH1cblxuICAgIHByb3RlY3RlZCBjcmVhdGVPdXRwdXQ8VD4oc2NvcGU6IENvbnN0cnVjdCwgY3JlYXRlZEFzc2V0czogVFtdKTogdm9pZCB7XG4gICAgICAgIGNyZWF0ZWRBc3NldHMuZm9yRWFjaCgoYXNzZXQpID0+IHtcbiAgICAgICAgICAgIGlmIChhc3NldCBpbnN0YW5jZW9mIFJlcXVlc3RBdXRob3JpemVyKSB7XG4gICAgICAgICAgICAgICAgLy8gT3V0cHV0IHRoZSBBUk4gb2YgdGhlIGF1dGhvcml6ZXJcbiAgICAgICAgICAgICAgICBuZXcgQ2ZuT3V0cHV0KHNjb3BlLCBcIlJlcXVlc3RBdXRob3JpemVyQXJuXCIsIHtcbiAgICAgICAgICAgICAgICAgICAgdmFsdWU6IGAke2Fzc2V0LmF1dGhvcml6YXRpb25UeXBlfToke2Fzc2V0LmF1dGhvcml6ZXJBcm59YFxuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgfVxuICAgICAgICB9KTtcbiAgICB9XG59Il19
|
|
@@ -2,4 +2,5 @@ import { RequestAuthorizer } from "aws-cdk-lib/aws-apigateway";
|
|
|
2
2
|
import { LayerVersion } from "aws-cdk-lib/aws-lambda";
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
4
|
import { AppConfig } from "../../config/AppConfig";
|
|
5
|
-
|
|
5
|
+
import { ITableV2 } from "aws-cdk-lib/aws-dynamodb";
|
|
6
|
+
export declare const createAuthorizer: (scope: Construct, config: AppConfig, layers?: LayerVersion[], tables?: ITableV2[]) => RequestAuthorizer;
|
|
@@ -6,8 +6,8 @@ const aws_apigateway_1 = require("aws-cdk-lib/aws-apigateway");
|
|
|
6
6
|
const aws_lambda_nodejs_1 = require("aws-cdk-lib/aws-lambda-nodejs");
|
|
7
7
|
const path = require("path");
|
|
8
8
|
const aws_logs_1 = require("aws-cdk-lib/aws-logs");
|
|
9
|
-
const createAuthorizer = (scope, config, layers) => {
|
|
10
|
-
const lambda = createLambdaForAuthorizer(scope, config);
|
|
9
|
+
const createAuthorizer = (scope, config, layers, tables) => {
|
|
10
|
+
const lambda = createLambdaForAuthorizer(scope, config, layers, tables);
|
|
11
11
|
const lambdaAuthroizer = new aws_apigateway_1.RequestAuthorizer(scope, `lambdaAuthorizer`, {
|
|
12
12
|
handler: lambda,
|
|
13
13
|
identitySources: [aws_apigateway_1.IdentitySource.header(config.RESOURCES.AUTHORIZER?.headerName)],
|
|
@@ -17,9 +17,14 @@ const createAuthorizer = (scope, config, layers) => {
|
|
|
17
17
|
return lambdaAuthroizer;
|
|
18
18
|
};
|
|
19
19
|
exports.createAuthorizer = createAuthorizer;
|
|
20
|
-
const createLambdaForAuthorizer = (scope, config, layers) => {
|
|
20
|
+
const createLambdaForAuthorizer = (scope, config, layers, tables) => {
|
|
21
21
|
const props = createLambdaProps(config, layers);
|
|
22
22
|
const lambda = new aws_lambda_nodejs_1.NodejsFunction(scope, `${config.AppPrefix}-authorizer`, props);
|
|
23
|
+
if (tables && tables.length > 0) {
|
|
24
|
+
tables.forEach((table) => {
|
|
25
|
+
table.grantReadData(lambda);
|
|
26
|
+
});
|
|
27
|
+
}
|
|
23
28
|
return lambda;
|
|
24
29
|
};
|
|
25
30
|
const createLambdaProps = (appConfig, layers) => {
|
|
@@ -47,4 +52,4 @@ const createLambdaProps = (appConfig, layers) => {
|
|
|
47
52
|
};
|
|
48
53
|
return lambdaProp;
|
|
49
54
|
};
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQXV0aG9yaXplckhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcmVzb3VyY2VzL2xhbWJkYS1hdXRob3JpemVyL2NyZWF0ZUF1dGhvcml6ZXJIZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUF1QztBQUN2QywrREFBK0U7QUFJL0UscUVBQW1HO0FBQ25HLDZCQUE4QjtBQUM5QixtREFBcUQ7QUFHOUMsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEtBQWdCLEVBQUUsTUFBaUIsRUFBRSxNQUF1QixFQUN6RixNQUFtQixFQUFFLEVBQUU7SUFFdkIsTUFBTSxNQUFNLEdBQUcseUJBQXlCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFeEUsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLGtDQUFpQixDQUMxQyxLQUFLLEVBQ0wsa0JBQWtCLEVBQ2xCO1FBQ0ksT0FBTyxFQUFFLE1BQU07UUFDZixlQUFlLEVBQUUsQ0FBQywrQkFBYyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxVQUFXLENBQUMsQ0FBQztRQUNsRixjQUFjLEVBQUUsR0FBRyxNQUFNLENBQUMsU0FBUyxhQUFhO1FBQ2hELGVBQWUsRUFBRSxzQkFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7S0FDdkMsQ0FDSixDQUFDO0lBRUYsT0FBTyxnQkFBZ0IsQ0FBQztBQUM1QixDQUFDLENBQUM7QUFqQlcsUUFBQSxnQkFBZ0Isb0JBaUIzQjtBQUVGLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxLQUFnQixFQUFFLE1BQWlCLEVBQUUsTUFBdUIsRUFBRSxNQUFtQixFQUFFLEVBQUU7SUFFcEgsTUFBTSxLQUFLLEdBQUcsaUJBQWlCLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRWhELE1BQU0sTUFBTSxHQUFHLElBQUksa0NBQWMsQ0FDN0IsS0FBSyxFQUNMLEdBQUcsTUFBTSxDQUFDLFNBQVMsYUFBYSxFQUNoQyxLQUFLLENBQ1IsQ0FBQztJQUVFLElBQUksTUFBTSxJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1FBQzdCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNyQixLQUFLLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQy9CLENBQUMsQ0FBQyxDQUFDO0tBQ1A7SUFFTCxPQUFPLE1BQU0sQ0FBQztBQUNqQixDQUFDLENBQUM7QUFFSCxNQUFNLGlCQUFpQixHQUFHLENBQUMsU0FBb0IsRUFBRSxNQUF1QixFQUFFLEVBQUU7SUFHeEUsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLFNBQVMsQ0FBQyxVQUFXLENBQUM7SUFFN0MsTUFBTSxVQUFVLEdBQXdCO1FBQ3BDLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDL0IsWUFBWSxFQUFFLEdBQUcsU0FBUyxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ25ELE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztRQUNyQixZQUFZLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsd0JBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLHdCQUFhLENBQUMsU0FBUztRQUNyRixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU8sSUFBSSxTQUFTLENBQUMsT0FBTyxDQUFDLFlBQVk7UUFDdkQsT0FBTyxFQUFFLElBQUksQ0FBQyxRQUFRLElBQUksc0JBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQzdDLFVBQVUsRUFBRSxJQUFJLENBQUMsTUFBTSxJQUFJLEdBQUc7UUFDOUIsV0FBVyxFQUFFO1lBQ1QsaUJBQWlCLEVBQUUsTUFBTTtZQUN6QixHQUFHLElBQUksQ0FBQyxXQUFXO1NBQ3RCO1FBQ0QsUUFBUSxFQUFFO1lBQ04sTUFBTSxFQUFFLEtBQUs7WUFDYixNQUFNLEVBQUUsUUFBUTtZQUNoQixTQUFTLEVBQUUsSUFBSTtZQUNmLGFBQWEsRUFBRSxpQ0FBYSxDQUFDLFFBQVE7WUFDckMsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXLElBQUksSUFBSSxDQUFDLFdBQVc7U0FDcEQ7UUFDRCxNQUFNO0tBQ1QsQ0FBQTtJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3RCLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IER1cmF0aW9uIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBJZGVudGl0eVNvdXJjZSwgUmVxdWVzdEF1dGhvcml6ZXIgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWFwaWdhdGV3YXlcIjtcbmltcG9ydCB7IElGdW5jdGlvbiwgTGF5ZXJWZXJzaW9uLCBSdW50aW1lIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sYW1iZGFcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBBcHBDb25maWcgfSBmcm9tIFwiLi4vLi4vY29uZmlnL0FwcENvbmZpZ1wiO1xuaW1wb3J0IHsgTm9kZWpzRnVuY3Rpb24sIE5vZGVqc0Z1bmN0aW9uUHJvcHMsIFNvdXJjZU1hcE1vZGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYS1ub2RlanNcIjtcbmltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG5pbXBvcnQgeyBSZXRlbnRpb25EYXlzIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sb2dzXCI7XG5pbXBvcnQgeyBJVGFibGVWMiB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZHluYW1vZGJcIjtcblxuZXhwb3J0IGNvbnN0IGNyZWF0ZUF1dGhvcml6ZXIgPSAoc2NvcGU6IENvbnN0cnVjdCwgY29uZmlnOiBBcHBDb25maWcsIGxheWVycz86IExheWVyVmVyc2lvbltdLFxuICAgIHRhYmxlcz86IElUYWJsZVYyW10pID0+IHtcblxuICAgIGNvbnN0IGxhbWJkYSA9IGNyZWF0ZUxhbWJkYUZvckF1dGhvcml6ZXIoc2NvcGUsIGNvbmZpZywgbGF5ZXJzLCB0YWJsZXMpO1xuXG4gICAgY29uc3QgbGFtYmRhQXV0aHJvaXplciA9IG5ldyBSZXF1ZXN0QXV0aG9yaXplcihcbiAgICAgICAgc2NvcGUsXG4gICAgICAgIGBsYW1iZGFBdXRob3JpemVyYCxcbiAgICAgICAge1xuICAgICAgICAgICAgaGFuZGxlcjogbGFtYmRhLFxuICAgICAgICAgICAgaWRlbnRpdHlTb3VyY2VzOiBbSWRlbnRpdHlTb3VyY2UuaGVhZGVyKGNvbmZpZy5SRVNPVVJDRVMuQVVUSE9SSVpFUj8uaGVhZGVyTmFtZSEpXSxcbiAgICAgICAgICAgIGF1dGhvcml6ZXJOYW1lOiBgJHtjb25maWcuQXBwUHJlZml4fS1hdXRob3JpemVyYCxcbiAgICAgICAgICAgIHJlc3VsdHNDYWNoZVR0bDogRHVyYXRpb24uc2Vjb25kcygwKSxcbiAgICAgICAgfVxuICAgICk7XG5cbiAgICByZXR1cm4gbGFtYmRhQXV0aHJvaXplcjtcbn07XG5cbmNvbnN0IGNyZWF0ZUxhbWJkYUZvckF1dGhvcml6ZXIgPSAoc2NvcGU6IENvbnN0cnVjdCwgY29uZmlnOiBBcHBDb25maWcsIGxheWVycz86IExheWVyVmVyc2lvbltdLCB0YWJsZXM/OiBJVGFibGVWMltdKSA9PiB7XG5cbiAgICBjb25zdCBwcm9wcyA9IGNyZWF0ZUxhbWJkYVByb3BzKGNvbmZpZywgbGF5ZXJzKTtcblxuICAgIGNvbnN0IGxhbWJkYSA9IG5ldyBOb2RlanNGdW5jdGlvbihcbiAgICAgICAgc2NvcGUsXG4gICAgICAgIGAke2NvbmZpZy5BcHBQcmVmaXh9LWF1dGhvcml6ZXJgLFxuICAgICAgICBwcm9wc1xuICAgICk7XG5cbiAgICAgICAgaWYgKHRhYmxlcyAmJiB0YWJsZXMubGVuZ3RoID4gMCkge1xuICAgICAgICAgICAgdGFibGVzLmZvckVhY2goKHRhYmxlKSA9PiB7XG4gICAgICAgICAgICAgICAgdGFibGUuZ3JhbnRSZWFkRGF0YShsYW1iZGEpO1xuICAgICAgICAgICAgIH0pOyBcbiAgICAgICAgfVxuICAgIFxuICAgIHJldHVybiBsYW1iZGE7XG4gfTtcblxuY29uc3QgY3JlYXRlTGFtYmRhUHJvcHMgPSAoYXBwQ29uZmlnOiBBcHBDb25maWcsIGxheWVycz86IExheWVyVmVyc2lvbltdKSA9PiB7XG5cblxuICAgIGNvbnN0IHByb3AgPSBhcHBDb25maWcuUkVTT1VSQ0VTLkFVVEhPUklaRVIhO1xuXG4gICAgY29uc3QgbGFtYmRhUHJvcDogTm9kZWpzRnVuY3Rpb25Qcm9wcyA9IHtcbiAgICAgICAgZW50cnk6IHBhdGguam9pbihwcm9wLmNvZGVQYXRoKSxcbiAgICAgICAgZnVuY3Rpb25OYW1lOiBgJHthcHBDb25maWcuQXBwUHJlZml4fS0ke3Byb3AubmFtZX1gLFxuICAgICAgICBoYW5kbGVyOiBwcm9wLmhhbmRsZXIsXG4gICAgICAgIGxvZ1JldGVudGlvbjogKCFwcm9wLmxvZ0R1cmF0aW9uKSA/IFJldGVudGlvbkRheXMuRklWRV9EQVlTIDogUmV0ZW50aW9uRGF5cy5PTkVfTU9OVEgsXG4gICAgICAgIHJ1bnRpbWU6IHByb3AucnVudGltZSB8fCBhcHBDb25maWcuR0xPQkFMUy5zdGFja1J1bnRpbWUsXG4gICAgICAgIHRpbWVvdXQ6IHByb3AuZHVyYXRpb24gfHwgRHVyYXRpb24ubWludXRlcygyKSxcbiAgICAgICAgbWVtb3J5U2l6ZTogcHJvcC5tZW1vcnkgfHwgNTEyLFxuICAgICAgICBlbnZpcm9ubWVudDoge1xuICAgICAgICAgICAgXCJWRVJCT1NFX0xPR0dJTkdcIjogXCJ0cnVlXCIsXG4gICAgICAgICAgICAuLi5wcm9wLmVudmlyb25tZW50XG4gICAgICAgIH0sXG4gICAgICAgIGJ1bmRsaW5nOiB7XG4gICAgICAgICAgICBtaW5pZnk6IGZhbHNlLFxuICAgICAgICAgICAgdGFyZ2V0OiAnZXNOZXh0JyxcbiAgICAgICAgICAgIHNvdXJjZU1hcDogdHJ1ZSxcbiAgICAgICAgICAgIHNvdXJjZU1hcE1vZGU6IFNvdXJjZU1hcE1vZGUuRVhURVJOQUwsXG4gICAgICAgICAgICBlbnZpcm9ubWVudDogcHJvcC5lbnZpcm9ubWVudCB8fCBwcm9wLmVudmlyb25tZW50LFxuICAgICAgICB9LFxuICAgICAgICBsYXllcnNcbiAgICB9XG5cbiAgICByZXR1cm4gbGFtYmRhUHJvcDtcbn07Il19
|
package/package.json
CHANGED
|
@@ -68,7 +68,10 @@ export class MicroService extends Construct {
|
|
|
68
68
|
if (this.requireSeedDatabase) {
|
|
69
69
|
createSeedDatabaseCustomResource(scope, this.appConfig, tables![0], layers);
|
|
70
70
|
}
|
|
71
|
-
|
|
71
|
+
|
|
72
|
+
console.log('myConfig', this.appConfig);
|
|
73
|
+
|
|
74
|
+
console.log('Authorizer Type::: ', this.appConfig.RESOURCES.AUTHORIZER?.type)
|
|
72
75
|
// CREATE API GATEWAY AND LAMBDA HERE
|
|
73
76
|
const apiGateway = new CreateApiAndAttachLambdas(scope, this.appConfig, gateway[0], layers,tables);
|
|
74
77
|
|
|
@@ -18,7 +18,7 @@ import { Routes } from "../helpers/createRoutes";
|
|
|
18
18
|
export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
|
|
19
19
|
|
|
20
20
|
protected requireAuthorizer: boolean;
|
|
21
|
-
protected
|
|
21
|
+
protected authorizerType?: TsgAuthorizerType;
|
|
22
22
|
|
|
23
23
|
constructor(scope: Construct,
|
|
24
24
|
config: AppConfig,
|
|
@@ -33,7 +33,7 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
|
|
|
33
33
|
this.config.RESOURCES.AUTHORIZER.type) ? true : false;
|
|
34
34
|
|
|
35
35
|
if (this.requireAuthorizer) {
|
|
36
|
-
this.
|
|
36
|
+
this.authorizerType = this.config.RESOURCES.AUTHORIZER?.type;
|
|
37
37
|
} else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {
|
|
38
38
|
throw new Error(`You must provide an authorizer type if a Authorizer is required`);
|
|
39
39
|
}
|
|
@@ -81,7 +81,7 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
|
|
|
81
81
|
|
|
82
82
|
let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;
|
|
83
83
|
|
|
84
|
-
if (this.requireAuthorizer && this.
|
|
84
|
+
if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType.TOKEN_AUTHORIZER) {
|
|
85
85
|
|
|
86
86
|
authorizer = new TsgJwtTokenAuthorizer(this.scope,
|
|
87
87
|
this.config).JwtAuthorizer;
|
|
@@ -91,9 +91,9 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
|
|
|
91
91
|
|
|
92
92
|
return authorizer;
|
|
93
93
|
|
|
94
|
-
} else if (this.requireAuthorizer && this.
|
|
94
|
+
} else if (this.requireAuthorizer && this.authorizerType === TsgAuthorizerType.REQUEST_AUTHORIZER) {
|
|
95
95
|
authorizer = new TsgRequestAuthorizer(this.scope,
|
|
96
|
-
this.config).RequestAuthorizer as RequestAuthorizer;
|
|
96
|
+
this.config, this.layers, this.tables).RequestAuthorizer as RequestAuthorizer;
|
|
97
97
|
|
|
98
98
|
authorizer?._attachToApi(this.gatewayApi);
|
|
99
99
|
authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);
|
|
@@ -6,6 +6,7 @@ import { BaseResource } from "../base/baseResource";
|
|
|
6
6
|
import { CfnOutput } from "aws-cdk-lib";
|
|
7
7
|
import { createAuthorizer } from "./createAuthorizerHelpers";
|
|
8
8
|
import { LayerVersion } from "aws-cdk-lib/aws-lambda";
|
|
9
|
+
import { ITableV2 } from "aws-cdk-lib/aws-dynamodb";
|
|
9
10
|
|
|
10
11
|
|
|
11
12
|
export class TsgRequestAuthorizer extends BaseResource<RequestAuthorizer> {
|
|
@@ -14,12 +15,12 @@ export class TsgRequestAuthorizer extends BaseResource<RequestAuthorizer> {
|
|
|
14
15
|
return (this.createdResources && this.createdResources.length > 0) ? this.createdResources[0] : undefined;
|
|
15
16
|
}
|
|
16
17
|
|
|
17
|
-
constructor(scope: Construct, config: AppConfig, private layers?: LayerVersion[]) {
|
|
18
|
+
constructor(scope: Construct, config: AppConfig, private layers?: LayerVersion[], private tables?: ITableV2[]) {
|
|
18
19
|
super(scope, config);
|
|
19
20
|
}
|
|
20
21
|
|
|
21
22
|
protected createResource(scope: Construct): RequestAuthorizer[] | null {
|
|
22
|
-
const authorizer = createAuthorizer(scope, this.config, this.layers);
|
|
23
|
+
const authorizer = createAuthorizer(scope, this.config, this.layers, this.tables);
|
|
23
24
|
return [authorizer];
|
|
24
25
|
}
|
|
25
26
|
|
|
@@ -6,10 +6,12 @@ import { AppConfig } from "../../config/AppConfig";
|
|
|
6
6
|
import { NodejsFunction, NodejsFunctionProps, SourceMapMode } from "aws-cdk-lib/aws-lambda-nodejs";
|
|
7
7
|
import path = require("path");
|
|
8
8
|
import { RetentionDays } from "aws-cdk-lib/aws-logs";
|
|
9
|
+
import { ITableV2 } from "aws-cdk-lib/aws-dynamodb";
|
|
9
10
|
|
|
10
|
-
export const createAuthorizer = (scope: Construct, config: AppConfig, layers?: LayerVersion[]
|
|
11
|
+
export const createAuthorizer = (scope: Construct, config: AppConfig, layers?: LayerVersion[],
|
|
12
|
+
tables?: ITableV2[]) => {
|
|
11
13
|
|
|
12
|
-
const lambda = createLambdaForAuthorizer(scope, config);
|
|
14
|
+
const lambda = createLambdaForAuthorizer(scope, config, layers, tables);
|
|
13
15
|
|
|
14
16
|
const lambdaAuthroizer = new RequestAuthorizer(
|
|
15
17
|
scope,
|
|
@@ -25,7 +27,7 @@ export const createAuthorizer = (scope: Construct, config: AppConfig, layers?: L
|
|
|
25
27
|
return lambdaAuthroizer;
|
|
26
28
|
};
|
|
27
29
|
|
|
28
|
-
const createLambdaForAuthorizer = (scope: Construct, config: AppConfig, layers?: LayerVersion[]) => {
|
|
30
|
+
const createLambdaForAuthorizer = (scope: Construct, config: AppConfig, layers?: LayerVersion[], tables?: ITableV2[]) => {
|
|
29
31
|
|
|
30
32
|
const props = createLambdaProps(config, layers);
|
|
31
33
|
|
|
@@ -35,6 +37,12 @@ const createLambdaForAuthorizer = (scope: Construct, config: AppConfig, layers?:
|
|
|
35
37
|
props
|
|
36
38
|
);
|
|
37
39
|
|
|
40
|
+
if (tables && tables.length > 0) {
|
|
41
|
+
tables.forEach((table) => {
|
|
42
|
+
table.grantReadData(lambda);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
|
|
38
46
|
return lambda;
|
|
39
47
|
};
|
|
40
48
|
|