@lambada/utils 1.4.5 → 1.5.0
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/dist/data/repositoryExtended.js +92 -85
- package/dist/data/repositoryExtended.js.map +1 -1
- package/dist/repository.js +73 -90
- package/dist/repository.js.map +1 -1
- package/dist/repository.test.js +2 -11
- package/dist/repository.test.js.map +1 -1
- package/dist/request.d.ts +3 -0
- package/dist/request.js +90 -104
- package/dist/request.js.map +1 -1
- package/dist/secretManager.js +25 -32
- package/dist/secretManager.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.RepositoryExtended = void 0;
|
|
13
4
|
const repository_1 = require("../repository");
|
|
@@ -20,26 +11,30 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
20
11
|
* @param params
|
|
21
12
|
* @returns
|
|
22
13
|
*/
|
|
23
|
-
queryBegins_with(params) {
|
|
14
|
+
async queryBegins_with(params) {
|
|
24
15
|
var _a;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
16
|
+
const { primaryKey, rangeKey, indexName } = params;
|
|
17
|
+
const command = {
|
|
18
|
+
TableName: this.tableName,
|
|
19
|
+
IndexName: indexName,
|
|
20
|
+
KeyConditionExpression: `#PK = :PK ${rangeKey ? 'AND begins_with(#SK,:SK)' : ''}`,
|
|
21
|
+
ExpressionAttributeNames: {
|
|
22
|
+
'#PK': primaryKey.name,
|
|
23
|
+
...(rangeKey ? { '#SK': rangeKey.name } : {}),
|
|
24
|
+
},
|
|
25
|
+
ExpressionAttributeValues: {
|
|
26
|
+
':PK': this.marshaller.marshallValue(primaryKey.value),
|
|
27
|
+
...(rangeKey ? { ':SK': this.marshaller.marshallValue(rangeKey.value) } : {}),
|
|
28
|
+
},
|
|
29
|
+
Limit: params.limit,
|
|
30
|
+
ScanIndexForward: params.scanForward,
|
|
31
|
+
ExclusiveStartKey: params.lastKey ? JSON.parse(params.lastKey) : undefined,
|
|
32
|
+
};
|
|
33
|
+
const response = await this.getDb().query(command).promise();
|
|
34
|
+
return {
|
|
35
|
+
data: ((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.marshaller.unmarshallItem(item)),
|
|
36
|
+
lastKey: response.LastEvaluatedKey && JSON.stringify(response.LastEvaluatedKey)
|
|
37
|
+
};
|
|
43
38
|
}
|
|
44
39
|
/**
|
|
45
40
|
* Execute a query with conditional range key.
|
|
@@ -47,85 +42,97 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
47
42
|
* @param params
|
|
48
43
|
* @returns
|
|
49
44
|
*/
|
|
50
|
-
queryCondition(params) {
|
|
45
|
+
async queryCondition(params) {
|
|
51
46
|
var _a;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
47
|
+
const { primaryKey, rangeKey, indexName } = params;
|
|
48
|
+
const skCondition = {
|
|
49
|
+
EQ: 'AND #SK = :SK',
|
|
50
|
+
GT: 'AND #SK > :SK',
|
|
51
|
+
LT: 'AND #SK < :SK',
|
|
52
|
+
GE: 'AND #SK >= :SK',
|
|
53
|
+
LE: 'AND #SK <= :SK',
|
|
54
|
+
BEGINS_WITH: 'AND begins_with(#SK, :SK)',
|
|
55
|
+
BETWEEN: 'AND #SK between :SKfrom and :SKto'
|
|
56
|
+
};
|
|
57
|
+
const command = {
|
|
58
|
+
TableName: this.tableName,
|
|
59
|
+
IndexName: indexName,
|
|
60
|
+
KeyConditionExpression: `#PK = :PK ${rangeKey ? skCondition[rangeKey.condition] : ''}`,
|
|
61
|
+
ExpressionAttributeNames: {
|
|
62
|
+
'#PK': primaryKey.name,
|
|
63
|
+
...(rangeKey ? { '#SK': rangeKey.name } : {}),
|
|
64
|
+
},
|
|
65
|
+
ExpressionAttributeValues: {
|
|
66
|
+
':PK': this.marshaller.marshallValue(primaryKey.value),
|
|
67
|
+
...(rangeKey ?
|
|
69
68
|
typeof rangeKey.value === 'object' ?
|
|
70
69
|
{
|
|
71
70
|
':SKfrom': this.marshaller.marshallValue(rangeKey.value.from),
|
|
72
71
|
':SKto': this.marshaller.marshallValue(rangeKey.value.to),
|
|
73
72
|
}
|
|
74
73
|
: { ':SK': this.marshaller.marshallValue(rangeKey.value) }
|
|
75
|
-
: {})
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
74
|
+
: {}),
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
const response = await this.getDb().query(command).promise();
|
|
78
|
+
return ((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.fromItem(item));
|
|
80
79
|
}
|
|
81
80
|
/**
|
|
82
81
|
* Requires `updateItem` permission
|
|
83
82
|
* @param params update params
|
|
84
83
|
* @returns all updated items
|
|
85
84
|
*/
|
|
86
|
-
updateItem(params) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
85
|
+
async updateItem(params) {
|
|
86
|
+
const { primaryKey, rangeKey, update } = params;
|
|
87
|
+
const attributes = Object.entries(update);
|
|
88
|
+
const command = {
|
|
89
|
+
TableName: this.tableName,
|
|
90
|
+
Key: this.marshaller.marshallItem({
|
|
91
|
+
[primaryKey.name]: primaryKey.value,
|
|
92
|
+
...(rangeKey ? { [rangeKey.name]: rangeKey.value } : {}),
|
|
93
|
+
}),
|
|
94
|
+
ConditionExpression: `#PK = :PK ${rangeKey ? `AND #SK = :SK` : ''}`,
|
|
95
|
+
UpdateExpression: `set ${attributes.map(([k]) => `#${k} = :${k}`).join(', ')}`,
|
|
96
|
+
ExpressionAttributeNames: {
|
|
97
|
+
'#PK': primaryKey.name,
|
|
98
|
+
...(rangeKey ? { '#SK': rangeKey.name } : {}),
|
|
99
|
+
},
|
|
100
|
+
ExpressionAttributeValues: {
|
|
101
|
+
':PK': this.marshaller.marshallValue(primaryKey.value),
|
|
102
|
+
...(rangeKey
|
|
97
103
|
? { ':SK': this.marshaller.marshallValue(rangeKey.value) }
|
|
98
|
-
: {})
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
});
|
|
105
|
-
const response = yield this.getDb().updateItem(command).promise();
|
|
106
|
-
if (!response.Attributes)
|
|
107
|
-
throw new Error('Failed to update item');
|
|
108
|
-
return this.marshaller.unmarshallItem(response.Attributes);
|
|
104
|
+
: {}),
|
|
105
|
+
},
|
|
106
|
+
ReturnValues: 'ALL_NEW',
|
|
107
|
+
};
|
|
108
|
+
attributes.forEach(([name, value]) => {
|
|
109
|
+
command.ExpressionAttributeNames[`#${name}`] = name;
|
|
110
|
+
command.ExpressionAttributeValues[`:${name}`] = this.marshaller.marshallValue(value);
|
|
109
111
|
});
|
|
112
|
+
const response = await this.getDb().updateItem(command).promise();
|
|
113
|
+
if (!response.Attributes)
|
|
114
|
+
throw new Error('Failed to update item');
|
|
115
|
+
return this.marshaller.unmarshallItem(response.Attributes);
|
|
110
116
|
}
|
|
111
117
|
/**
|
|
112
118
|
* Reads all items of the table
|
|
113
119
|
* @param params
|
|
114
120
|
* @returns
|
|
115
121
|
*/
|
|
116
|
-
fullScan(params) {
|
|
122
|
+
async fullScan(params) {
|
|
117
123
|
var _a;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
});
|
|
124
|
+
let lastEvaluatedKey = params.ExclusiveStartKey;
|
|
125
|
+
let items = [];
|
|
126
|
+
do {
|
|
127
|
+
const command = {
|
|
128
|
+
...params,
|
|
129
|
+
ExclusiveStartKey: lastEvaluatedKey,
|
|
130
|
+
};
|
|
131
|
+
const response = await this.getDb().scan(command).promise();
|
|
132
|
+
lastEvaluatedKey = response.LastEvaluatedKey;
|
|
133
|
+
items = items.concat(((_a = response.Items) !== null && _a !== void 0 ? _a : []).map(item => this.fromItem(item)));
|
|
134
|
+
} while (lastEvaluatedKey);
|
|
135
|
+
return items;
|
|
129
136
|
}
|
|
130
137
|
fromItem(item) {
|
|
131
138
|
return this.marshaller.unmarshallItem(item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":"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"}
|
package/dist/repository.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.RepositoryBase = exports.DefaultMarshaller = void 0;
|
|
13
4
|
const AWS = require("aws-sdk");
|
|
@@ -40,91 +31,83 @@ class RepositoryBase {
|
|
|
40
31
|
throw new Error(`Could not find env var: ${this.table.envKeyName}`);
|
|
41
32
|
return new AWS.DynamoDB(this.clientConfig);
|
|
42
33
|
}
|
|
43
|
-
scan(args) {
|
|
34
|
+
async scan(args) {
|
|
44
35
|
var _a;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
return (_a = result.Items) === null || _a === void 0 ? void 0 : _a.map((x) => this.marshaller.unmarshallItem(x));
|
|
56
|
-
});
|
|
36
|
+
const db = this.getDb();
|
|
37
|
+
const result = await db.scan({
|
|
38
|
+
TableName: this.tableName,
|
|
39
|
+
FilterExpression: args === null || args === void 0 ? void 0 : args.filter,
|
|
40
|
+
ExpressionAttributeValues: args === null || args === void 0 ? void 0 : args.filterValues,
|
|
41
|
+
}).promise();
|
|
42
|
+
if (!result.Items) {
|
|
43
|
+
return [];
|
|
44
|
+
}
|
|
45
|
+
return (_a = result.Items) === null || _a === void 0 ? void 0 : _a.map((x) => this.marshaller.unmarshallItem(x));
|
|
57
46
|
}
|
|
58
|
-
upsert(item) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
return item;
|
|
69
|
-
});
|
|
47
|
+
async upsert(item) {
|
|
48
|
+
const db = this.getDb();
|
|
49
|
+
const marsharlledItem = this.marshaller.marshallItem(item);
|
|
50
|
+
const command = {
|
|
51
|
+
Item: marsharlledItem,
|
|
52
|
+
TableName: this.tableName,
|
|
53
|
+
ReturnValues: 'NONE'
|
|
54
|
+
};
|
|
55
|
+
await db.putItem(command).promise();
|
|
56
|
+
return item;
|
|
70
57
|
}
|
|
71
|
-
query(primaryKey, rangeKey, indexName) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
return items.map(item => this.marshaller.unmarshallItem(item));
|
|
102
|
-
});
|
|
58
|
+
async query(primaryKey, rangeKey, indexName) {
|
|
59
|
+
if (typeof rangeKey === 'string') {
|
|
60
|
+
indexName = rangeKey;
|
|
61
|
+
rangeKey = undefined;
|
|
62
|
+
}
|
|
63
|
+
const db = this.getDb();
|
|
64
|
+
const value = this.marshaller.marshallValue(primaryKey.value);
|
|
65
|
+
if (!value)
|
|
66
|
+
throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
|
|
67
|
+
let params = {
|
|
68
|
+
TableName: this.tableName,
|
|
69
|
+
KeyConditionExpression: "#primaryKey = :primaryKeyValue",
|
|
70
|
+
ExpressionAttributeNames: {
|
|
71
|
+
"#primaryKey": primaryKey.name
|
|
72
|
+
},
|
|
73
|
+
ExpressionAttributeValues: {
|
|
74
|
+
":primaryKeyValue": value
|
|
75
|
+
},
|
|
76
|
+
IndexName: indexName
|
|
77
|
+
};
|
|
78
|
+
if ((rangeKey === null || rangeKey === void 0 ? void 0 : rangeKey.name) && (rangeKey === null || rangeKey === void 0 ? void 0 : rangeKey.value) && params.ExpressionAttributeNames && params.ExpressionAttributeValues) {
|
|
79
|
+
params.KeyConditionExpression += " AND #rangeKey = :rangeKeyValue";
|
|
80
|
+
params.ExpressionAttributeNames["#rangeKey"] = rangeKey.name;
|
|
81
|
+
params.ExpressionAttributeValues[":rangeKeyValue"] = this.marshaller.marshallValue(rangeKey.value);
|
|
82
|
+
}
|
|
83
|
+
const result = await db.query(params).promise();
|
|
84
|
+
const items = result.Items;
|
|
85
|
+
if (!items)
|
|
86
|
+
return [];
|
|
87
|
+
return items.map(item => this.marshaller.unmarshallItem(item));
|
|
103
88
|
}
|
|
104
|
-
getById(primaryKey, rangeKey) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
return this.marshaller.unmarshallItem(item.Item);
|
|
127
|
-
});
|
|
89
|
+
async getById(primaryKey, rangeKey) {
|
|
90
|
+
const db = this.getDb();
|
|
91
|
+
let value = this.marshaller.marshallValue(primaryKey.value);
|
|
92
|
+
if (!value)
|
|
93
|
+
throw new Error(`Invalid primary key. ${JSON.stringify(primaryKey)}`);
|
|
94
|
+
const key = {
|
|
95
|
+
[primaryKey.name]: value
|
|
96
|
+
};
|
|
97
|
+
if (rangeKey) {
|
|
98
|
+
const range = this.marshaller.marshallValue(rangeKey.value);
|
|
99
|
+
if (!range)
|
|
100
|
+
throw new Error(`Invalid range key. ${JSON.stringify(primaryKey)}`);
|
|
101
|
+
key[rangeKey.name] = range;
|
|
102
|
+
}
|
|
103
|
+
const item = await db.getItem({
|
|
104
|
+
TableName: this.tableName,
|
|
105
|
+
Key: key,
|
|
106
|
+
ConsistentRead: true,
|
|
107
|
+
}).promise();
|
|
108
|
+
if (!item.Item)
|
|
109
|
+
return null;
|
|
110
|
+
return this.marshaller.unmarshallItem(item.Item);
|
|
128
111
|
}
|
|
129
112
|
}
|
|
130
113
|
exports.RepositoryBase = RepositoryBase;
|
package/dist/repository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../src/repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../src/repository.ts"],"names":[],"mappings":"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"}
|
package/dist/repository.test.js
CHANGED
|
@@ -1,17 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
const repository_1 = require("./repository");
|
|
13
4
|
describe("Repository", () => {
|
|
14
|
-
test("Marshaller", () =>
|
|
5
|
+
test("Marshaller", async () => {
|
|
15
6
|
// const repo = new TestRepo({
|
|
16
7
|
// envKeyName: "TEST_NAME",
|
|
17
8
|
// name: 'test',
|
|
@@ -33,7 +24,7 @@ describe("Repository", () => {
|
|
|
33
24
|
expect(unmarshalled.b).toBe(original.b);
|
|
34
25
|
expect(unmarshalled.c).toStrictEqual(original.c);
|
|
35
26
|
expect(unmarshalled.d).toStrictEqual(original.d);
|
|
36
|
-
})
|
|
27
|
+
});
|
|
37
28
|
});
|
|
38
29
|
class TestRepo extends repository_1.RepositoryBase {
|
|
39
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":";;AAAA,6CAA6E;AAE7E,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,8BAA8B;QAC9B,+BAA+B;QAC/B,oBAAoB;QACpB,4BAA4B;QAC5B,qBAAqB;QACrB,KAAK;QAEL,MAAM,UAAU,GAAgB,8BAAiB,CAAA;QACjD,MAAM,QAAQ,GAAG;YACb,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACZ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACrB,CAAA;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;QACrC,MAAM,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAEzC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,MAAM,QAAS,SAAQ,2BAAc;CAEpC"}
|
package/dist/request.d.ts
CHANGED
package/dist/request.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getContext = exports.getUser = exports.getUserById = exports.getBody = exports.tryGetBody = void 0;
|
|
13
4
|
const AWS = require("aws-sdk");
|
|
@@ -31,114 +22,108 @@ function getBody(request) {
|
|
|
31
22
|
return body;
|
|
32
23
|
}
|
|
33
24
|
exports.getBody = getBody;
|
|
34
|
-
function _FindUser(userPoolId, userId, username) {
|
|
25
|
+
async function _FindUser(userPoolId, userId, username) {
|
|
35
26
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
27
|
+
//@ts-ignore
|
|
28
|
+
global.globalCognitoIdp = (_a = global.globalCognitoIdp) !== null && _a !== void 0 ? _a : new AWS.CognitoIdentityServiceProvider({ apiVersion: '2016-04-18' });
|
|
29
|
+
//@ts-ignore
|
|
30
|
+
global.globalUserCacheBySub = (_b = global.globalUserCacheBySub) !== null && _b !== void 0 ? _b : new Map();
|
|
31
|
+
//@ts-ignore
|
|
32
|
+
global.globalUserCacheByUsername = (_c = global.globalUserCacheByUsername) !== null && _c !== void 0 ? _c : new Map();
|
|
33
|
+
//@ts-ignore
|
|
34
|
+
const cognitoIdp = global.globalCognitoIdp;
|
|
35
|
+
//@ts-ignore
|
|
36
|
+
const userCacheBySub = global.globalUserCacheBySub;
|
|
37
|
+
//@ts-ignore
|
|
38
|
+
const userCacheByUsername = global.globalUserCacheByUsername;
|
|
39
|
+
const a = Date.now();
|
|
40
|
+
if (!userPoolId)
|
|
41
|
+
throw 'Invalid userPoolId';
|
|
42
|
+
let user;
|
|
43
|
+
if (username)
|
|
44
|
+
user = userCacheByUsername.get(username);
|
|
45
|
+
if (userId)
|
|
46
|
+
user = userCacheBySub.get(userId);
|
|
47
|
+
if (!user) {
|
|
48
|
+
console.log('user not in cache');
|
|
49
|
+
if (username) {
|
|
50
|
+
console.log('getting user by username', username);
|
|
51
|
+
const cu = await cognitoIdp.adminGetUser({
|
|
52
|
+
UserPoolId: userPoolId,
|
|
53
|
+
Username: username
|
|
54
|
+
}).promise();
|
|
55
|
+
if (!cu)
|
|
56
|
+
throw 'User not found';
|
|
57
|
+
if (!cu.UserAttributes)
|
|
58
|
+
throw 'User has no attributes';
|
|
59
|
+
//TODO Pass environment
|
|
60
|
+
var cutomAttributes = cu.UserAttributes.filter(x => x.Name.startsWith('dev:custom:'));
|
|
61
|
+
userId = (_d = cu.UserAttributes.find(x => x.Name == 'sub')) === null || _d === void 0 ? void 0 : _d.Value;
|
|
62
|
+
var email = (_e = cu.UserAttributes.find(x => x.Name == 'email')) === null || _e === void 0 ? void 0 : _e.Value;
|
|
63
|
+
var name = (_f = cu.UserAttributes.find(x => x.Name == 'name')) === null || _f === void 0 ? void 0 : _f.Value;
|
|
64
|
+
if (!userId)
|
|
65
|
+
throw 'Invalid user, has no sub';
|
|
66
|
+
user = {
|
|
67
|
+
id: userId,
|
|
68
|
+
username,
|
|
69
|
+
name,
|
|
70
|
+
email: email !== null && email !== void 0 ? email : '',
|
|
71
|
+
attributes: cutomAttributes
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
else if (userId) {
|
|
75
|
+
console.log('getting user by userId', userId);
|
|
76
|
+
const cusers = await cognitoIdp.listUsers({
|
|
77
|
+
UserPoolId: userPoolId,
|
|
78
|
+
Filter: `sub = "${userId}"`
|
|
79
|
+
}).promise();
|
|
80
|
+
if (cusers && cusers.Users && cusers.Users.length > 0) {
|
|
81
|
+
const cu = cusers.Users[0];
|
|
65
82
|
if (!cu)
|
|
66
83
|
throw 'User not found';
|
|
67
|
-
if (!cu.
|
|
84
|
+
if (!cu.Attributes)
|
|
68
85
|
throw 'User has no attributes';
|
|
69
|
-
|
|
70
|
-
var cutomAttributes = cu.
|
|
71
|
-
|
|
72
|
-
var
|
|
73
|
-
var
|
|
74
|
-
if (!
|
|
86
|
+
username = cu.Username;
|
|
87
|
+
var cutomAttributes = cu.Attributes.filter(x => x.Name.startsWith('dev:custom:'));
|
|
88
|
+
var sub = (_g = cu.Attributes.find(x => x.Name == 'sub')) === null || _g === void 0 ? void 0 : _g.Value;
|
|
89
|
+
var name = (_h = cu.Attributes.find(x => x.Name == 'name')) === null || _h === void 0 ? void 0 : _h.Value;
|
|
90
|
+
var email = (_j = cu.Attributes.find(x => x.Name == 'email')) === null || _j === void 0 ? void 0 : _j.Value;
|
|
91
|
+
if (!sub)
|
|
75
92
|
throw 'Invalid user, has no sub';
|
|
93
|
+
if (!username)
|
|
94
|
+
throw 'username is empty';
|
|
76
95
|
user = {
|
|
77
|
-
id:
|
|
78
|
-
|
|
96
|
+
id: sub,
|
|
97
|
+
attributes: cutomAttributes,
|
|
79
98
|
name,
|
|
80
|
-
|
|
81
|
-
|
|
99
|
+
username,
|
|
100
|
+
email: email !== null && email !== void 0 ? email : ''
|
|
82
101
|
};
|
|
83
102
|
}
|
|
84
|
-
else if (userId) {
|
|
85
|
-
console.log('getting user by userId', userId);
|
|
86
|
-
const cusers = yield cognitoIdp.listUsers({
|
|
87
|
-
UserPoolId: userPoolId,
|
|
88
|
-
Filter: `sub = "${userId}"`
|
|
89
|
-
}).promise();
|
|
90
|
-
if (cusers && cusers.Users && cusers.Users.length > 0) {
|
|
91
|
-
const cu = cusers.Users[0];
|
|
92
|
-
if (!cu)
|
|
93
|
-
throw 'User not found';
|
|
94
|
-
if (!cu.Attributes)
|
|
95
|
-
throw 'User has no attributes';
|
|
96
|
-
username = cu.Username;
|
|
97
|
-
var cutomAttributes = cu.Attributes.filter(x => x.Name.startsWith('dev:custom:'));
|
|
98
|
-
var sub = (_g = cu.Attributes.find(x => x.Name == 'sub')) === null || _g === void 0 ? void 0 : _g.Value;
|
|
99
|
-
var name = (_h = cu.Attributes.find(x => x.Name == 'name')) === null || _h === void 0 ? void 0 : _h.Value;
|
|
100
|
-
var email = (_j = cu.Attributes.find(x => x.Name == 'email')) === null || _j === void 0 ? void 0 : _j.Value;
|
|
101
|
-
if (!sub)
|
|
102
|
-
throw 'Invalid user, has no sub';
|
|
103
|
-
if (!username)
|
|
104
|
-
throw 'username is empty';
|
|
105
|
-
user = {
|
|
106
|
-
id: sub,
|
|
107
|
-
attributes: cutomAttributes,
|
|
108
|
-
name,
|
|
109
|
-
username,
|
|
110
|
-
email: email !== null && email !== void 0 ? email : ''
|
|
111
|
-
};
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
if (!userId)
|
|
115
|
-
throw 'Invalid user, has no sub';
|
|
116
|
-
if (!username)
|
|
117
|
-
throw 'username is empty';
|
|
118
|
-
if (!user)
|
|
119
|
-
throw 'Could not find user';
|
|
120
|
-
userCacheBySub.set(userId, user);
|
|
121
|
-
userCacheByUsername.set(username, user);
|
|
122
103
|
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
104
|
+
if (!userId)
|
|
105
|
+
throw 'Invalid user, has no sub';
|
|
106
|
+
if (!username)
|
|
107
|
+
throw 'username is empty';
|
|
108
|
+
if (!user)
|
|
109
|
+
throw 'Could not find user';
|
|
110
|
+
userCacheBySub.set(userId, user);
|
|
111
|
+
userCacheByUsername.set(username, user);
|
|
112
|
+
}
|
|
113
|
+
var b = Date.now();
|
|
114
|
+
console.log('found user', user);
|
|
115
|
+
console.log('adminGetUser (ms): ', (b - a));
|
|
116
|
+
return user;
|
|
128
117
|
}
|
|
129
|
-
function getUserById(userId, poolId) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
return user;
|
|
133
|
-
});
|
|
118
|
+
async function getUserById(userId, poolId) {
|
|
119
|
+
const user = await _FindUser(poolId, userId);
|
|
120
|
+
return user;
|
|
134
121
|
}
|
|
135
122
|
exports.getUserById = getUserById;
|
|
136
|
-
function getUser(username, context) {
|
|
123
|
+
async function getUser(username, context) {
|
|
137
124
|
var _a;
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
return user;
|
|
141
|
-
});
|
|
125
|
+
const user = await _FindUser((_a = context.poolId) !== null && _a !== void 0 ? _a : '', undefined, username);
|
|
126
|
+
return user;
|
|
142
127
|
}
|
|
143
128
|
exports.getUser = getUser;
|
|
144
129
|
function getContext(request) {
|
|
@@ -161,7 +146,8 @@ function getContext(request) {
|
|
|
161
146
|
poolId: poolId !== null && poolId !== void 0 ? poolId : undefined,
|
|
162
147
|
email: email !== null && email !== void 0 ? email : undefined,
|
|
163
148
|
username: username,
|
|
164
|
-
clientIP: userIp
|
|
149
|
+
clientIP: userIp,
|
|
150
|
+
claims: claims
|
|
165
151
|
};
|
|
166
152
|
}
|
|
167
153
|
else {
|
package/dist/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"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"}
|
package/dist/secretManager.js
CHANGED
|
@@ -1,14 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// FROM https://github.com/c-bandy/aws-secrets-manager-cache
|
|
3
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
4
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
5
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
6
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
7
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
8
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
9
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
10
|
-
});
|
|
11
|
-
};
|
|
12
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
4
|
exports.SecretsManagerCache = exports.CachedSecret = void 0;
|
|
14
5
|
const aws_sdk_1 = require("aws-sdk");
|
|
@@ -27,38 +18,40 @@ exports.CachedSecret = CachedSecret;
|
|
|
27
18
|
class SecretsManagerCache {
|
|
28
19
|
constructor(options) {
|
|
29
20
|
this.cache = new Map();
|
|
30
|
-
this.config =
|
|
21
|
+
this.config = {
|
|
31
22
|
// set defaults
|
|
32
|
-
ttl: defaultTTL,
|
|
23
|
+
ttl: defaultTTL,
|
|
24
|
+
secretsManager: new aws_sdk_1.SecretsManager(),
|
|
25
|
+
// replace defaults with input options
|
|
26
|
+
...options,
|
|
27
|
+
};
|
|
33
28
|
}
|
|
34
29
|
/**
|
|
35
30
|
* Fetches a secret from SecretsManager and caches it as long as the given
|
|
36
31
|
* `ttl`.
|
|
37
32
|
*/
|
|
38
|
-
getSecret(secretName, isJSON = false) {
|
|
33
|
+
async getSecret(secretName, isJSON = false) {
|
|
39
34
|
var _a, _b;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
this.cache.set(secretName, new CachedSecret(getSecretValueResponse.SecretString, this.config.ttl));
|
|
49
|
-
}
|
|
35
|
+
const itemExistsInCache = this.cache.has(secretName);
|
|
36
|
+
const itemHasExpired = (_a = this.cache.get(secretName)) === null || _a === void 0 ? void 0 : _a.hasExpired();
|
|
37
|
+
if (!itemExistsInCache || itemHasExpired) {
|
|
38
|
+
const getSecretValueResponse = await this.config.secretsManager
|
|
39
|
+
.getSecretValue({ SecretId: secretName })
|
|
40
|
+
.promise();
|
|
41
|
+
if (getSecretValueResponse.SecretString) {
|
|
42
|
+
this.cache.set(secretName, new CachedSecret(getSecretValueResponse.SecretString, this.config.ttl));
|
|
50
43
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
catch (error) {
|
|
57
|
-
throw new Error('Attempted to parse non-JSON secret string as JSON.');
|
|
58
|
-
}
|
|
44
|
+
}
|
|
45
|
+
const secret = (_b = this.cache.get(secretName)) === null || _b === void 0 ? void 0 : _b.value;
|
|
46
|
+
if (isJSON) {
|
|
47
|
+
try {
|
|
48
|
+
return JSON.parse(secret);
|
|
59
49
|
}
|
|
60
|
-
|
|
61
|
-
|
|
50
|
+
catch (error) {
|
|
51
|
+
throw new Error('Attempted to parse non-JSON secret string as JSON.');
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return secret;
|
|
62
55
|
}
|
|
63
56
|
static get() {
|
|
64
57
|
return this._manager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretManager.js","sourceRoot":"","sources":["../src/secretManager.ts"],"names":[],"mappings":";AAAA,4DAA4D
|
|
1
|
+
{"version":3,"file":"secretManager.js","sourceRoot":"","sources":["../src/secretManager.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;AAE5D,qCAAyC;AAEzC,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY;AAEhD,MAAa,YAAY;IAKrB,YAAY,KAAa,EAAE,GAAW;QAClC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC;IACtC,CAAC;IAED,UAAU;QACN,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;CACJ;AAdD,oCAcC;AAcD,MAAa,mBAAmB;IAI5B,YAAY,OAAoC;QAFxC,UAAK,GAAG,IAAI,GAAG,EAAwB,CAAA;QAG3C,IAAI,CAAC,MAAM,GAAG;YACV,eAAe;YACf,GAAG,EAAE,UAAU;YACf,cAAc,EAAE,IAAI,wBAAc,EAAE;YACpC,sCAAsC;YACtC,GAAG,OAAO;SACb,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,SAAS,CAAC,UAAkB,EAAE,MAAM,GAAG,KAAK;;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,UAAU,EAAE,CAAC;QAEhE,IAAI,CAAC,iBAAiB,IAAI,cAAc,EAAE;YACtC,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc;iBAC1D,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;iBACxC,OAAO,EAAE,CAAC;YAEf,IAAI,sBAAsB,CAAC,YAAY,EAAE;gBACrC,IAAI,CAAC,KAAK,CAAC,GAAG,CACV,UAAU,EACV,IAAI,YAAY,CACZ,sBAAsB,CAAC,YAAY,EACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAClB,CACJ,CAAC;aACL;SACJ;QAED,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,KAAK,CAAC;QAEjD,IAAI,MAAM,EAAE;YACR,IAAI;gBACA,OAAO,IAAI,CAAC,KAAK,CAAC,MAAa,CAAC,CAAC;aACpC;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;aACxE;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAGM,MAAM,CAAC,GAAG;QACb,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;;AAtDL,kDAuDC;AAJkB,4BAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lambada/utils",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"aws-sdk": "~2.1009.0"
|
|
34
34
|
},
|
|
35
35
|
"description": "",
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "0e153fb89b716a81bce3f01b54d98d2492ba0f44"
|
|
37
37
|
}
|