@vendure/core 3.7.4-master-202610010222 → 3.7.4-master-202610030211
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/api/common/get-variant-count-collection-ids.d.ts +9 -0
- package/dist/api/common/get-variant-count-collection-ids.js +25 -0
- package/dist/api/common/get-variant-count-collection-ids.js.map +1 -0
- package/dist/api/common/is-field-in-selection.d.ts +2 -1
- package/dist/api/common/is-field-in-selection.js +15 -24
- package/dist/api/common/is-field-in-selection.js.map +1 -1
- package/dist/api/resolvers/admin/api-key.resolver.js +7 -1
- package/dist/api/resolvers/admin/api-key.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.js +3 -2
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.d.ts +4 -0
- package/dist/api/resolvers/entity/collection-entity.resolver.js +22 -6
- package/dist/api/resolvers/entity/collection-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-products.resolver.js +3 -3
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/bootstrap.js +30 -0
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/constants.d.ts +1 -0
- package/dist/common/constants.js +1 -0
- package/dist/common/constants.js.map +1 -1
- package/dist/job-queue/in-memory-job-queue-strategy.d.ts +6 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js +21 -8
- package/dist/job-queue/in-memory-job-queue-strategy.js.map +1 -1
- package/dist/service/index.d.ts +1 -0
- package/dist/service/index.js +1 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/services/api-key.service.d.ts +27 -6
- package/dist/service/services/api-key.service.js +106 -38
- package/dist/service/services/api-key.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ID } from '@vendure/common/lib/shared-types';
|
|
2
|
+
import { GraphQLResolveInfo } from 'graphql';
|
|
3
|
+
import { Collection } from '../../entity/collection/collection.entity';
|
|
4
|
+
/**
|
|
5
|
+
* Returns the ids of the Collections in a paginated list query whose `productVariantCount`
|
|
6
|
+
* is requested, so that they can be counted with a single query. This covers the list items
|
|
7
|
+
* and their loaded children. Returns `undefined` if no `productVariantCount` is requested.
|
|
8
|
+
*/
|
|
9
|
+
export declare function getVariantCountCollectionIds(info: GraphQLResolveInfo, items: Collection[]): ID[] | undefined;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getVariantCountCollectionIds = getVariantCountCollectionIds;
|
|
4
|
+
const unique_1 = require("@vendure/common/lib/unique");
|
|
5
|
+
const is_field_in_selection_1 = require("./is-field-in-selection");
|
|
6
|
+
/**
|
|
7
|
+
* Returns the ids of the Collections in a paginated list query whose `productVariantCount`
|
|
8
|
+
* is requested, so that they can be counted with a single query. This covers the list items
|
|
9
|
+
* and their loaded children. Returns `undefined` if no `productVariantCount` is requested.
|
|
10
|
+
*/
|
|
11
|
+
function getVariantCountCollectionIds(info, items) {
|
|
12
|
+
const itemCountsRequested = (0, is_field_in_selection_1.isFieldInSelection)(info, 'productVariantCount');
|
|
13
|
+
const childCountsRequested = (0, is_field_in_selection_1.isFieldInSelection)(info, 'productVariantCount', ['items', 'children']);
|
|
14
|
+
if (!itemCountsRequested && !childCountsRequested) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
return (0, unique_1.unique)(items.flatMap(c => {
|
|
18
|
+
var _a;
|
|
19
|
+
return [
|
|
20
|
+
...(itemCountsRequested ? [c.id] : []),
|
|
21
|
+
...(childCountsRequested ? ((_a = c.children) !== null && _a !== void 0 ? _a : []).map(ch => ch.id) : []),
|
|
22
|
+
];
|
|
23
|
+
}));
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=get-variant-count-collection-ids.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-variant-count-collection-ids.js","sourceRoot":"","sources":["../../../src/api/common/get-variant-count-collection-ids.ts"],"names":[],"mappings":";;AAaA,oEAeC;AA3BD,uDAAoD;AAKpD,mEAA6D;AAE7D;;;;GAIG;AACH,SAAgB,4BAA4B,CACxC,IAAwB,EACxB,KAAmB;IAEnB,MAAM,mBAAmB,GAAG,IAAA,0CAAkB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAC5E,MAAM,oBAAoB,GAAG,IAAA,0CAAkB,EAAC,IAAI,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IACpG,IAAI,CAAC,mBAAmB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAChD,OAAO;IACX,CAAC;IACD,OAAO,IAAA,eAAM,EACT,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;QAAC,OAAA;YACf,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE,CAAA;KAAA,CAAC,CACL,CAAC;AACN,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { GraphQLResolveInfo } from 'graphql';
|
|
|
2
2
|
/**
|
|
3
3
|
* Checks if a specific field is requested in the GraphQL query selection set.
|
|
4
4
|
* Looks for the field within the 'items' selection of a paginated list.
|
|
5
|
+
* A path of parent field names can be given to look deeper, e.g. `['items', 'children']`.
|
|
5
6
|
* Supports direct field selections, fragment spreads, and inline fragments.
|
|
6
7
|
*/
|
|
7
|
-
export declare function isFieldInSelection(info: GraphQLResolveInfo, fieldName: string, parentFieldName?: string): boolean;
|
|
8
|
+
export declare function isFieldInSelection(info: GraphQLResolveInfo, fieldName: string, parentFieldName?: string | string[]): boolean;
|
|
@@ -4,40 +4,31 @@ exports.isFieldInSelection = isFieldInSelection;
|
|
|
4
4
|
/**
|
|
5
5
|
* Checks if a specific field is requested in the GraphQL query selection set.
|
|
6
6
|
* Looks for the field within the 'items' selection of a paginated list.
|
|
7
|
+
* A path of parent field names can be given to look deeper, e.g. `['items', 'children']`.
|
|
7
8
|
* Supports direct field selections, fragment spreads, and inline fragments.
|
|
8
9
|
*/
|
|
9
10
|
function isFieldInSelection(info, fieldName, parentFieldName = 'items') {
|
|
10
|
-
var _a, _b;
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return hasFieldInSelections(
|
|
11
|
+
let selections = info.fieldNodes.flatMap(node => { var _a, _b; return (_b = (_a = node.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) !== null && _b !== void 0 ? _b : []; });
|
|
12
|
+
for (const name of Array.isArray(parentFieldName) ? parentFieldName : [parentFieldName]) {
|
|
13
|
+
selections = findFieldsInSelections(selections, name, info).flatMap(field => { var _a, _b; return (_b = (_a = field.selectionSet) === null || _a === void 0 ? void 0 : _a.selections) !== null && _b !== void 0 ? _b : []; });
|
|
14
|
+
}
|
|
15
|
+
return hasFieldInSelections(selections, fieldName, info);
|
|
15
16
|
}
|
|
16
17
|
/**
|
|
17
|
-
* Finds
|
|
18
|
+
* Finds all fields with the given name in selections, including fragment spreads and inline
|
|
19
|
+
* fragments. A field may be selected more than once, in which case GraphQL merges the selections.
|
|
18
20
|
*/
|
|
19
|
-
function
|
|
20
|
-
|
|
21
|
-
if (selection.kind === 'Field'
|
|
22
|
-
return selection;
|
|
21
|
+
function findFieldsInSelections(selections, fieldName, info) {
|
|
22
|
+
return selections.flatMap(selection => {
|
|
23
|
+
if (selection.kind === 'Field') {
|
|
24
|
+
return selection.name.value === fieldName ? [selection] : [];
|
|
23
25
|
}
|
|
24
26
|
if (selection.kind === 'FragmentSpread') {
|
|
25
27
|
const fragment = info.fragments[selection.name.value];
|
|
26
|
-
|
|
27
|
-
const found = findFieldInSelections(fragment.selectionSet.selections, fieldName, info);
|
|
28
|
-
if (found) {
|
|
29
|
-
return found;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
28
|
+
return fragment ? findFieldsInSelections(fragment.selectionSet.selections, fieldName, info) : [];
|
|
32
29
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (found) {
|
|
36
|
-
return found;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
return undefined;
|
|
30
|
+
return findFieldsInSelections(selection.selectionSet.selections, fieldName, info);
|
|
31
|
+
});
|
|
41
32
|
}
|
|
42
33
|
/**
|
|
43
34
|
* Checks if a field exists in selections, including fragment spreads and inline fragments.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-field-in-selection.js","sourceRoot":"","sources":["../../../src/api/common/is-field-in-selection.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"is-field-in-selection.js","sourceRoot":"","sources":["../../../src/api/common/is-field-in-selection.ts"],"names":[],"mappings":";;AAQA,gDAcC;AApBD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAC9B,IAAwB,EACxB,SAAiB,EACjB,kBAAqC,OAAO;IAE5C,IAAI,UAAU,GAA6B,IAAI,CAAC,UAAU,CAAC,OAAO,CAC9D,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,UAAU,mCAAI,EAAE,CAAA,EAAA,CAC9C,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC;QACtF,UAAU,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAC/D,KAAK,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,UAAU,mCAAI,EAAE,CAAA,EAAA,CAChD,CAAC;IACN,CAAC;IACD,OAAO,oBAAoB,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,SAAS,sBAAsB,CAC3B,UAAoC,EACpC,SAAiB,EACjB,IAAwB;IAExB,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClC,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtD,OAAO,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,CAAC;QACD,OAAO,sBAAsB,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CACzB,UAAoC,EACpC,SAAiB,EACjB,IAAwB;IAExB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,QAAQ,IAAI,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;gBACtF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACtC,IAAI,oBAAoB,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3E,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -40,7 +40,13 @@ let ApiKeyResolver = class ApiKeyResolver {
|
|
|
40
40
|
return this.apiKeyService.update(ctx, input, relations);
|
|
41
41
|
}
|
|
42
42
|
async deleteApiKeys(ctx, { ids }) {
|
|
43
|
-
|
|
43
|
+
// Delete sequentially: all softDeletes share one transactional query runner, so running them
|
|
44
|
+
// concurrently on a single connection can interleave.
|
|
45
|
+
const results = [];
|
|
46
|
+
for (const id of ids) {
|
|
47
|
+
results.push(await this.apiKeyService.softDelete(ctx, id));
|
|
48
|
+
}
|
|
49
|
+
return results;
|
|
44
50
|
}
|
|
45
51
|
async rotateApiKey(ctx, { id }) {
|
|
46
52
|
return this.apiKeyService.rotate(ctx, id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/api-key.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAkE;AAClE,yEAW6C;AAG7C,6BAAsE;AACtE,4CAAkE;AAClE,2EAAgE;AAChE,+EAA0E;AAC1E,sEAAyD;AACzD,kFAAqE;AAG9D,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAI9C,AAAN,KAAK,CAAC,MAAM,CACD,GAAmB,EAClB,EAAE,EAAE,EAAmB,EACZ,SAAgC;QAEnD,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC;IAIK,AAAN,KAAK,CAAC,OAAO,CACF,GAAmB,EAClB,EAAE,OAAO,EAAoB,EAClB,SAAgC;QAEnD,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IAKK,AAAN,KAAK,CAAC,YAAY,CACP,GAAmB,EAClB,EAAE,KAAK,EAA4B;QAE3C,IAAI,CAAC,GAAG,CAAC,YAAY;YACjB,MAAM,IAAI,4BAAmB,CAAC,wDAAwD,CAAC,CAAC;QAE5F,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC;IAKK,AAAN,KAAK,CAAC,YAAY,CACP,GAAmB,EAClB,EAAE,KAAK,EAA4B,EACxB,SAAgC;QAEnD,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IAKK,AAAN,KAAK,CAAC,aAAa,CACR,GAAmB,EAClB,EAAE,GAAG,EAA6B;QAE1C,
|
|
1
|
+
{"version":3,"file":"api-key.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/api-key.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const collection_entity_1 = require("../../../entity/collection/collection.entit
|
|
|
23
23
|
const collection_service_1 = require("../../../service/services/collection.service");
|
|
24
24
|
const facet_value_service_1 = require("../../../service/services/facet-value.service");
|
|
25
25
|
const configurable_operation_codec_1 = require("../../common/configurable-operation-codec");
|
|
26
|
+
const get_variant_count_collection_ids_1 = require("../../common/get-variant-count-collection-ids");
|
|
26
27
|
const is_field_in_selection_1 = require("../../common/is-field-in-selection");
|
|
27
28
|
const request_context_1 = require("../../common/request-context");
|
|
28
29
|
const allow_decorator_1 = require("../../decorators/allow.decorator");
|
|
@@ -43,8 +44,8 @@ let CollectionResolver = class CollectionResolver {
|
|
|
43
44
|
const collections = await this.collectionService.findAll(ctx, args.options || undefined, relations);
|
|
44
45
|
// Cache the variant counts query promise if productVariantCount is requested,
|
|
45
46
|
// allowing the DB query to start before the field resolvers are called
|
|
46
|
-
|
|
47
|
-
|
|
47
|
+
const collectionIds = (0, get_variant_count_collection_ids_1.getVariantCountCollectionIds)(info, collections.items);
|
|
48
|
+
if (collectionIds) {
|
|
48
49
|
const countsPromise = this.collectionService.getProductVariantCounts(ctx, collectionIds);
|
|
49
50
|
this.requestContextCache.set(ctx, constants_1.CacheKey.CollectionVariantCounts, countsPromise);
|
|
50
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/collection.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAwE;AACxE,yEAc6C;AAI7C,gGAA0F;AAC1F,yDAAqD;AACrD,yDAA8D;AAE9D,iFAA6E;AAC7E,oFAA0E;AAC1E,qFAAiF;AACjF,uFAAkF;AAClF,4FAAuF;AACvF,8EAAwE;AACxE,kEAA8D;AAC9D,sEAAyD;AACzD,8EAAgF;AAChF,0FAAiE;AACjE,kFAAqE;AAG9D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC3B,YACY,iBAAoC,EACpC,iBAAoC,EACpC,0BAAsD,EACtD,mBAA+C;QAH/C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,wBAAmB,GAAnB,mBAAmB,CAA4B;IACxD,CAAC;IAIE,AAAN,KAAK,CAAC,iBAAiB,CACZ,GAAmB,EAClB,IAA0B;QAElC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW,CACN,GAAmB,EAClB,IAA0B,EAKlC,SAAoC,EAC5B,IAAwB;QAEhC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE,SAAS,CAAC,CAAC;QACpG,8EAA8E;QAC9E,uEAAuE;QACvE,
|
|
1
|
+
{"version":3,"file":"collection.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/collection.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,10 @@ export declare class CollectionEntityResolver {
|
|
|
27
27
|
options: ProductVariantListOptions;
|
|
28
28
|
}, apiType: ApiType, relations: RelationPaths<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
|
|
29
29
|
productVariantCount(ctx: RequestContext, collection: Collection): Promise<number>;
|
|
30
|
+
/**
|
|
31
|
+
* `cache: false` batches without memoizing, so a write earlier in the request is not masked.
|
|
32
|
+
*/
|
|
33
|
+
private getProductVariantCountLoader;
|
|
30
34
|
breadcrumbs(ctx: RequestContext, collection: Collection): Promise<CollectionBreadcrumb[]>;
|
|
31
35
|
parent(ctx: RequestContext, collection: Collection, apiType: ApiType): Promise<Collection | undefined>;
|
|
32
36
|
children(ctx: RequestContext, collection: Collection, apiType: ApiType): Promise<Collection[]>;
|
|
@@ -11,10 +11,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
+
};
|
|
14
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
18
|
exports.CollectionEntityResolver = void 0;
|
|
16
19
|
const common_1 = require("@nestjs/common");
|
|
17
20
|
const graphql_1 = require("@nestjs/graphql");
|
|
21
|
+
const unique_1 = require("@vendure/common/lib/unique");
|
|
22
|
+
const dataloader_1 = __importDefault(require("dataloader"));
|
|
18
23
|
const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
|
|
19
24
|
const constants_1 = require("../../../common/constants");
|
|
20
25
|
const collection_filter_1 = require("../../../config/catalog/collection-filter");
|
|
@@ -57,15 +62,26 @@ let CollectionEntityResolver = class CollectionEntityResolver {
|
|
|
57
62
|
return this.productVariantService.getVariantsByCollectionId(ctx, collection.id, options, relations);
|
|
58
63
|
}
|
|
59
64
|
async productVariantCount(ctx, collection) {
|
|
60
|
-
var _a, _b;
|
|
61
65
|
const cachedCountsPromise = this.requestContextCache.get(ctx, constants_1.CacheKey.CollectionVariantCounts);
|
|
62
66
|
if (cachedCountsPromise) {
|
|
63
|
-
const
|
|
64
|
-
|
|
67
|
+
const count = (await cachedCountsPromise).get(String(collection.id));
|
|
68
|
+
if (count !== undefined) {
|
|
69
|
+
return count;
|
|
70
|
+
}
|
|
65
71
|
}
|
|
66
|
-
// Fallback
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
// Fallback if cache not available (e.g., single collection query) or if this collection was
|
|
73
|
+
// not included in the cached counts (e.g. a nested parent or grandchild). Collections resolved
|
|
74
|
+
// in the same tick are batched into a single query.
|
|
75
|
+
return this.getProductVariantCountLoader(ctx).load(collection.id);
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* `cache: false` batches without memoizing, so a write earlier in the request is not masked.
|
|
79
|
+
*/
|
|
80
|
+
getProductVariantCountLoader(ctx) {
|
|
81
|
+
return this.requestContextCache.get(ctx, constants_1.CacheKey.CollectionVariantCountLoader, () => new dataloader_1.default(async (ids) => {
|
|
82
|
+
const counts = await this.collectionService.getProductVariantCounts(ctx, (0, unique_1.unique)([...ids]));
|
|
83
|
+
return ids.map(id => { var _a; return (_a = counts.get(String(id))) !== null && _a !== void 0 ? _a : 0; });
|
|
84
|
+
}, { cache: false }));
|
|
69
85
|
}
|
|
70
86
|
async breadcrumbs(ctx, collection) {
|
|
71
87
|
const cachedBreadcrumbsPromise = this.requestContextCache.get(ctx, constants_1.CacheKey.CollectionBreadcrumbs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/collection-entity.resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collection-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/collection-entity.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ const service_1 = require("../../../service");
|
|
|
25
25
|
const facet_value_service_1 = require("../../../service/services/facet-value.service");
|
|
26
26
|
const product_variant_service_1 = require("../../../service/services/product-variant.service");
|
|
27
27
|
const product_service_1 = require("../../../service/services/product.service");
|
|
28
|
-
const
|
|
28
|
+
const get_variant_count_collection_ids_1 = require("../../common/get-variant-count-collection-ids");
|
|
29
29
|
const request_context_1 = require("../../common/request-context");
|
|
30
30
|
const relations_decorator_1 = require("../../decorators/relations.decorator");
|
|
31
31
|
const request_context_decorator_1 = require("../../decorators/request-context.decorator");
|
|
@@ -68,8 +68,8 @@ let ShopProductsResolver = class ShopProductsResolver {
|
|
|
68
68
|
const collections = await this.collectionService.findAll(ctx, options, relations);
|
|
69
69
|
// Cache the variant counts query promise if productVariantCount is requested,
|
|
70
70
|
// allowing the DB query to start before the field resolvers are called
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
const collectionIds = (0, get_variant_count_collection_ids_1.getVariantCountCollectionIds)(info, collections.items);
|
|
72
|
+
if (collectionIds) {
|
|
73
73
|
const countsPromise = this.collectionService.getProductVariantCounts(ctx, collectionIds);
|
|
74
74
|
this.requestContextCache.set(ctx, constants_1.CacheKey.CollectionVariantCounts, countsPromise);
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shop-products.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-products.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA8D;AAC9D,yEAAsE;AActE,gGAA0F;AAC1F,yDAAqD;AACrD,yDAAmF;AAInF,oFAA0E;AAC1E,qEAA2D;AAC3D,2EAAiE;AACjE,8CAAmE;AACnE,uFAAkF;AAClF,+FAA0F;AAC1F,+EAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"shop-products.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-products.resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/bootstrap.js
CHANGED
|
@@ -10,6 +10,7 @@ const core_1 = require("@nestjs/core");
|
|
|
10
10
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
11
11
|
const shared_constants_1 = require("@vendure/common/lib/shared-constants");
|
|
12
12
|
const semver_1 = require("semver");
|
|
13
|
+
const typeorm_2 = require("typeorm");
|
|
13
14
|
const cookieSession = require("cookie-session");
|
|
14
15
|
const token_method_includes_1 = require("./api/common/token-method-includes");
|
|
15
16
|
const errors_1 = require("./common/error/errors");
|
|
@@ -240,6 +241,8 @@ function checkPluginCompatibility(config, ignoredPlugins = []) {
|
|
|
240
241
|
* Run the configuration functions of all plugins and return the final config object.
|
|
241
242
|
*/
|
|
242
243
|
async function runPluginConfigurations(config) {
|
|
244
|
+
var _a;
|
|
245
|
+
const addedCustomFieldsKeys = addCustomFieldsKeysForPluginEntities(config);
|
|
243
246
|
for (const plugin of config.plugins) {
|
|
244
247
|
const configFn = (0, plugin_metadata_1.getConfigurationFunction)(plugin);
|
|
245
248
|
if (typeof configFn === 'function') {
|
|
@@ -247,8 +250,35 @@ async function runPluginConfigurations(config) {
|
|
|
247
250
|
Object.assign(config, result);
|
|
248
251
|
}
|
|
249
252
|
}
|
|
253
|
+
// Remove the keys which no plugin used. An empty entry would still add a
|
|
254
|
+
// `customFields: JSON` field to the entity's GraphQL type, which clashes with
|
|
255
|
+
// plugins that declare `customFields` in their own schema.
|
|
256
|
+
for (const entityName of addedCustomFieldsKeys) {
|
|
257
|
+
if (((_a = config.customFields[entityName]) === null || _a === void 0 ? void 0 : _a.length) === 0) {
|
|
258
|
+
delete config.customFields[entityName];
|
|
259
|
+
}
|
|
260
|
+
}
|
|
250
261
|
return config;
|
|
251
262
|
}
|
|
263
|
+
/**
|
|
264
|
+
* Plugin entities which have a `customFields` property do not have an entry in the default
|
|
265
|
+
* customFields config. We add an empty array for each one so that plugin configuration
|
|
266
|
+
* functions can push custom fields onto them, the same as for core entities.
|
|
267
|
+
*/
|
|
268
|
+
function addCustomFieldsKeysForPluginEntities(config) {
|
|
269
|
+
const embeddeds = (0, typeorm_2.getMetadataArgsStorage)().embeddeds;
|
|
270
|
+
const addedKeys = [];
|
|
271
|
+
for (const entity of (0, plugin_metadata_1.getEntitiesFromPlugins)(config.plugins)) {
|
|
272
|
+
// Match on the target name, the same way as `registerCustomEntityFields`
|
|
273
|
+
const hasCustomFields = embeddeds.some(e => e.propertyName === 'customFields' &&
|
|
274
|
+
(typeof e.target === 'string' ? e.target : e.target.name) === entity.name);
|
|
275
|
+
if (hasCustomFields && !config.customFields[entity.name]) {
|
|
276
|
+
config.customFields[entity.name] = [];
|
|
277
|
+
addedKeys.push(entity.name);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
return addedKeys;
|
|
281
|
+
}
|
|
252
282
|
/**
|
|
253
283
|
* Returns an array of core entities and any additional entities defined in plugins.
|
|
254
284
|
*/
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare const CacheKey: {
|
|
|
17
17
|
ActiveTaxZone: (channelId: ID) => string;
|
|
18
18
|
ActiveTaxZone_PPA: (channelId: ID) => string;
|
|
19
19
|
CollectionVariantCounts: string;
|
|
20
|
+
CollectionVariantCountLoader: string;
|
|
20
21
|
CollectionBreadcrumbs: string;
|
|
21
22
|
ExhaustedPromotions: (channelId: ID, customerId: ID | undefined) => string;
|
|
22
23
|
};
|
package/dist/common/constants.js
CHANGED
|
@@ -77,6 +77,7 @@ exports.CacheKey = {
|
|
|
77
77
|
ActiveTaxZone: (channelId) => `ActiveTaxZone:${channelId}`,
|
|
78
78
|
ActiveTaxZone_PPA: (channelId) => `ActiveTaxZone_PPA:${channelId}`,
|
|
79
79
|
CollectionVariantCounts: 'CollectionService.getProductVariantCounts',
|
|
80
|
+
CollectionVariantCountLoader: 'CollectionEntityResolver.productVariantCountLoader',
|
|
80
81
|
CollectionBreadcrumbs: 'CollectionService.getBreadcrumbsForMany',
|
|
81
82
|
ExhaustedPromotions: (channelId, customerId) => `ExhaustedPromotions:${channelId}:${customerId !== null && customerId !== void 0 ? customerId : 'guest'}`,
|
|
82
83
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,12 @@ export declare class InMemoryJobQueueStrategy extends PollingJobQueueStrategy im
|
|
|
69
69
|
* snapshot's `result` object in place would also mutate the stored one.
|
|
70
70
|
*/
|
|
71
71
|
private snapshot;
|
|
72
|
+
/**
|
|
73
|
+
* Job ids are generated here as strings, but the Admin API resolvers pass ids through
|
|
74
|
+
* `decodeId()`, which returns a number for numeric ids. Keying the store by the string form
|
|
75
|
+
* lets both find the same job.
|
|
76
|
+
*/
|
|
77
|
+
private toKey;
|
|
72
78
|
private removeFromUnsettled;
|
|
73
79
|
private applySort;
|
|
74
80
|
private applyFilters;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.InMemoryJobQueueStrategy = void 0;
|
|
4
4
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
5
5
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
6
|
+
const common_1 = require("../common");
|
|
6
7
|
const vendure_logger_1 = require("../config/logger/vendure-logger");
|
|
7
8
|
const process_context_1 = require("../process-context/process-context");
|
|
8
9
|
const job_1 = require("./job");
|
|
@@ -63,7 +64,7 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
63
64
|
}
|
|
64
65
|
job.retries = this.setRetries(job.queueName, job);
|
|
65
66
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
66
|
-
this.jobs.set(job.id, job);
|
|
67
|
+
this.jobs.set(this.toKey(job.id), job);
|
|
67
68
|
if (!this.unsettledJobs[job.queueName]) {
|
|
68
69
|
this.unsettledJobs[job.queueName] = [];
|
|
69
70
|
}
|
|
@@ -71,7 +72,7 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
71
72
|
return job;
|
|
72
73
|
}
|
|
73
74
|
async findOne(id) {
|
|
74
|
-
const job = this.jobs.get(id);
|
|
75
|
+
const job = this.jobs.get(this.toKey(id));
|
|
75
76
|
return job && this.snapshot(job);
|
|
76
77
|
}
|
|
77
78
|
async findMany(options) {
|
|
@@ -97,7 +98,7 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
97
98
|
}
|
|
98
99
|
async findManyById(ids) {
|
|
99
100
|
return ids
|
|
100
|
-
.map(id => this.jobs.get(id))
|
|
101
|
+
.map(id => this.jobs.get(this.toKey(id)))
|
|
101
102
|
.filter(shared_utils_1.notNullOrUndefined)
|
|
102
103
|
.map(job => this.snapshot(job));
|
|
103
104
|
}
|
|
@@ -137,7 +138,7 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
137
138
|
this.unsettledJobs[job.queueName].unshift({ job, updatedAt: new Date() });
|
|
138
139
|
}
|
|
139
140
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
140
|
-
this.jobs.set(job.id, job);
|
|
141
|
+
this.jobs.set(this.toKey(job.id), job);
|
|
141
142
|
}
|
|
142
143
|
/**
|
|
143
144
|
* The inherited implementation cancels the Job returned by `findOne()`, which is now a
|
|
@@ -149,7 +150,7 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
149
150
|
* live job immediately, so no later progress update can revert it.
|
|
150
151
|
*/
|
|
151
152
|
async cancelJob(jobId) {
|
|
152
|
-
const job = this.jobs.get(jobId);
|
|
153
|
+
const job = this.jobs.get(this.toKey(jobId));
|
|
153
154
|
if (!job) {
|
|
154
155
|
return;
|
|
155
156
|
}
|
|
@@ -167,13 +168,13 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
167
168
|
if (olderThan) {
|
|
168
169
|
if (job.settledAt && job.settledAt < olderThan) {
|
|
169
170
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
170
|
-
this.jobs.delete(job.id);
|
|
171
|
+
this.jobs.delete(this.toKey(job.id));
|
|
171
172
|
removed++;
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
else {
|
|
175
176
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
176
|
-
this.jobs.delete(job.id);
|
|
177
|
+
this.jobs.delete(this.toKey(job.id));
|
|
177
178
|
removed++;
|
|
178
179
|
}
|
|
179
180
|
}
|
|
@@ -209,6 +210,14 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
209
210
|
settledAt: job.settledAt,
|
|
210
211
|
});
|
|
211
212
|
}
|
|
213
|
+
/**
|
|
214
|
+
* Job ids are generated here as strings, but the Admin API resolvers pass ids through
|
|
215
|
+
* `decodeId()`, which returns a number for numeric ids. Keying the store by the string form
|
|
216
|
+
* lets both find the same job.
|
|
217
|
+
*/
|
|
218
|
+
toKey(id) {
|
|
219
|
+
return String(id);
|
|
220
|
+
}
|
|
212
221
|
removeFromUnsettled(job) {
|
|
213
222
|
const queued = this.unsettledJobs[job.queueName];
|
|
214
223
|
if (!queued) {
|
|
@@ -234,7 +243,11 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
234
243
|
continue;
|
|
235
244
|
}
|
|
236
245
|
if ((operator === null || operator === void 0 ? void 0 : operator.eq) !== undefined) {
|
|
237
|
-
|
|
246
|
+
const eq = operator.eq;
|
|
247
|
+
items =
|
|
248
|
+
key === 'id'
|
|
249
|
+
? items.filter(i => (0, common_1.idsAreEqual)(i.id, eq))
|
|
250
|
+
: items.filter(i => i[key] === eq);
|
|
238
251
|
}
|
|
239
252
|
const contains = operator === null || operator === void 0 ? void 0 : operator.contains;
|
|
240
253
|
if (contains) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAQ6C;AAE7C,mEAAsE;
|
|
1
|
+
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
package/dist/service/index.d.ts
CHANGED
|
@@ -31,6 +31,7 @@ export * from './helpers/utils/patch-entity';
|
|
|
31
31
|
export * from './helpers/utils/translate-entity';
|
|
32
32
|
export * from './helpers/verification-token-generator/verification-token-generator';
|
|
33
33
|
export * from './services/administrator.service';
|
|
34
|
+
export * from './services/api-key.service';
|
|
34
35
|
export * from './services/asset.service';
|
|
35
36
|
export * from './services/auth.service';
|
|
36
37
|
export * from './services/channel.service';
|
package/dist/service/index.js
CHANGED
|
@@ -47,6 +47,7 @@ __exportStar(require("./helpers/utils/patch-entity"), exports);
|
|
|
47
47
|
__exportStar(require("./helpers/utils/translate-entity"), exports);
|
|
48
48
|
__exportStar(require("./helpers/verification-token-generator/verification-token-generator"), exports);
|
|
49
49
|
__exportStar(require("./services/administrator.service"), exports);
|
|
50
|
+
__exportStar(require("./services/api-key.service"), exports);
|
|
50
51
|
__exportStar(require("./services/asset.service"), exports);
|
|
51
52
|
__exportStar(require("./services/auth.service"), exports);
|
|
52
53
|
__exportStar(require("./services/channel.service"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8EAA4D;AAC5D,0EAAwD;AACxD,gGAA8E;AAC9E,wFAAsE;AACtE,oFAAkE;AAClE,uEAAqD;AACrD,gEAA8C;AAC9C,oGAAkF;AAClF,oFAAkE;AAClE,wFAAsE;AACtE,kFAAgE;AAChE,0FAAwE;AACxE,8EAA4D;AAC5D,qEAAmD;AACnD,sEAAoD;AACpD,0EAAwD;AACxD,0EAAwD;AACxD,4EAA0D;AAC1D,oFAAkE;AAClE,4EAA0D;AAC1D,gFAA8D;AAC9D,8FAA4E;AAC5E,8EAA4D;AAC5D,oFAAkE;AAClE,kFAAgE;AAChE,yDAAuC;AACvC,kFAAgE;AAChE,0EAAwD;AACxD,8DAA4C;AAC5C,+DAA6C;AAC7C,mEAAiD;AACjD,sGAAoF;AACpF,mEAAiD;AACjD,2DAAyC;AACzC,0DAAwC;AACxC,6DAA2C;AAC3C,gEAA8C;AAC9C,6DAA2C;AAC3C,oEAAkD;AAClD,8DAA4C;AAC5C,iEAA+C;AAC/C,2DAAyC;AACzC,iEAA+C;AAC/C,qEAAmD;AACnD,6DAA2C;AAC3C,mEAAiD;AACjD,2DAAyC;AACzC,oEAAkD;AAClD,6DAA2C;AAC3C,0EAAwD;AACxD,oEAAkD;AAClD,qEAAmD;AACnD,6DAA2C;AAC3C,+DAA6C;AAC7C,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,4DAA0C;AAC1C,6DAA2C;AAC3C,qEAAmD;AACnD,iEAA+C;AAC/C,oEAAkD;AAClD,oEAAkD;AAClD,yDAAuC;AACvC,kEAAgD;AAChD,8DAA4C;AAC5C,0DAAwC;AACxC,0DAAwC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8EAA4D;AAC5D,0EAAwD;AACxD,gGAA8E;AAC9E,wFAAsE;AACtE,oFAAkE;AAClE,uEAAqD;AACrD,gEAA8C;AAC9C,oGAAkF;AAClF,oFAAkE;AAClE,wFAAsE;AACtE,kFAAgE;AAChE,0FAAwE;AACxE,8EAA4D;AAC5D,qEAAmD;AACnD,sEAAoD;AACpD,0EAAwD;AACxD,0EAAwD;AACxD,4EAA0D;AAC1D,oFAAkE;AAClE,4EAA0D;AAC1D,gFAA8D;AAC9D,8FAA4E;AAC5E,8EAA4D;AAC5D,oFAAkE;AAClE,kFAAgE;AAChE,yDAAuC;AACvC,kFAAgE;AAChE,0EAAwD;AACxD,8DAA4C;AAC5C,+DAA6C;AAC7C,mEAAiD;AACjD,sGAAoF;AACpF,mEAAiD;AACjD,6DAA2C;AAC3C,2DAAyC;AACzC,0DAAwC;AACxC,6DAA2C;AAC3C,gEAA8C;AAC9C,6DAA2C;AAC3C,oEAAkD;AAClD,8DAA4C;AAC5C,iEAA+C;AAC/C,2DAAyC;AACzC,iEAA+C;AAC/C,qEAAmD;AACnD,6DAA2C;AAC3C,mEAAiD;AACjD,2DAAyC;AACzC,oEAAkD;AAClD,6DAA2C;AAC3C,0EAAwD;AACxD,oEAAkD;AAClD,qEAAmD;AACnD,6DAA2C;AAC3C,+DAA6C;AAC7C,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,4DAA0C;AAC1C,6DAA2C;AAC3C,qEAAmD;AACnD,iEAA+C;AAC/C,oEAAkD;AAClD,oEAAkD;AAClD,yDAAuC;AACvC,kEAAgD;AAChD,8DAA4C;AAC5C,0DAAwC;AACxC,0DAAwC"}
|
|
@@ -37,14 +37,26 @@ export declare class ApiKeyService {
|
|
|
37
37
|
getApiKeyStrategyByApiType(apiType: ApiType): ApiKeyStrategy;
|
|
38
38
|
/**
|
|
39
39
|
* @description
|
|
40
|
-
* Checks that the active user
|
|
41
|
-
*
|
|
42
|
-
*
|
|
40
|
+
* Checks that the active user holds every Permission of the specified Roles, using the shared
|
|
41
|
+
* {@link RoleService.activeUserHasPermissionsOfRoles} rule so this and {@link AdministratorService}
|
|
42
|
+
* enforce it in one place. The Roles are either those being granted to an API-Key's User or those
|
|
43
|
+
* its User currently holds. Returns the loaded Roles (with their Channels) for callers that assign
|
|
44
|
+
* them to the API-Key's User.
|
|
43
45
|
*
|
|
44
46
|
* @throws {UserInputError} If the active User has insufficient permissions
|
|
45
47
|
* @returns Role-Entities with relations to Channels
|
|
46
48
|
*/
|
|
47
|
-
private
|
|
49
|
+
private assertActiveUserHasPermissionsOfRoles;
|
|
50
|
+
/**
|
|
51
|
+
* @description
|
|
52
|
+
* Loads an API-Key in the active Channel, with its User's Roles and their Channels, if the active
|
|
53
|
+
* User may manage it: they must hold every Permission of the key's User. A key they may not manage
|
|
54
|
+
* throws the same error as a key which does not exist, since {@link ApiKeyService.findOne} hides it
|
|
55
|
+
* and a different error would disclose that it exists. (GHSA-37xp-mjp8-6f9x)
|
|
56
|
+
*
|
|
57
|
+
* @throws {EntityNotFoundError} If the API-Key does not exist or the active User may not manage it
|
|
58
|
+
*/
|
|
59
|
+
private getManageableApiKeyOrThrow;
|
|
48
60
|
/**
|
|
49
61
|
* @description
|
|
50
62
|
* Simple user identifier generation function because it is a non-nullable field on User.
|
|
@@ -86,7 +98,8 @@ export declare class ApiKeyService {
|
|
|
86
98
|
* @description
|
|
87
99
|
* Soft-Deletes an API-Key and removes its session. Is Channel-Aware.
|
|
88
100
|
*
|
|
89
|
-
* @throws {EntityNotFoundError} If API-Key cannot be found
|
|
101
|
+
* @throws {EntityNotFoundError} If API-Key cannot be found, or the active User does not hold every
|
|
102
|
+
* Permission granted by the key's User
|
|
90
103
|
*/
|
|
91
104
|
softDelete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
|
|
92
105
|
/**
|
|
@@ -96,7 +109,8 @@ export declare class ApiKeyService {
|
|
|
96
109
|
* This is a convenience method to invalidate an API-Key without
|
|
97
110
|
* deleting the underlying roles and permissions.
|
|
98
111
|
*
|
|
99
|
-
* @throws {EntityNotFoundError} If API-Key cannot be found
|
|
112
|
+
* @throws {EntityNotFoundError} If API-Key cannot be found, or the active User does not hold every
|
|
113
|
+
* Permission granted by the key's User
|
|
100
114
|
*/
|
|
101
115
|
rotate(ctx: RequestContext, id: ID): Promise<RotateApiKeyResult>;
|
|
102
116
|
/**
|
|
@@ -109,6 +123,13 @@ export declare class ApiKeyService {
|
|
|
109
123
|
* Is channel-/ and soft-delete aware, translates the entity as well.
|
|
110
124
|
*/
|
|
111
125
|
findAll(ctx: RequestContext, options?: ListQueryOptions<ApiKey>, relations?: RelationPaths<ApiKey>): Promise<PaginatedList<Translated<ApiKey>>>;
|
|
126
|
+
/**
|
|
127
|
+
* Restricts a list query to the API-Keys visible to the active user, by the same
|
|
128
|
+
* {@link RoleService.activeUserHasPermissionsOfRoles} rule that gates the mutations. Applied to the
|
|
129
|
+
* query rather than its result, so totalItems, sorting, filtering and pagination all operate over
|
|
130
|
+
* the visible keys only. Mirrors {@link AdministratorService}'s administrator visibility.
|
|
131
|
+
*/
|
|
132
|
+
private restrictToVisibleApiKeys;
|
|
112
133
|
/**
|
|
113
134
|
* @description
|
|
114
135
|
* Is channel-/ and soft-delete aware, translates the entity as well.
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ApiKeyService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
15
|
+
const unique_1 = require("@vendure/common/lib/unique");
|
|
15
16
|
const typeorm_1 = require("typeorm");
|
|
16
17
|
const common_2 = require("../../common");
|
|
17
18
|
const config_1 = require("../../config");
|
|
@@ -25,7 +26,6 @@ const custom_field_relation_service_1 = require("../helpers/custom-field-relatio
|
|
|
25
26
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
26
27
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
27
28
|
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
28
|
-
const get_user_channels_permissions_1 = require("../helpers/utils/get-user-channels-permissions");
|
|
29
29
|
const channel_service_1 = require("./channel.service");
|
|
30
30
|
const role_service_1 = require("./role.service");
|
|
31
31
|
const session_service_1 = require("./session.service");
|
|
@@ -56,27 +56,47 @@ let ApiKeyService = class ApiKeyService {
|
|
|
56
56
|
}
|
|
57
57
|
/**
|
|
58
58
|
* @description
|
|
59
|
-
* Checks that the active user
|
|
60
|
-
*
|
|
61
|
-
*
|
|
59
|
+
* Checks that the active user holds every Permission of the specified Roles, using the shared
|
|
60
|
+
* {@link RoleService.activeUserHasPermissionsOfRoles} rule so this and {@link AdministratorService}
|
|
61
|
+
* enforce it in one place. The Roles are either those being granted to an API-Key's User or those
|
|
62
|
+
* its User currently holds. Returns the loaded Roles (with their Channels) for callers that assign
|
|
63
|
+
* them to the API-Key's User.
|
|
62
64
|
*
|
|
63
65
|
* @throws {UserInputError} If the active User has insufficient permissions
|
|
64
66
|
* @returns Role-Entities with relations to Channels
|
|
65
67
|
*/
|
|
66
|
-
async
|
|
67
|
-
if (
|
|
68
|
+
async assertActiveUserHasPermissionsOfRoles(ctx, roleIds) {
|
|
69
|
+
if (!(await this.roleService.activeUserHasPermissionsOfRoles(ctx, roleIds))) {
|
|
70
|
+
throw new common_2.UserInputError('error.active-user-does-not-have-sufficient-permissions');
|
|
71
|
+
}
|
|
72
|
+
if (roleIds.length === 0) {
|
|
68
73
|
return [];
|
|
69
|
-
|
|
74
|
+
}
|
|
75
|
+
return this.connection.getRepository(ctx, entity_1.Role).find({
|
|
70
76
|
where: { id: (0, typeorm_1.In)(roleIds) },
|
|
71
77
|
relations: { channels: true },
|
|
72
78
|
});
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* @description
|
|
82
|
+
* Loads an API-Key in the active Channel, with its User's Roles and their Channels, if the active
|
|
83
|
+
* User may manage it: they must hold every Permission of the key's User. A key they may not manage
|
|
84
|
+
* throws the same error as a key which does not exist, since {@link ApiKeyService.findOne} hides it
|
|
85
|
+
* and a different error would disclose that it exists. (GHSA-37xp-mjp8-6f9x)
|
|
86
|
+
*
|
|
87
|
+
* @throws {EntityNotFoundError} If the API-Key does not exist or the active User may not manage it
|
|
88
|
+
*/
|
|
89
|
+
async getManageableApiKeyOrThrow(ctx, id) {
|
|
90
|
+
const entity = await this.connection.getEntityOrThrow(ctx, api_key_entity_1.ApiKey, id, {
|
|
91
|
+
channelId: ctx.channelId,
|
|
92
|
+
includeSoftDeleted: false,
|
|
93
|
+
relations: { user: { roles: { channels: true } } },
|
|
94
|
+
});
|
|
95
|
+
const canManage = await this.roleService.activeUserHasPermissionsOfRoles(ctx, entity.user.roles.map(role => role.id));
|
|
96
|
+
if (!canManage) {
|
|
97
|
+
throw new common_2.EntityNotFoundError('ApiKey', id);
|
|
78
98
|
}
|
|
79
|
-
return
|
|
99
|
+
return entity;
|
|
80
100
|
}
|
|
81
101
|
/**
|
|
82
102
|
* @description
|
|
@@ -110,7 +130,7 @@ let ApiKeyService = class ApiKeyService {
|
|
|
110
130
|
* You are responsible for avoiding privilege escalation by verifying this ID.
|
|
111
131
|
*/
|
|
112
132
|
userIdApiKeyUser) {
|
|
113
|
-
const roles = await this.
|
|
133
|
+
const roles = await this.assertActiveUserHasPermissionsOfRoles(ctx, input.roleIds);
|
|
114
134
|
const ownerUser = await this.connection.getEntityOrThrow(ctx, entity_1.User, userIdOwner);
|
|
115
135
|
const strategy = this.getApiKeyStrategyByApiType(ctx.apiType);
|
|
116
136
|
const lookupId = await strategy.generateLookupId(ctx);
|
|
@@ -120,6 +140,13 @@ let ApiKeyService = class ApiKeyService {
|
|
|
120
140
|
relations: { roles: { channels: true } },
|
|
121
141
|
})
|
|
122
142
|
: await this.userService.createApiKeyUser(ctx, roles, this.generateApiKeyUserIdentifier(lookupId));
|
|
143
|
+
if (userIdApiKeyUser) {
|
|
144
|
+
// The session binds to this existing User, whose Roles may exceed the caller's, so the
|
|
145
|
+
// returned secret would be a credential more powerful than the caller. Guard the
|
|
146
|
+
// impersonation path the same way rotate/update/softDelete do. The other branch builds a
|
|
147
|
+
// User from `roles`, already checked above. (GHSA-37xp-mjp8-6f9x)
|
|
148
|
+
await this.assertActiveUserHasPermissionsOfRoles(ctx, apiKeyUser.roles.map(role => role.id));
|
|
149
|
+
}
|
|
123
150
|
const secret = await strategy.generateSecret(ctx);
|
|
124
151
|
const apiKey = strategy.constructApiKey(lookupId, secret);
|
|
125
152
|
const hash = await strategy.hashingStrategy.hash(apiKey);
|
|
@@ -151,12 +178,13 @@ let ApiKeyService = class ApiKeyService {
|
|
|
151
178
|
* @throws {EntityNotFoundError} If API-Key cannot be found
|
|
152
179
|
*/
|
|
153
180
|
async update(ctx, input, relations) {
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
181
|
+
// The caller must already hold every Permission the key's user holds before they may modify
|
|
182
|
+
// the key. Without this an Administrator holding only UpdateApiKey could rename a
|
|
183
|
+
// higher-privileged key or strip its roles. The incoming-roleIds check below additionally
|
|
184
|
+
// stops them raising a key's power.
|
|
185
|
+
const entity = await this.getManageableApiKeyOrThrow(ctx, input.id);
|
|
158
186
|
if (input.roleIds) {
|
|
159
|
-
entity.user.roles = await this.
|
|
187
|
+
entity.user.roles = await this.assertActiveUserHasPermissionsOfRoles(ctx, input.roleIds);
|
|
160
188
|
}
|
|
161
189
|
const apiKey = await this.translatableSaver.update({
|
|
162
190
|
ctx,
|
|
@@ -180,12 +208,12 @@ let ApiKeyService = class ApiKeyService {
|
|
|
180
208
|
* @description
|
|
181
209
|
* Soft-Deletes an API-Key and removes its session. Is Channel-Aware.
|
|
182
210
|
*
|
|
183
|
-
* @throws {EntityNotFoundError} If API-Key cannot be found
|
|
211
|
+
* @throws {EntityNotFoundError} If API-Key cannot be found, or the active User does not hold every
|
|
212
|
+
* Permission granted by the key's User
|
|
184
213
|
*/
|
|
185
214
|
async softDelete(ctx, id) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
});
|
|
215
|
+
// Without this an Administrator holding only DeleteApiKey could delete a higher-privileged key.
|
|
216
|
+
const apiKey = await this.getManageableApiKeyOrThrow(ctx, id);
|
|
189
217
|
const hasAuthMethod = await this.connection.getRepository(ctx, entity_1.AuthenticationMethod).existsBy({
|
|
190
218
|
user: { id: apiKey.userId },
|
|
191
219
|
});
|
|
@@ -213,15 +241,16 @@ let ApiKeyService = class ApiKeyService {
|
|
|
213
241
|
* This is a convenience method to invalidate an API-Key without
|
|
214
242
|
* deleting the underlying roles and permissions.
|
|
215
243
|
*
|
|
216
|
-
* @throws {EntityNotFoundError} If API-Key cannot be found
|
|
244
|
+
* @throws {EntityNotFoundError} If API-Key cannot be found, or the active User does not hold every
|
|
245
|
+
* Permission granted by the key's User
|
|
217
246
|
*/
|
|
218
247
|
async rotate(ctx, id) {
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
248
|
+
// The rotated secret authenticates as the key's underlying User, whose Roles may exceed the
|
|
249
|
+
// caller's. Without this check an Administrator holding only UpdateApiKey could rotate a
|
|
250
|
+
// higher-privileged key and receive a working credential for it. Runs before any mutation,
|
|
251
|
+
// so a rejected rotate leaves the existing secret intact. The Roles and their Channels are
|
|
252
|
+
// also needed for the new session.
|
|
253
|
+
const entity = await this.getManageableApiKeyOrThrow(ctx, id);
|
|
225
254
|
const strategy = this.getApiKeyStrategyByApiType(ctx.apiType);
|
|
226
255
|
const secret = await strategy.generateSecret(ctx);
|
|
227
256
|
const apiKey = strategy.constructApiKey(entity.lookupId, secret);
|
|
@@ -240,11 +269,18 @@ let ApiKeyService = class ApiKeyService {
|
|
|
240
269
|
*/
|
|
241
270
|
async findOne(ctx, id, relations) {
|
|
242
271
|
const entity = await this.connection.findOneInChannel(ctx, api_key_entity_1.ApiKey, id, ctx.channelId, {
|
|
243
|
-
|
|
272
|
+
// The User's Roles are always loaded, since the visibility check is based on them.
|
|
273
|
+
relations: (0, unique_1.unique)([...(relations !== null && relations !== void 0 ? relations : []), 'user', 'user.roles']),
|
|
244
274
|
where: { deletedAt: (0, typeorm_1.IsNull)() },
|
|
245
275
|
});
|
|
246
276
|
if (!entity)
|
|
247
277
|
return null;
|
|
278
|
+
// Hide a key the caller could not manage, so its metadata is not disclosed by id lookup to an
|
|
279
|
+
// Administrator who does not hold the key's permissions. Same rule as the mutations, so the read
|
|
280
|
+
// and write policies cannot drift apart. (GHSA-37xp-mjp8-6f9x)
|
|
281
|
+
const visible = await this.roleService.activeUserHasPermissionsOfRoles(ctx, entity.user.roles.map(role => role.id));
|
|
282
|
+
if (!visible)
|
|
283
|
+
return null;
|
|
248
284
|
return this.translator.translate(entity, ctx);
|
|
249
285
|
}
|
|
250
286
|
/**
|
|
@@ -252,17 +288,49 @@ let ApiKeyService = class ApiKeyService {
|
|
|
252
288
|
* Is channel-/ and soft-delete aware, translates the entity as well.
|
|
253
289
|
*/
|
|
254
290
|
async findAll(ctx, options, relations) {
|
|
255
|
-
|
|
256
|
-
.build(api_key_entity_1.ApiKey, options, {
|
|
291
|
+
const qb = this.listQueryBuilder.build(api_key_entity_1.ApiKey, options, {
|
|
257
292
|
ctx,
|
|
258
293
|
relations,
|
|
259
294
|
channelId: ctx.channelId,
|
|
260
295
|
where: { deletedAt: (0, typeorm_1.IsNull)() },
|
|
261
|
-
})
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
296
|
+
});
|
|
297
|
+
// Restrict to keys the caller may manage, applied to the query so pagination and totalItems
|
|
298
|
+
// stay correct. (GHSA-37xp-mjp8-6f9x)
|
|
299
|
+
await this.restrictToVisibleApiKeys(ctx, qb);
|
|
300
|
+
const [keys, totalItems] = await qb.getManyAndCount();
|
|
301
|
+
const items = keys.map(key => this.translator.translate(key, ctx));
|
|
302
|
+
return { items, totalItems };
|
|
303
|
+
}
|
|
304
|
+
/**
|
|
305
|
+
* Restricts a list query to the API-Keys visible to the active user, by the same
|
|
306
|
+
* {@link RoleService.activeUserHasPermissionsOfRoles} rule that gates the mutations. Applied to the
|
|
307
|
+
* query rather than its result, so totalItems, sorting, filtering and pagination all operate over
|
|
308
|
+
* the visible keys only. Mirrors {@link AdministratorService}'s administrator visibility.
|
|
309
|
+
*/
|
|
310
|
+
async restrictToVisibleApiKeys(ctx, qb) {
|
|
311
|
+
// A SuperAdmin sees every key; getVisibleRoleIds() returns every Role id for them, so the
|
|
312
|
+
// sub-query would exclude nobody. This early return only saves the query.
|
|
313
|
+
if (ctx.userHasPermissions([generated_types_1.Permission.SuperAdmin])) {
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
const visibleRoleIds = await this.roleService.getVisibleRoleIds(ctx);
|
|
317
|
+
// A key is excluded as soon as its User holds a single Role the active user cannot read. A
|
|
318
|
+
// sub-query is used rather than a join, so the key rows are not duplicated by the relations.
|
|
319
|
+
qb.andWhere(outerQb => {
|
|
320
|
+
const hiddenApiKeysQuery = outerQb
|
|
321
|
+
.subQuery()
|
|
322
|
+
.select('visibility_api_key.id')
|
|
323
|
+
.from(api_key_entity_1.ApiKey, 'visibility_api_key')
|
|
324
|
+
.innerJoin('visibility_api_key.user', 'visibility_user')
|
|
325
|
+
.innerJoin('visibility_user.roles', 'visibility_role');
|
|
326
|
+
// With no visible Roles, every Role is hidden, so no condition is needed on the Role.
|
|
327
|
+
if (visibleRoleIds.length) {
|
|
328
|
+
hiddenApiKeysQuery.where('visibility_role.id NOT IN (:...visibleRoleIds)', {
|
|
329
|
+
visibleRoleIds,
|
|
330
|
+
});
|
|
331
|
+
}
|
|
332
|
+
const apiKeyId = `${outerQb.escape(outerQb.alias)}.${outerQb.escape('id')}`;
|
|
333
|
+
return `${apiKeyId} NOT IN ${hiddenApiKeysQuery.getQuery()}`;
|
|
266
334
|
});
|
|
267
335
|
}
|
|
268
336
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../../../src/service/services/api-key.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../../../src/service/services/api-key.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "3.7.4-master-
|
|
3
|
+
"version": "3.7.4-master-202610030211",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@nestjs/platform-express": "^11.0.12",
|
|
52
52
|
"@nestjs/typeorm": "^11.0.0",
|
|
53
53
|
"@types/express": "^5.0.1",
|
|
54
|
-
"@vendure/common": "^3.7.4-master-
|
|
54
|
+
"@vendure/common": "^3.7.4-master-202610030211",
|
|
55
55
|
"bcrypt": "^6.0.0",
|
|
56
56
|
"cookie-session": "^2.1.0",
|
|
57
57
|
"cron-time-generator": "^2.0.3",
|