@contember/engine-s3-plugin 1.2.0 → 1.3.0-alpha.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/src/Config.d.ts +2 -3
- package/dist/src/Config.d.ts.map +1 -1
- package/dist/src/Config.js.map +1 -1
- package/dist/src/S3ConfigProcessor.d.ts +2 -2
- package/dist/src/S3ConfigProcessor.d.ts.map +1 -1
- package/dist/src/S3ConfigProcessor.js.map +1 -1
- package/dist/src/S3ObjectAuthorizator.d.ts +22 -0
- package/dist/src/S3ObjectAuthorizator.d.ts.map +1 -0
- package/dist/src/S3ObjectAuthorizator.js +48 -0
- package/dist/src/S3ObjectAuthorizator.js.map +1 -0
- package/dist/src/S3SchemaContributor.d.ts +11 -5
- package/dist/src/S3SchemaContributor.d.ts.map +1 -1
- package/dist/src/S3SchemaContributor.js +61 -85
- package/dist/src/S3SchemaContributor.js.map +1 -1
- package/dist/src/S3SchemaTypes.d.ts +21 -0
- package/dist/src/S3SchemaTypes.d.ts.map +1 -0
- package/dist/src/S3SchemaTypes.js +65 -0
- package/dist/src/S3SchemaTypes.js.map +1 -0
- package/dist/src/S3Service.d.ts +10 -10
- package/dist/src/S3Service.d.ts.map +1 -1
- package/dist/src/S3Service.js +40 -37
- package/dist/src/S3Service.js.map +1 -1
- package/dist/src/S3Signer.d.ts +1 -1
- package/dist/src/S3Signer.d.ts.map +1 -1
- package/dist/src/S3Signer.js +1 -1
- package/dist/src/S3Signer.js.map +1 -1
- package/dist/src/index.d.ts +6 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +7 -4
- package/dist/src/index.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/authorizator.test.d.ts +2 -0
- package/dist/tests/cases/authorizator.test.d.ts.map +1 -0
- package/dist/tests/cases/authorizator.test.js +21 -0
- package/dist/tests/cases/authorizator.test.js.map +1 -0
- package/dist/tests/cases/signRequest.test.js +14 -5
- package/dist/tests/cases/signRequest.test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/src/Config.ts +1 -2
- package/src/S3ConfigProcessor.ts +2 -2
- package/src/S3ObjectAuthorizator.ts +63 -0
- package/src/S3SchemaContributor.ts +51 -109
- package/src/S3SchemaTypes.ts +89 -0
- package/src/S3Service.ts +51 -43
- package/src/S3Signer.ts +2 -2
- package/src/index.ts +9 -7
- package/src/tsconfig.json +3 -9
- package/tests/cases/authorizator.test.ts +22 -0
- package/tests/cases/signRequest.test.ts +18 -18
- package/tests/tsconfig.json +1 -3
- package/tsconfig.json +2 -6
- package/dist/src/ObjectKeyVerifier.d.ts +0 -3
- package/dist/src/ObjectKeyVerifier.d.ts.map +0 -1
- package/dist/src/ObjectKeyVerifier.js +0 -18
- package/dist/src/ObjectKeyVerifier.js.map +0 -1
- package/src/ObjectKeyVerifier.ts +0 -14
- package/types/sign3/index.d.ts +0 -8
package/dist/src/S3Service.js
CHANGED
|
@@ -1,43 +1,56 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.S3ServiceFactory = exports.S3Service =
|
|
3
|
+
exports.S3ServiceFactory = exports.S3Service = void 0;
|
|
4
4
|
const mime_types_1 = require("mime-types");
|
|
5
5
|
const Config_1 = require("./Config");
|
|
6
6
|
const graphql_utils_1 = require("@contember/graphql-utils");
|
|
7
7
|
const S3Signer_1 = require("./S3Signer");
|
|
8
|
-
var S3Acl;
|
|
9
|
-
(function (S3Acl) {
|
|
10
|
-
S3Acl["None"] = "none";
|
|
11
|
-
S3Acl["PublicRead"] = "public-read";
|
|
12
|
-
S3Acl["Private"] = "private";
|
|
13
|
-
})(S3Acl = exports.S3Acl || (exports.S3Acl = {}));
|
|
14
8
|
class S3Service {
|
|
15
|
-
constructor(config, providers) {
|
|
9
|
+
constructor(config, providers, authorizator) {
|
|
16
10
|
this.config = config;
|
|
17
11
|
this.providers = providers;
|
|
12
|
+
this.authorizator = authorizator;
|
|
18
13
|
this.publicBaseUrl = (0, Config_1.resolveS3PublicBaseUrl)(config);
|
|
19
14
|
this.signer = new S3Signer_1.S3Signer(config, providers);
|
|
20
15
|
}
|
|
21
|
-
getSignedUploadUrl(
|
|
22
|
-
|
|
16
|
+
getSignedUploadUrl({ acl, contentDisposition, contentType, expiration, prefix, suffix, fileName, extension, size }) {
|
|
17
|
+
var _a;
|
|
18
|
+
const ext = extension !== null && extension !== void 0 ? extension : ((contentType ? (0, mime_types_1.extension)(contentType) : null) || 'bin');
|
|
23
19
|
const id = this.providers.uuid();
|
|
24
|
-
const localObjectKey = (prefix ? prefix + '/' : '') + `${id}.${ext}`;
|
|
25
|
-
|
|
20
|
+
const localObjectKey = (prefix ? prefix + '/' : '') + `${id}${suffix !== null && suffix !== void 0 ? suffix : ''}.${ext}`;
|
|
21
|
+
this.authorizator.verifyUploadAccess({ key: localObjectKey, size });
|
|
26
22
|
const objectKey = (this.config.prefix ? this.config.prefix + '/' : '') + localObjectKey;
|
|
27
23
|
const bucket = this.config.bucket;
|
|
28
24
|
if (acl && this.config.noAcl) {
|
|
29
|
-
throw new
|
|
25
|
+
throw new graphql_utils_1.UserInputError('ACL is not supported');
|
|
26
|
+
}
|
|
27
|
+
const headers = {
|
|
28
|
+
'Cache-Control': 'immutable',
|
|
29
|
+
};
|
|
30
|
+
if (contentType) {
|
|
31
|
+
headers['Content-Type'] = contentType;
|
|
32
|
+
}
|
|
33
|
+
if (!this.config.noAcl && acl !== 'NONE') {
|
|
34
|
+
const mapping = { PUBLIC_READ: 'public-read', PRIVATE: 'private' };
|
|
35
|
+
headers['x-amz-acl'] = mapping[acl !== null && acl !== void 0 ? acl : 'PUBLIC_READ'];
|
|
36
|
+
}
|
|
37
|
+
if (fileName || contentDisposition) {
|
|
38
|
+
let contentDispositionHeader = (_a = contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.toLowerCase()) !== null && _a !== void 0 ? _a : 'inline';
|
|
39
|
+
if (fileName) {
|
|
40
|
+
contentDispositionHeader += `; filename*=UTF-8''${encodeURIComponent(fileName)}`;
|
|
41
|
+
}
|
|
42
|
+
headers['Content-Disposition'] = contentDispositionHeader;
|
|
43
|
+
}
|
|
44
|
+
const headersToSend = Object.entries(headers).map(([key, value]) => ({ key, value }));
|
|
45
|
+
// intentionally not sending following headers
|
|
46
|
+
if (size) {
|
|
47
|
+
headers['Content-Length'] = String(size);
|
|
30
48
|
}
|
|
31
|
-
const aclValue = this.config.noAcl || acl === S3Acl.None ? undefined : acl || S3Acl.PublicRead;
|
|
32
49
|
const url = this.signer.sign({
|
|
33
50
|
action: 'upload',
|
|
34
|
-
expiration: expiration
|
|
51
|
+
expiration: expiration !== null && expiration !== void 0 ? expiration : 3600,
|
|
35
52
|
key: objectKey,
|
|
36
|
-
headers: {
|
|
37
|
-
'Content-Type': contentType,
|
|
38
|
-
'Cache-Control': 'immutable',
|
|
39
|
-
...(aclValue ? { 'x-amz-acl': aclValue } : {}),
|
|
40
|
-
},
|
|
53
|
+
headers: { ...headers },
|
|
41
54
|
});
|
|
42
55
|
const publicUrl = this.formatPublicUrl(objectKey);
|
|
43
56
|
return {
|
|
@@ -45,34 +58,24 @@ class S3Service {
|
|
|
45
58
|
objectKey,
|
|
46
59
|
url,
|
|
47
60
|
publicUrl,
|
|
48
|
-
headers:
|
|
49
|
-
{
|
|
50
|
-
key: 'Content-Type',
|
|
51
|
-
value: contentType,
|
|
52
|
-
},
|
|
53
|
-
{
|
|
54
|
-
key: 'Cache-Control',
|
|
55
|
-
value: 'immutable',
|
|
56
|
-
},
|
|
57
|
-
...(aclValue ? [{ key: 'X-Amz-Acl', value: aclValue }] : []),
|
|
58
|
-
],
|
|
61
|
+
headers: headersToSend,
|
|
59
62
|
method: 'PUT',
|
|
60
63
|
};
|
|
61
64
|
}
|
|
62
|
-
getSignedReadUrl(objectKey,
|
|
65
|
+
getSignedReadUrl({ objectKey, expiration }) {
|
|
63
66
|
const bucket = this.config.bucket;
|
|
64
67
|
const publicPrefix = this.formatPublicUrl('');
|
|
65
68
|
if (objectKey.startsWith(publicPrefix)) {
|
|
66
|
-
objectKey = objectKey.
|
|
69
|
+
objectKey = objectKey.substring(publicPrefix.length);
|
|
67
70
|
}
|
|
68
71
|
if (this.config.prefix && !objectKey.startsWith(this.config.prefix)) {
|
|
69
72
|
throw new graphql_utils_1.ForbiddenError(`Given object key "${objectKey}" does not start with a project prefix "${this.config.prefix}"`);
|
|
70
73
|
}
|
|
71
74
|
const localObjectKey = this.config.prefix ? objectKey.substring(this.config.prefix.length + 1) : objectKey;
|
|
72
|
-
|
|
75
|
+
this.authorizator.verifyReadAccess({ key: localObjectKey });
|
|
73
76
|
const url = this.signer.sign({
|
|
74
77
|
action: 'read',
|
|
75
|
-
expiration: expiration
|
|
78
|
+
expiration: expiration !== null && expiration !== void 0 ? expiration : 3600,
|
|
76
79
|
key: objectKey,
|
|
77
80
|
headers: {},
|
|
78
81
|
});
|
|
@@ -90,8 +93,8 @@ class S3Service {
|
|
|
90
93
|
}
|
|
91
94
|
exports.S3Service = S3Service;
|
|
92
95
|
class S3ServiceFactory {
|
|
93
|
-
create(config, providers) {
|
|
94
|
-
return new S3Service(config, providers);
|
|
96
|
+
create(config, providers, authorizator) {
|
|
97
|
+
return new S3Service(config, providers, authorizator);
|
|
95
98
|
}
|
|
96
99
|
}
|
|
97
100
|
exports.S3ServiceFactory = S3ServiceFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Service.js","sourceRoot":"","sources":["../../src/S3Service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"S3Service.js","sourceRoot":"","sources":["../../src/S3Service.ts"],"names":[],"mappings":"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"}
|
package/dist/src/S3Signer.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare class S3Signer {
|
|
|
10
10
|
private readonly config;
|
|
11
11
|
private readonly providers;
|
|
12
12
|
private region;
|
|
13
|
-
constructor(config: S3Config, providers: Providers);
|
|
13
|
+
constructor(config: S3Config, providers: Pick<Providers, 'now'>);
|
|
14
14
|
sign(request: S3Request): string;
|
|
15
15
|
private getQueryParams;
|
|
16
16
|
private getScope;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Signer.d.ts","sourceRoot":"","sources":["../../src/S3Signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAIrD,UAAU,SAAS;IAClB,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAWD,qBAAa,QAAQ;IAGR,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFzE,OAAO,CAAC,MAAM,CAAQ;gBAEO,MAAM,EAAE,QAAQ,EAAmB,SAAS,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"S3Signer.d.ts","sourceRoot":"","sources":["../../src/S3Signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAIrD,UAAU,SAAS;IAClB,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAWD,qBAAa,QAAQ;IAGR,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFzE,OAAO,CAAC,MAAM,CAAQ;gBAEO,MAAM,EAAE,QAAQ,EAAmB,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;IAI1F,IAAI,CAAC,OAAO,EAAE,SAAS;IA2B9B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,oBAAoB;CAO5B"}
|
package/dist/src/S3Signer.js
CHANGED
|
@@ -9,7 +9,7 @@ const qs_1 = __importDefault(require("qs"));
|
|
|
9
9
|
const node_crypto_1 = require("node:crypto");
|
|
10
10
|
const hmac = (secret, data) => (0, node_crypto_1.createHmac)('sha256', secret).update(data).digest();
|
|
11
11
|
const hash = (data) => (0, node_crypto_1.createHash)('sha256').update(data).digest('hex');
|
|
12
|
-
const unsignableHeaders = ['authorization', '
|
|
12
|
+
const unsignableHeaders = ['authorization', 'user-agent', 'content-type', 'expect', 'x-amzn-trace-id'];
|
|
13
13
|
const sortMap = (input) => {
|
|
14
14
|
return Object.fromEntries(Object.entries(input).sort((a, b) => (a[0] < b[0] ? -1 : 1)));
|
|
15
15
|
};
|
package/dist/src/S3Signer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Signer.js","sourceRoot":"","sources":["../../src/S3Signer.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAsD;AAEtD,4CAAmB;AACnB,6CAAgE;AAShE,MAAM,IAAI,GAAG,CAAC,MAAkB,EAAE,IAAgB,EAAE,EAAE,CAAC,IAAA,wBAAU,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAA;AAEzG,MAAM,IAAI,GAAG,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAElF,MAAM,iBAAiB,GAAG,CAAC,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"S3Signer.js","sourceRoot":"","sources":["../../src/S3Signer.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAsD;AAEtD,4CAAmB;AACnB,6CAAgE;AAShE,MAAM,IAAI,GAAG,CAAC,MAAkB,EAAE,IAAgB,EAAE,EAAE,CAAC,IAAA,wBAAU,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAA;AAEzG,MAAM,IAAI,GAAG,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAElF,MAAM,iBAAiB,GAAG,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAA;AAEtG,MAAM,OAAO,GAAG,CAAgC,KAAQ,EAAK,EAAE;IAC9D,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAM,CAAA;AAC7F,CAAC,CAAA;AACD,MAAa,QAAQ;IAGpB,YAA6B,MAAgB,EAAmB,SAAiC;QAApE,WAAM,GAAN,MAAM,CAAU;QAAmB,cAAS,GAAT,SAAS,CAAwB;QAChG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,WAAW,CAAA;IAC3C,CAAC;IAEM,IAAI,CAAC,OAAkB;QAC7B,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3C,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QAChF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS;aACjC,GAAG,EAAE;aACL,WAAW,EAAE;aACb,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAA;QAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QAC9C,MAAM,KAAK,GAAG;YACb,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YACzC,IAAI;YACJ,WAAW;YACX,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC9B,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACvD,kBAAkB;SAClB,CAAA;QACD,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEzC,MAAM,KAAK,GAAG,CAAC,kBAAkB,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAErG,MAAM,SAAS,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnG,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;aACtF,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC,WAAW,GAAG,mBAAmB,GAAG,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChH,CAAC;IAEO,cAAc,CAAC,OAAkB,EAAE,aAAqB;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAC1C,MAAM,WAAW,GAA2B;YAC3C,YAAY,EAAE,aAAa;YAC3B,iBAAiB,EAAE,kBAAkB;YACrC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,GAAG,KAAK;YAC7D,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAC3C,qBAAqB,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9E,CAAA;QAED,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;QACpE,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;YACrC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACpE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;aAC7F;SACD;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QACrC,OAAO,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC9B,CAAC;IAEO,QAAQ,CAAC,aAAqB;QACrC,OAAO,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAA;IAC9E,CAAC;IAEO,gBAAgB,CAAC,OAAkB;QAC1C,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACrC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;YACzC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACzC,SAAQ;aACR;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;YACpF,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,IAAI,KAAK,IAAI,CAAC,CAAA;SACxC;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QAC1C,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAA;IAC7G,CAAC;IAEO,oBAAoB,CAAC,OAAiB;QAC7C,OAAO,OAAO;aACZ,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;aAC3B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;aAC7B,IAAI,EAAE;aACN,IAAI,CAAC,GAAG,CAAC,CAAA;IACZ,CAAC;CACD;AAnFD,4BAmFC"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { Plugin,
|
|
1
|
+
import { Plugin, SchemaContributorArgs } from '@contember/engine-plugins';
|
|
2
2
|
import { S3ConfigProcessor } from './S3ConfigProcessor';
|
|
3
3
|
import { S3SchemaContributor } from './S3SchemaContributor';
|
|
4
|
-
import {
|
|
4
|
+
import { Project3Config } from './Config';
|
|
5
|
+
export * from './S3ObjectAuthorizator';
|
|
5
6
|
export * from './S3SchemaContributor';
|
|
6
7
|
export * from './S3Service';
|
|
7
|
-
export default class S3 implements Plugin<
|
|
8
|
+
export default class S3 implements Plugin<Project3Config> {
|
|
9
|
+
name: string;
|
|
8
10
|
getConfigProcessor(): S3ConfigProcessor;
|
|
9
|
-
getSchemaContributor(
|
|
11
|
+
getSchemaContributor({ project, providers }: SchemaContributorArgs<Project3Config>): S3SchemaContributor | undefined;
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,aAAa,CAAA;AAE3B,MAAM,CAAC,OAAO,OAAO,EAAG,YAAW,MAAM,CAAC,cAAc,CAAC;IACxD,IAAI,SAAiB;IAErB,kBAAkB;IAIlB,oBAAoB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,qBAAqB,CAAC,cAAc,CAAC;CAOlF"}
|
package/dist/src/index.js
CHANGED
|
@@ -17,19 +17,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
const S3ConfigProcessor_1 = require("./S3ConfigProcessor");
|
|
18
18
|
const S3SchemaContributor_1 = require("./S3SchemaContributor");
|
|
19
19
|
const S3Service_1 = require("./S3Service");
|
|
20
|
+
__exportStar(require("./S3ObjectAuthorizator"), exports);
|
|
20
21
|
__exportStar(require("./S3SchemaContributor"), exports);
|
|
21
22
|
__exportStar(require("./S3Service"), exports);
|
|
22
23
|
class S3 {
|
|
24
|
+
constructor() {
|
|
25
|
+
this.name = 'contember/s3';
|
|
26
|
+
}
|
|
23
27
|
getConfigProcessor() {
|
|
24
28
|
return new S3ConfigProcessor_1.S3ConfigProcessor();
|
|
25
29
|
}
|
|
26
|
-
getSchemaContributor(
|
|
27
|
-
|
|
28
|
-
if (!projectConfig.s3) {
|
|
30
|
+
getSchemaContributor({ project, providers }) {
|
|
31
|
+
if (!project.s3) {
|
|
29
32
|
return undefined;
|
|
30
33
|
}
|
|
31
34
|
const s3ServiceFactory = new S3Service_1.S3ServiceFactory();
|
|
32
|
-
return new S3SchemaContributor_1.S3SchemaContributor(
|
|
35
|
+
return new S3SchemaContributor_1.S3SchemaContributor(project.s3, s3ServiceFactory, providers);
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
38
|
exports.default = S3;
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2DAAuD;AACvD,+DAA2D;AAC3D,2CAA8C;AAG9C,wDAAqC;AACrC,8CAA2B;AAE3B,MAAqB,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2DAAuD;AACvD,+DAA2D;AAC3D,2CAA8C;AAG9C,yDAAsC;AACtC,wDAAqC;AACrC,8CAA2B;AAE3B,MAAqB,EAAE;IAAvB;QACC,SAAI,GAAG,cAAc,CAAA;IAatB,CAAC;IAXA,kBAAkB;QACjB,OAAO,IAAI,qCAAiB,EAAE,CAAA;IAC/B,CAAC;IAED,oBAAoB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAyC;QACjF,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YAChB,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,gBAAgB,GAAG,IAAI,4BAAgB,EAAE,CAAA;QAC/C,OAAO,IAAI,yCAAmB,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;IACxE,CAAC;CACD;AAdD,qBAcC"}
|