@lambada/utils 1.5.0 → 1.5.2
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/cors.js +4 -4
- package/dist/cors.js.map +1 -1
- package/dist/data/repositoryExtended.js +3 -6
- package/dist/data/repositoryExtended.js.map +1 -1
- package/dist/dynamoMarsharler.d.ts +10 -0
- package/dist/dynamoMarsharler.js +11 -0
- package/dist/dynamoMarsharler.js.map +1 -0
- package/dist/repository.d.ts +1 -10
- package/dist/repository.js +8 -15
- package/dist/repository.js.map +1 -1
- package/dist/repository.test.js +2 -1
- package/dist/repository.test.js.map +1 -1
- package/dist/request.d.ts +4 -0
- package/dist/request.js +30 -20
- package/dist/request.js.map +1 -1
- package/dist/secretManager.js +2 -3
- package/dist/secretManager.js.map +1 -1
- package/package.json +2 -2
package/dist/cors.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getCorsHeaders = void 0;
|
|
4
4
|
const getCorsHeaders = (domainName, origins) => {
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
const requestOrigin = (domainName !== null && domainName !== void 0 ? domainName : '').trim();
|
|
5
|
+
const allowedOrigins = origins?.map(x => x.trim()) ?? ["*"];
|
|
6
|
+
const requestOrigin = (domainName ?? '').trim();
|
|
8
7
|
const origin = allowedOrigins.indexOf("*") >= 0 ? "*" :
|
|
9
|
-
|
|
8
|
+
allowedOrigins.find(x => x == requestOrigin) ??
|
|
9
|
+
(allowedOrigins.shift() ?? "*");
|
|
10
10
|
return {
|
|
11
11
|
"Access-Control-Allow-Headers": "*",
|
|
12
12
|
"Access-Control-Allow-Origin": origin,
|
package/dist/cors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":";;;AAAO,MAAM,cAAc,GAAG,CAAC,UAAmB,EAAE,OAAkB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":";;;AAAO,MAAM,cAAc,GAAG,CAAC,UAAmB,EAAE,OAAkB,EAAE,EAAE;IACtE,MAAM,cAAc,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAE/C,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,aAAa,CAAC;YAC5C,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAA;IAEnC,OAAO;QACH,8BAA8B,EAAE,GAAG;QACnC,6BAA6B,EAAE,MAAM;QACrC,8BAA8B,EAAE,GAAG;QACnC,wBAAwB,EAAE,OAAO;KACpC,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B"}
|
|
@@ -12,7 +12,6 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
12
12
|
* @returns
|
|
13
13
|
*/
|
|
14
14
|
async queryBegins_with(params) {
|
|
15
|
-
var _a;
|
|
16
15
|
const { primaryKey, rangeKey, indexName } = params;
|
|
17
16
|
const command = {
|
|
18
17
|
TableName: this.tableName,
|
|
@@ -32,7 +31,7 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
32
31
|
};
|
|
33
32
|
const response = await this.getDb().query(command).promise();
|
|
34
33
|
return {
|
|
35
|
-
data: (
|
|
34
|
+
data: (response.Items ?? []).map(item => this.marshaller.unmarshallItem(item)),
|
|
36
35
|
lastKey: response.LastEvaluatedKey && JSON.stringify(response.LastEvaluatedKey)
|
|
37
36
|
};
|
|
38
37
|
}
|
|
@@ -43,7 +42,6 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
43
42
|
* @returns
|
|
44
43
|
*/
|
|
45
44
|
async queryCondition(params) {
|
|
46
|
-
var _a;
|
|
47
45
|
const { primaryKey, rangeKey, indexName } = params;
|
|
48
46
|
const skCondition = {
|
|
49
47
|
EQ: 'AND #SK = :SK',
|
|
@@ -75,7 +73,7 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
75
73
|
},
|
|
76
74
|
};
|
|
77
75
|
const response = await this.getDb().query(command).promise();
|
|
78
|
-
return (
|
|
76
|
+
return (response.Items ?? []).map(item => this.fromItem(item));
|
|
79
77
|
}
|
|
80
78
|
/**
|
|
81
79
|
* Requires `updateItem` permission
|
|
@@ -120,7 +118,6 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
120
118
|
* @returns
|
|
121
119
|
*/
|
|
122
120
|
async fullScan(params) {
|
|
123
|
-
var _a;
|
|
124
121
|
let lastEvaluatedKey = params.ExclusiveStartKey;
|
|
125
122
|
let items = [];
|
|
126
123
|
do {
|
|
@@ -130,7 +127,7 @@ class RepositoryExtended extends repository_1.RepositoryBase {
|
|
|
130
127
|
};
|
|
131
128
|
const response = await this.getDb().scan(command).promise();
|
|
132
129
|
lastEvaluatedKey = response.LastEvaluatedKey;
|
|
133
|
-
items = items.concat((
|
|
130
|
+
items = items.concat((response.Items ?? []).map(item => this.fromItem(item)));
|
|
134
131
|
} while (lastEvaluatedKey);
|
|
135
132
|
return items;
|
|
136
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"repositoryExtended.js","sourceRoot":"","sources":["../../src/data/repositoryExtended.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { AttributeValue, AttributeMap } from 'aws-sdk/clients/dynamodb';
|
|
2
|
+
export interface IMarshaller {
|
|
3
|
+
marshallItem(item: {
|
|
4
|
+
[key: string]: any;
|
|
5
|
+
}): AttributeMap;
|
|
6
|
+
marshallValue(value: any): AttributeValue | undefined;
|
|
7
|
+
unmarshallItem(item: AttributeMap): any;
|
|
8
|
+
unmarshallValue(item: AttributeValue): any;
|
|
9
|
+
}
|
|
10
|
+
export declare const DefaultMarshaller: IMarshaller;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DefaultMarshaller = void 0;
|
|
4
|
+
const AWS = require("aws-sdk");
|
|
5
|
+
exports.DefaultMarshaller = {
|
|
6
|
+
marshallItem: AWS.DynamoDB.Converter.marshall,
|
|
7
|
+
unmarshallItem: AWS.DynamoDB.Converter.unmarshall,
|
|
8
|
+
marshallValue: AWS.DynamoDB.Converter.input,
|
|
9
|
+
unmarshallValue: AWS.DynamoDB.Converter.output,
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=dynamoMarsharler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamoMarsharler.js","sourceRoot":"","sources":["../src/dynamoMarsharler.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAclB,QAAA,iBAAiB,GAAgB;IAC1C,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ;IAC7C,cAAc,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU;IACjD,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK;IAC3C,eAAe,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM;CACjD,CAAC"}
|
package/dist/repository.d.ts
CHANGED
|
@@ -1,15 +1,6 @@
|
|
|
1
1
|
import * as AWS from "aws-sdk";
|
|
2
|
-
import { AttributeValue, AttributeMap } from 'aws-sdk/clients/dynamodb';
|
|
3
2
|
import { ConditionExpression, ExpressionAttributeValueMap } from "aws-sdk/clients/dynamodb";
|
|
4
|
-
|
|
5
|
-
marshallItem(item: {
|
|
6
|
-
[key: string]: any;
|
|
7
|
-
}): AttributeMap;
|
|
8
|
-
marshallValue(value: any): AttributeValue | undefined;
|
|
9
|
-
unmarshallItem(item: AttributeMap): any;
|
|
10
|
-
unmarshallValue(item: AttributeValue): any;
|
|
11
|
-
}
|
|
12
|
-
export declare const DefaultMarshaller: IMarshaller;
|
|
3
|
+
import { IMarshaller } from "./dynamoMarsharler";
|
|
13
4
|
export declare class RepositoryBase {
|
|
14
5
|
protected readonly table: {
|
|
15
6
|
envKeyName: string;
|
package/dist/repository.js
CHANGED
|
@@ -1,23 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RepositoryBase =
|
|
3
|
+
exports.RepositoryBase = void 0;
|
|
4
4
|
const AWS = require("aws-sdk");
|
|
5
|
-
|
|
6
|
-
marshallItem: AWS.DynamoDB.Converter.marshall,
|
|
7
|
-
unmarshallItem: AWS.DynamoDB.Converter.unmarshall,
|
|
8
|
-
marshallValue: AWS.DynamoDB.Converter.input,
|
|
9
|
-
unmarshallValue: AWS.DynamoDB.Converter.output,
|
|
10
|
-
};
|
|
5
|
+
const dynamoMarsharler_1 = require("./dynamoMarsharler");
|
|
11
6
|
class RepositoryBase {
|
|
12
7
|
constructor(table, customMarshaller, clientConfig) {
|
|
13
|
-
var _a;
|
|
14
8
|
this.table = table;
|
|
15
|
-
this.tableName =
|
|
9
|
+
this.tableName = process.env[table.envKeyName] ?? '';
|
|
16
10
|
if (customMarshaller) {
|
|
17
11
|
this.marshaller = customMarshaller;
|
|
18
12
|
}
|
|
19
13
|
else {
|
|
20
|
-
this.marshaller =
|
|
14
|
+
this.marshaller = dynamoMarsharler_1.DefaultMarshaller;
|
|
21
15
|
}
|
|
22
16
|
this.clientConfig = clientConfig;
|
|
23
17
|
}
|
|
@@ -32,17 +26,16 @@ class RepositoryBase {
|
|
|
32
26
|
return new AWS.DynamoDB(this.clientConfig);
|
|
33
27
|
}
|
|
34
28
|
async scan(args) {
|
|
35
|
-
var _a;
|
|
36
29
|
const db = this.getDb();
|
|
37
30
|
const result = await db.scan({
|
|
38
31
|
TableName: this.tableName,
|
|
39
|
-
FilterExpression: args
|
|
40
|
-
ExpressionAttributeValues: args
|
|
32
|
+
FilterExpression: args?.filter,
|
|
33
|
+
ExpressionAttributeValues: args?.filterValues,
|
|
41
34
|
}).promise();
|
|
42
35
|
if (!result.Items) {
|
|
43
36
|
return [];
|
|
44
37
|
}
|
|
45
|
-
return
|
|
38
|
+
return result.Items?.map((x) => this.marshaller.unmarshallItem(x));
|
|
46
39
|
}
|
|
47
40
|
async upsert(item) {
|
|
48
41
|
const db = this.getDb();
|
|
@@ -75,7 +68,7 @@ class RepositoryBase {
|
|
|
75
68
|
},
|
|
76
69
|
IndexName: indexName
|
|
77
70
|
};
|
|
78
|
-
if (
|
|
71
|
+
if (rangeKey?.name && rangeKey?.value && params.ExpressionAttributeNames && params.ExpressionAttributeValues) {
|
|
79
72
|
params.KeyConditionExpression += " AND #rangeKey = :rangeKeyValue";
|
|
80
73
|
params.ExpressionAttributeNames["#rangeKey"] = rangeKey.name;
|
|
81
74
|
params.ExpressionAttributeValues[":rangeKeyValue"] = this.marshaller.marshallValue(rangeKey.value);
|
package/dist/repository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../src/repository.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../src/repository.ts"],"names":[],"mappings":"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"}
|
package/dist/repository.test.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const repository_1 = require("./repository");
|
|
4
|
+
const dynamoMarsharler_1 = require("./dynamoMarsharler");
|
|
4
5
|
describe("Repository", () => {
|
|
5
6
|
test("Marshaller", async () => {
|
|
6
7
|
// const repo = new TestRepo({
|
|
@@ -9,7 +10,7 @@ describe("Repository", () => {
|
|
|
9
10
|
// primaryKey: 'userId',
|
|
10
11
|
// rangeKey: 'id'
|
|
11
12
|
// })
|
|
12
|
-
const marshaller =
|
|
13
|
+
const marshaller = dynamoMarsharler_1.DefaultMarshaller;
|
|
13
14
|
const original = {
|
|
14
15
|
a: 1,
|
|
15
16
|
b: 'b',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"repository.test.js","sourceRoot":"","sources":["../src/repository.test.ts"],"names":[],"mappings":";;AAAA,6CAA6C;AAC7C,yDAAmE;AAEnE,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,oCAAiB,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
|
@@ -3,6 +3,10 @@ import { AttributeListType } from 'aws-sdk/clients/cognitoidentityserviceprovide
|
|
|
3
3
|
export declare type Request = awslambda.APIGatewayProxyEvent;
|
|
4
4
|
export declare function tryGetBody<TBody>(request: Request): TBody | undefined;
|
|
5
5
|
export declare function getBody<TBody>(request: Request): TBody;
|
|
6
|
+
export declare function isUserInGroup(user: {
|
|
7
|
+
username?: string;
|
|
8
|
+
poolId?: string;
|
|
9
|
+
}, groupName: string): Promise<boolean>;
|
|
6
10
|
declare type AuthenticatedUser = {
|
|
7
11
|
id: string;
|
|
8
12
|
attributes: AttributeListType;
|
package/dist/request.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getContext = exports.getUser = exports.getUserById = exports.getBody = exports.tryGetBody = void 0;
|
|
3
|
+
exports.getContext = exports.getUser = exports.getUserById = exports.isUserInGroup = exports.getBody = exports.tryGetBody = void 0;
|
|
4
4
|
const AWS = require("aws-sdk");
|
|
5
5
|
const error_1 = require("./error");
|
|
6
6
|
function tryGetBody(request) {
|
|
@@ -22,14 +22,26 @@ function getBody(request) {
|
|
|
22
22
|
return body;
|
|
23
23
|
}
|
|
24
24
|
exports.getBody = getBody;
|
|
25
|
+
async function isUserInGroup(user, groupName) {
|
|
26
|
+
if (!user.username)
|
|
27
|
+
throw new error_1.LambadaError('[isUserInGroup] username is mandatory');
|
|
28
|
+
if (!user.poolId)
|
|
29
|
+
throw new error_1.LambadaError('[isUserInGroup] poolId is mandatory');
|
|
30
|
+
const cognito = new AWS.CognitoIdentityServiceProvider({ apiVersion: '2016-04-18' });
|
|
31
|
+
const groups = await cognito.adminListGroupsForUser({
|
|
32
|
+
Username: user.username,
|
|
33
|
+
UserPoolId: user.poolId
|
|
34
|
+
}).promise();
|
|
35
|
+
return typeof groups.Groups?.find(x => x.GroupName == groupName) !== 'undefined';
|
|
36
|
+
}
|
|
37
|
+
exports.isUserInGroup = isUserInGroup;
|
|
25
38
|
async function _FindUser(userPoolId, userId, username) {
|
|
26
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
27
39
|
//@ts-ignore
|
|
28
|
-
global.globalCognitoIdp =
|
|
40
|
+
global.globalCognitoIdp = global.globalCognitoIdp ?? new AWS.CognitoIdentityServiceProvider({ apiVersion: '2016-04-18' });
|
|
29
41
|
//@ts-ignore
|
|
30
|
-
global.globalUserCacheBySub =
|
|
42
|
+
global.globalUserCacheBySub = global.globalUserCacheBySub ?? new Map();
|
|
31
43
|
//@ts-ignore
|
|
32
|
-
global.globalUserCacheByUsername =
|
|
44
|
+
global.globalUserCacheByUsername = global.globalUserCacheByUsername ?? new Map();
|
|
33
45
|
//@ts-ignore
|
|
34
46
|
const cognitoIdp = global.globalCognitoIdp;
|
|
35
47
|
//@ts-ignore
|
|
@@ -58,16 +70,16 @@ async function _FindUser(userPoolId, userId, username) {
|
|
|
58
70
|
throw 'User has no attributes';
|
|
59
71
|
//TODO Pass environment
|
|
60
72
|
var cutomAttributes = cu.UserAttributes.filter(x => x.Name.startsWith('dev:custom:'));
|
|
61
|
-
userId =
|
|
62
|
-
var email =
|
|
63
|
-
var name =
|
|
73
|
+
userId = cu.UserAttributes.find(x => x.Name == 'sub')?.Value;
|
|
74
|
+
var email = cu.UserAttributes.find(x => x.Name == 'email')?.Value;
|
|
75
|
+
var name = cu.UserAttributes.find(x => x.Name == 'name')?.Value;
|
|
64
76
|
if (!userId)
|
|
65
77
|
throw 'Invalid user, has no sub';
|
|
66
78
|
user = {
|
|
67
79
|
id: userId,
|
|
68
80
|
username,
|
|
69
81
|
name,
|
|
70
|
-
email: email
|
|
82
|
+
email: email ?? '',
|
|
71
83
|
attributes: cutomAttributes
|
|
72
84
|
};
|
|
73
85
|
}
|
|
@@ -85,9 +97,9 @@ async function _FindUser(userPoolId, userId, username) {
|
|
|
85
97
|
throw 'User has no attributes';
|
|
86
98
|
username = cu.Username;
|
|
87
99
|
var cutomAttributes = cu.Attributes.filter(x => x.Name.startsWith('dev:custom:'));
|
|
88
|
-
var sub =
|
|
89
|
-
var name =
|
|
90
|
-
var email =
|
|
100
|
+
var sub = cu.Attributes.find(x => x.Name == 'sub')?.Value;
|
|
101
|
+
var name = cu.Attributes.find(x => x.Name == 'name')?.Value;
|
|
102
|
+
var email = cu.Attributes.find(x => x.Name == 'email')?.Value;
|
|
91
103
|
if (!sub)
|
|
92
104
|
throw 'Invalid user, has no sub';
|
|
93
105
|
if (!username)
|
|
@@ -97,7 +109,7 @@ async function _FindUser(userPoolId, userId, username) {
|
|
|
97
109
|
attributes: cutomAttributes,
|
|
98
110
|
name,
|
|
99
111
|
username,
|
|
100
|
-
email: email
|
|
112
|
+
email: email ?? ''
|
|
101
113
|
};
|
|
102
114
|
}
|
|
103
115
|
}
|
|
@@ -121,17 +133,15 @@ async function getUserById(userId, poolId) {
|
|
|
121
133
|
}
|
|
122
134
|
exports.getUserById = getUserById;
|
|
123
135
|
async function getUser(username, context) {
|
|
124
|
-
|
|
125
|
-
const user = await _FindUser((_a = context.poolId) !== null && _a !== void 0 ? _a : '', undefined, username);
|
|
136
|
+
const user = await _FindUser(context.poolId ?? '', undefined, username);
|
|
126
137
|
return user;
|
|
127
138
|
}
|
|
128
139
|
exports.getUser = getUser;
|
|
129
140
|
function getContext(request) {
|
|
130
|
-
var _a, _b;
|
|
131
141
|
if (!request) {
|
|
132
142
|
throw 'Server error';
|
|
133
143
|
}
|
|
134
|
-
const claims =
|
|
144
|
+
const claims = request?.requestContext?.authorizer?.claims;
|
|
135
145
|
if (claims) {
|
|
136
146
|
const poolId = claims['iss'].split('/').pop();
|
|
137
147
|
const userSub = claims['sub'];
|
|
@@ -142,9 +152,9 @@ function getContext(request) {
|
|
|
142
152
|
//hash.update(accessToken, "utf8").digest('hex');
|
|
143
153
|
const userIp = request.requestContext.identity.sourceIp;
|
|
144
154
|
return {
|
|
145
|
-
userId: userSub
|
|
146
|
-
poolId: poolId
|
|
147
|
-
email: email
|
|
155
|
+
userId: userSub ?? undefined,
|
|
156
|
+
poolId: poolId ?? undefined,
|
|
157
|
+
email: email ?? undefined,
|
|
148
158
|
username: username,
|
|
149
159
|
clientIP: userIp,
|
|
150
160
|
claims: claims
|
package/dist/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAE9B,mCAAuC;AAKvC,SAAgB,UAAU,CAAQ,OAAgB;IAC9C,IAAI,CAAC,OAAO,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAEpC,IAAI,WAAW,GAAQ,OAAO,CAAC,IAAI,CAAC;IACpC,IAAI,OAAO,CAAC,eAAe,EAAE;QACzB,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAA;KAC/D;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAU,CAAA;AAC3C,CAAC;AARD,gCAQC;AAED,SAAgB,OAAO,CAAQ,OAAgB;IAC3C,IAAI,CAAC,OAAO,CAAC,IAAI;QACb,MAAM,IAAI,oBAAY,CAAC,kCAAkC,CAAC,CAAA;IAE9D,MAAM,IAAI,GAAG,UAAU,CAAQ,OAAO,CAAC,CAAA;IACvC,IAAI,CAAC,IAAI;QACL,MAAM,IAAI,oBAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,OAAO,IAAI,CAAA;AACf,CAAC;AARD,0BAQC;AAUD,KAAK,UAAU,SAAS,CAAC,UAAkB,EAAE,MAAe,EAAE,QAAiB
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"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"}
|
package/dist/secretManager.js
CHANGED
|
@@ -31,9 +31,8 @@ class SecretsManagerCache {
|
|
|
31
31
|
* `ttl`.
|
|
32
32
|
*/
|
|
33
33
|
async getSecret(secretName, isJSON = false) {
|
|
34
|
-
var _a, _b;
|
|
35
34
|
const itemExistsInCache = this.cache.has(secretName);
|
|
36
|
-
const itemHasExpired =
|
|
35
|
+
const itemHasExpired = this.cache.get(secretName)?.hasExpired();
|
|
37
36
|
if (!itemExistsInCache || itemHasExpired) {
|
|
38
37
|
const getSecretValueResponse = await this.config.secretsManager
|
|
39
38
|
.getSecretValue({ SecretId: secretName })
|
|
@@ -42,7 +41,7 @@ class SecretsManagerCache {
|
|
|
42
41
|
this.cache.set(secretName, new CachedSecret(getSecretValueResponse.SecretString, this.config.ttl));
|
|
43
42
|
}
|
|
44
43
|
}
|
|
45
|
-
const secret =
|
|
44
|
+
const secret = this.cache.get(secretName)?.value;
|
|
46
45
|
if (isJSON) {
|
|
47
46
|
try {
|
|
48
47
|
return JSON.parse(secret);
|
|
@@ -1 +1 @@
|
|
|
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
|
|
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,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,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,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,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.5.
|
|
3
|
+
"version": "1.5.2",
|
|
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": "908ee3c0e705b9c8837a4790cf502f33d4b5d0f8"
|
|
37
37
|
}
|