@vendure/core 2.0.0-next.22 → 2.0.0-next.23
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/middleware/auth-guard.js +1 -1
- package/dist/api/middleware/auth-guard.js.map +1 -1
- package/dist/api/resolvers/admin/facet.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/facet.resolver.js +14 -0
- package/dist/api/resolvers/admin/facet.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/job-entity.resolver.d.ts +2 -0
- package/dist/api/resolvers/entity/job-entity.resolver.js +36 -0
- package/dist/api/resolvers/entity/job-entity.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/facet.api.graphql +8 -0
- package/dist/api/schema/common/common-types.graphql +5 -0
- package/dist/common/types/common-types.d.ts +4 -0
- package/dist/config/config.module.js +2 -1
- package/dist/config/config.module.js.map +1 -1
- package/dist/connection/remove-custom-fields-with-eager-relations.d.ts +1 -1
- package/dist/connection/remove-custom-fields-with-eager-relations.js.map +1 -1
- package/dist/i18n/messages/en.json +1 -0
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +5 -0
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/helpers/utils/get-user-channels-permissions.d.ts +6 -0
- package/dist/service/helpers/utils/get-user-channels-permissions.js +11 -3
- package/dist/service/helpers/utils/get-user-channels-permissions.js.map +1 -1
- package/dist/service/services/administrator.service.d.ts +9 -1
- package/dist/service/services/administrator.service.js +35 -6
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +14 -2
- package/dist/service/services/facet-value.service.js +26 -2
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/history.service.d.ts +94 -4
- package/dist/service/services/history.service.js +90 -0
- package/dist/service/services/history.service.js.map +1 -1
- package/dist/service/services/order.service.js +3 -1
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +14 -1
- package/dist/service/services/role.service.js +55 -11
- package/dist/service/services/role.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -158,7 +158,7 @@ let AuthGuard = class AuthGuard {
|
|
|
158
158
|
return false;
|
|
159
159
|
}
|
|
160
160
|
const parentType = (_a = info === null || info === void 0 ? void 0 : info.parentType) === null || _a === void 0 ? void 0 : _a.name;
|
|
161
|
-
return parentType !== 'Query' && parentType !== 'Mutation';
|
|
161
|
+
return parentType !== 'Query' && parentType !== 'Mutation' && parentType !== 'Subscription';
|
|
162
162
|
}
|
|
163
163
|
};
|
|
164
164
|
AuthGuard = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DeletionResponse, MutationAssignFacetsToChannelArgs, MutationCreateFacetArgs, MutationCreateFacetValuesArgs, MutationDeleteFacetArgs, MutationDeleteFacetsArgs, MutationDeleteFacetValuesArgs, MutationRemoveFacetsFromChannelArgs, MutationUpdateFacetArgs, MutationUpdateFacetValuesArgs, QueryFacetArgs, QueryFacetsArgs, RemoveFacetFromChannelResult } from '@vendure/common/lib/generated-types';
|
|
1
|
+
import { DeletionResponse, MutationAssignFacetsToChannelArgs, MutationCreateFacetArgs, MutationCreateFacetValuesArgs, MutationDeleteFacetArgs, MutationDeleteFacetsArgs, MutationDeleteFacetValuesArgs, MutationRemoveFacetsFromChannelArgs, MutationUpdateFacetArgs, MutationUpdateFacetValuesArgs, QueryFacetArgs, QueryFacetsArgs, QueryFacetValuesArgs, RemoveFacetFromChannelResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { ErrorResultUnion } from '../../../common/index';
|
|
4
4
|
import { Translated } from '../../../common/types/locale-types';
|
|
@@ -16,6 +16,7 @@ export declare class FacetResolver {
|
|
|
16
16
|
constructor(facetService: FacetService, facetValueService: FacetValueService, configService: ConfigService);
|
|
17
17
|
facets(ctx: RequestContext, args: QueryFacetsArgs, relations: RelationPaths<Facet>): Promise<PaginatedList<Translated<Facet>>>;
|
|
18
18
|
facet(ctx: RequestContext, args: QueryFacetArgs, relations: RelationPaths<Facet>): Promise<Translated<Facet> | undefined>;
|
|
19
|
+
facetValues(ctx: RequestContext, args: QueryFacetValuesArgs, relations: RelationPaths<FacetValue>): Promise<PaginatedList<Translated<FacetValue>>>;
|
|
19
20
|
createFacet(ctx: RequestContext, args: MutationCreateFacetArgs): Promise<Translated<Facet>>;
|
|
20
21
|
updateFacet(ctx: RequestContext, args: MutationUpdateFacetArgs): Promise<Translated<Facet>>;
|
|
21
22
|
deleteFacet(ctx: RequestContext, args: MutationDeleteFacetArgs): Promise<DeletionResponse>;
|
|
@@ -17,6 +17,7 @@ const graphql_1 = require("@nestjs/graphql");
|
|
|
17
17
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
18
18
|
const errors_1 = require("../../../common/error/errors");
|
|
19
19
|
const config_service_1 = require("../../../config/config.service");
|
|
20
|
+
const facet_value_entity_1 = require("../../../entity/facet-value/facet-value.entity");
|
|
20
21
|
const facet_entity_1 = require("../../../entity/facet/facet.entity");
|
|
21
22
|
const facet_value_service_1 = require("../../../service/services/facet-value.service");
|
|
22
23
|
const facet_service_1 = require("../../../service/services/facet.service");
|
|
@@ -37,6 +38,9 @@ let FacetResolver = class FacetResolver {
|
|
|
37
38
|
async facet(ctx, args, relations) {
|
|
38
39
|
return this.facetService.findOne(ctx, args.id, relations);
|
|
39
40
|
}
|
|
41
|
+
facetValues(ctx, args, relations) {
|
|
42
|
+
return this.facetValueService.findAllList(ctx, args.options || undefined, relations);
|
|
43
|
+
}
|
|
40
44
|
async createFacet(ctx, args) {
|
|
41
45
|
const { input } = args;
|
|
42
46
|
const facet = await this.facetService.create(ctx, args.input);
|
|
@@ -110,6 +114,16 @@ __decorate([
|
|
|
110
114
|
__metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
|
|
111
115
|
__metadata("design:returntype", Promise)
|
|
112
116
|
], FacetResolver.prototype, "facet", null);
|
|
117
|
+
__decorate([
|
|
118
|
+
(0, graphql_1.Query)(),
|
|
119
|
+
(0, allow_decorator_1.Allow)(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadProduct, generated_types_1.Permission.ReadFacet),
|
|
120
|
+
__param(0, (0, request_context_decorator_1.Ctx)()),
|
|
121
|
+
__param(1, (0, graphql_1.Args)()),
|
|
122
|
+
__param(2, (0, relations_decorator_1.Relations)(facet_value_entity_1.FacetValue)),
|
|
123
|
+
__metadata("design:type", Function),
|
|
124
|
+
__metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
|
|
125
|
+
__metadata("design:returntype", Promise)
|
|
126
|
+
], FacetResolver.prototype, "facetValues", null);
|
|
113
127
|
__decorate([
|
|
114
128
|
(0, transaction_decorator_1.Transaction)(),
|
|
115
129
|
(0, graphql_1.Mutation)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/facet.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"facet.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/facet.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.JobEntityResolver = void 0;
|
|
16
16
|
const graphql_1 = require("@nestjs/graphql");
|
|
17
|
+
const omit_1 = require("@vendure/common/lib/omit");
|
|
18
|
+
const pick_1 = require("@vendure/common/lib/pick");
|
|
17
19
|
const job_1 = require("../../../job-queue/job");
|
|
18
20
|
let JobEntityResolver = class JobEntityResolver {
|
|
19
21
|
constructor() {
|
|
@@ -22,6 +24,33 @@ let JobEntityResolver = class JobEntityResolver {
|
|
|
22
24
|
async duration(job) {
|
|
23
25
|
return Math.min(job.duration, this.graphQlMaxInt);
|
|
24
26
|
}
|
|
27
|
+
async data(job) {
|
|
28
|
+
const ctx = job.data.ctx;
|
|
29
|
+
if (this.isSerializedRequestContext(ctx)) {
|
|
30
|
+
// The job data includes a serialized RequestContext object
|
|
31
|
+
// This can be very large, so we will manually prune it before
|
|
32
|
+
// returning
|
|
33
|
+
const prunedCtx = Object.assign(Object.assign({}, (0, pick_1.pick)(ctx, [
|
|
34
|
+
'_apiType',
|
|
35
|
+
'_languageCode',
|
|
36
|
+
'_authorizedAsOwnerOnly',
|
|
37
|
+
'_isAuthorized',
|
|
38
|
+
'_channel',
|
|
39
|
+
])), { _session: ctx._session
|
|
40
|
+
? Object.assign(Object.assign({}, ctx._session), { user: ctx._session.user ? (0, omit_1.omit)(ctx._session.user, ['channelPermissions']) : {} }) : {} });
|
|
41
|
+
job.data.ctx = prunedCtx;
|
|
42
|
+
}
|
|
43
|
+
return job.data;
|
|
44
|
+
}
|
|
45
|
+
isSerializedRequestContext(input) {
|
|
46
|
+
if (typeof input !== 'object' || input == null) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
return (typeof input === 'object' &&
|
|
50
|
+
input.hasOwnProperty('_apiType') &&
|
|
51
|
+
input.hasOwnProperty('_channel') &&
|
|
52
|
+
input.hasOwnProperty('_languageCode'));
|
|
53
|
+
}
|
|
25
54
|
};
|
|
26
55
|
__decorate([
|
|
27
56
|
(0, graphql_1.ResolveField)(),
|
|
@@ -30,6 +59,13 @@ __decorate([
|
|
|
30
59
|
__metadata("design:paramtypes", [job_1.Job]),
|
|
31
60
|
__metadata("design:returntype", Promise)
|
|
32
61
|
], JobEntityResolver.prototype, "duration", null);
|
|
62
|
+
__decorate([
|
|
63
|
+
(0, graphql_1.ResolveField)(),
|
|
64
|
+
__param(0, (0, graphql_1.Parent)()),
|
|
65
|
+
__metadata("design:type", Function),
|
|
66
|
+
__metadata("design:paramtypes", [job_1.Job]),
|
|
67
|
+
__metadata("design:returntype", Promise)
|
|
68
|
+
], JobEntityResolver.prototype, "data", null);
|
|
33
69
|
JobEntityResolver = __decorate([
|
|
34
70
|
(0, graphql_1.Resolver)('Job')
|
|
35
71
|
], JobEntityResolver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/job-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;
|
|
1
|
+
{"version":3,"file":"job-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/job-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AACjE,mDAAgD;AAChD,mDAAgD;AAEhD,gDAA6C;AAI7C,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACqB,kBAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IA6CjD,CAAC;IA1CG,KAAK,CAAC,QAAQ,CAAW,GAAQ;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;IAGD,KAAK,CAAC,IAAI,CAAW,GAAQ;QACzB,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;QACzB,IAAI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE;YACtC,2DAA2D;YAC3D,8DAA8D;YAC9D,YAAY;YACZ,MAAM,SAAS,mCACR,IAAA,WAAI,EAAC,GAAG,EAAE;gBACT,UAAU;gBACV,eAAe;gBACf,wBAAwB;gBACxB,eAAe;gBACf,UAAU;aACb,CAAC,KACF,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBAClB,CAAC,iCACQ,GAAG,CAAC,QAAQ,KACf,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAEpF,CAAC,CAAC,EAAE,GACX,CAAC;YACF,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;SAC5B;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IACpB,CAAC;IAEO,0BAA0B,CAAC,KAAc;QAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,IAAI,EAAE;YAC5C,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC;YAChC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC;YAChC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CACxC,CAAC;IACN,CAAC;CACJ,CAAA;AA1CG;IADC,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAM,SAAG;;iDAEhC;AAGD;IADC,IAAA,sBAAY,GAAE;IACH,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAM,SAAG;;6CAwB5B;AAjCQ,iBAAiB;IAD7B,IAAA,kBAAQ,EAAC,KAAK,CAAC;GACH,iBAAiB,CA8C7B;AA9CY,8CAAiB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
type Query {
|
|
2
2
|
facets(options: FacetListOptions): FacetList!
|
|
3
3
|
facet(id: ID!): Facet
|
|
4
|
+
facetValues(options: FacetValueListOptions): FacetValueList!
|
|
4
5
|
}
|
|
5
6
|
|
|
6
7
|
type Mutation {
|
|
@@ -34,6 +35,8 @@ type Mutation {
|
|
|
34
35
|
|
|
35
36
|
# generated by generateListOptions function
|
|
36
37
|
input FacetListOptions
|
|
38
|
+
# generated by generateListOptions function
|
|
39
|
+
input FacetValueListOptions
|
|
37
40
|
|
|
38
41
|
input FacetTranslationInput {
|
|
39
42
|
id: ID
|
|
@@ -88,6 +91,11 @@ input RemoveFacetsFromChannelInput {
|
|
|
88
91
|
force: Boolean
|
|
89
92
|
}
|
|
90
93
|
|
|
94
|
+
type FacetValueList implements PaginatedList {
|
|
95
|
+
items: [FacetValue!]!
|
|
96
|
+
totalItems: Int!
|
|
97
|
+
}
|
|
98
|
+
|
|
91
99
|
type FacetInUseError implements ErrorResult {
|
|
92
100
|
errorCode: ErrorCode!
|
|
93
101
|
message: String!
|
|
@@ -82,6 +82,7 @@ input StringOperators {
|
|
|
82
82
|
in: [String!]
|
|
83
83
|
notIn: [String!]
|
|
84
84
|
regex: String
|
|
85
|
+
isNull: Boolean
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
"Operators for filtering on an ID field"
|
|
@@ -90,11 +91,13 @@ input IDOperators {
|
|
|
90
91
|
notEq: String
|
|
91
92
|
in: [String!]
|
|
92
93
|
notIn: [String!]
|
|
94
|
+
isNull: Boolean
|
|
93
95
|
}
|
|
94
96
|
|
|
95
97
|
"Operators for filtering on a Boolean field"
|
|
96
98
|
input BooleanOperators {
|
|
97
99
|
eq: Boolean
|
|
100
|
+
isNull: Boolean
|
|
98
101
|
}
|
|
99
102
|
|
|
100
103
|
input NumberRange {
|
|
@@ -110,6 +113,7 @@ input NumberOperators {
|
|
|
110
113
|
gt: Float
|
|
111
114
|
gte: Float
|
|
112
115
|
between: NumberRange
|
|
116
|
+
isNull: Boolean
|
|
113
117
|
}
|
|
114
118
|
|
|
115
119
|
input DateRange {
|
|
@@ -123,6 +127,7 @@ input DateOperators {
|
|
|
123
127
|
before: DateTime
|
|
124
128
|
after: DateTime
|
|
125
129
|
between: DateRange
|
|
130
|
+
isNull: Boolean
|
|
126
131
|
}
|
|
127
132
|
|
|
128
133
|
"Operators for filtering on a list of String fields"
|
|
@@ -94,9 +94,11 @@ export interface StringOperators {
|
|
|
94
94
|
in?: string[];
|
|
95
95
|
notIn?: string[];
|
|
96
96
|
regex?: string;
|
|
97
|
+
isNull?: boolean;
|
|
97
98
|
}
|
|
98
99
|
export interface BooleanOperators {
|
|
99
100
|
eq?: boolean;
|
|
101
|
+
isNull?: boolean;
|
|
100
102
|
}
|
|
101
103
|
export interface NumberRange {
|
|
102
104
|
start: number;
|
|
@@ -109,6 +111,7 @@ export interface NumberOperators {
|
|
|
109
111
|
gt?: number;
|
|
110
112
|
gte?: number;
|
|
111
113
|
between?: NumberRange;
|
|
114
|
+
isNull?: boolean;
|
|
112
115
|
}
|
|
113
116
|
export interface DateRange {
|
|
114
117
|
start: Date;
|
|
@@ -119,6 +122,7 @@ export interface DateOperators {
|
|
|
119
122
|
before?: Date;
|
|
120
123
|
after?: Date;
|
|
121
124
|
between?: DateRange;
|
|
125
|
+
isNull?: boolean;
|
|
122
126
|
}
|
|
123
127
|
export interface ListOperators {
|
|
124
128
|
inList?: string | number | boolean | Date;
|
|
@@ -67,7 +67,7 @@ let ConfigModule = class ConfigModule {
|
|
|
67
67
|
const { assetNamingStrategy, assetPreviewStrategy, assetStorageStrategy } = this.configService.assetOptions;
|
|
68
68
|
const { productVariantPriceCalculationStrategy, stockDisplayStrategy } = this.configService.catalogOptions;
|
|
69
69
|
const { adminAuthenticationStrategy, shopAuthenticationStrategy, sessionCacheStrategy, passwordHashingStrategy, passwordValidationStrategy, } = this.configService.authOptions;
|
|
70
|
-
const { taxZoneStrategy } = this.configService.taxOptions;
|
|
70
|
+
const { taxZoneStrategy, taxLineCalculationStrategy } = this.configService.taxOptions;
|
|
71
71
|
const { jobQueueStrategy, jobBufferStorageStrategy } = this.configService.jobQueueOptions;
|
|
72
72
|
const { mergeStrategy, checkoutMergeStrategy, orderItemPriceCalculationStrategy, process, orderCodeStrategy, orderByCodeAccessStrategy, stockAllocationStrategy, activeOrderStrategy, } = this.configService.orderOptions;
|
|
73
73
|
const { customFulfillmentProcess } = this.configService.shippingOptions;
|
|
@@ -86,6 +86,7 @@ let ConfigModule = class ConfigModule {
|
|
|
86
86
|
assetPreviewStrategy,
|
|
87
87
|
assetStorageStrategy,
|
|
88
88
|
taxZoneStrategy,
|
|
89
|
+
taxLineCalculationStrategy,
|
|
89
90
|
jobQueueStrategy,
|
|
90
91
|
jobBufferStorageStrategy,
|
|
91
92
|
mergeStrategy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AACvF,uCAAyC;AACzC,mEAAsE;AAGtE,iDAA8C;AAG9C,qDAA+C;AAC/C,qDAAiD;AAMjD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAAoB,aAA4B,EAAU,SAAoB;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAAU,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAElF,KAAK,CAAC,sBAAsB;QACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC3C;;;;;;WAMG;QACH,IAAA,4BAAW,GAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,wBAAwB;QAClC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBACrC,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACjC;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACrC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,uBAAuB,EAAE,EAAE;YACnD,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE;gBACxC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACpC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;IACL,CAAC;IAEO,KAAK,CAAC,6BAA6B;QACvC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE;YACtD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAEO,uBAAuB;QAC3B,MAAM,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GACrE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,sCAAsC,EAAE,oBAAoB,EAAE,GAClE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACtC,MAAM,EACF,2BAA2B,EAC3B,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,GAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QACnC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,4 +31,4 @@ import { SelectQueryBuilder } from 'typeorm';
|
|
|
31
31
|
*
|
|
32
32
|
* TODO: Ideally create a minimal reproduction case and report in the TypeORM repo for an upstream fix.
|
|
33
33
|
*/
|
|
34
|
-
export declare function removeCustomFieldsWithEagerRelations(qb: SelectQueryBuilder<any>, relations?:
|
|
34
|
+
export declare function removeCustomFieldsWithEagerRelations<T extends string>(qb: SelectQueryBuilder<any>, relations?: T[]): T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-custom-fields-with-eager-relations.js","sourceRoot":"","sources":["../../src/connection/remove-custom-fields-with-eager-relations.ts"],"names":[],"mappings":";;;AAEA,2CAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,SAAgB,oCAAoC,CAChD,EAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"remove-custom-fields-with-eager-relations.js","sourceRoot":"","sources":["../../src/connection/remove-custom-fields-with-eager-relations.ts"],"names":[],"mappings":";;;AAEA,2CAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,SAAgB,oCAAoC,CAChD,EAA2B,EAC3B,YAAiB,EAAE;IAEnB,IAAI,kBAAkB,GAAG,SAAS,CAAC;IACnC,MAAM,SAAS,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC;IAC7C,MAAM,oBAAoB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAC3D,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,KAAK,cAAc,CACvD,CAAC;IACF,IAAI,oBAAoB,EAAE;QACtB,MAAM,sCAAsC,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC5F,OAAO,CACH,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;gBAC7E,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CACzC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,KAAK,cAAc,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CACpF,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;QACH,KAAK,MAAM,QAAQ,IAAI,sCAAsC,EAAE;YAC3D,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;YAC3C,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC,CAAC;YAC9F,IAAI,iBAAiB,CAAC,MAAM,EAAE;gBAC1B,cAAM,CAAC,KAAK,CACR,gFAAgF,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,IAAI,iBAAiB,YAAY,GAAG,CAC3I,CAAC;gBACF,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC,CAAC;aAC7F;SACJ;KACJ;IACD,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AA9BD,oFA8BC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"error": {
|
|
3
|
+
"active-user-does-not-have-sufficient-permissions": "Active user does not have sufficient permissions",
|
|
3
4
|
"cannot-delete-role": "The role '{ roleCode }' cannot be deleted",
|
|
4
5
|
"cannot-delete-sole-superadmin": "The sole SuperAdmin cannot be deleted",
|
|
5
6
|
"cannot-locate-customer-for-user": "Cannot locate a Customer for the user",
|
|
@@ -122,6 +122,11 @@ function buildWhereCondition(fieldName, operator, operand, argIndex, dbType) {
|
|
|
122
122
|
[`arg${argIndex}_b`]: convertDate(operand.end),
|
|
123
123
|
},
|
|
124
124
|
};
|
|
125
|
+
case 'isNull':
|
|
126
|
+
return {
|
|
127
|
+
clause: operand === true ? `${fieldName} IS NULL` : `${fieldName} IS NOT NULL`,
|
|
128
|
+
parameters: {},
|
|
129
|
+
};
|
|
125
130
|
default:
|
|
126
131
|
(0, shared_utils_1.assertNever)(operator);
|
|
127
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Permission } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
|
+
import { Role } from '../../../entity/index';
|
|
3
4
|
import { User } from '../../../entity/user/user.entity';
|
|
4
5
|
export interface UserChannelPermissions {
|
|
5
6
|
id: ID;
|
|
@@ -11,3 +12,8 @@ export interface UserChannelPermissions {
|
|
|
11
12
|
* Returns an array of Channels and permissions on those Channels for the given User.
|
|
12
13
|
*/
|
|
13
14
|
export declare function getUserChannelsPermissions(user: User): UserChannelPermissions[];
|
|
15
|
+
/**
|
|
16
|
+
* @description
|
|
17
|
+
* Returns an array of Channels and permissions on those Channels for the given Roles.
|
|
18
|
+
*/
|
|
19
|
+
export declare function getChannelPermissions(roles: Role[]): UserChannelPermissions[];
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getUserChannelsPermissions = void 0;
|
|
3
|
+
exports.getChannelPermissions = exports.getUserChannelsPermissions = void 0;
|
|
4
4
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
5
5
|
/**
|
|
6
6
|
* Returns an array of Channels and permissions on those Channels for the given User.
|
|
7
7
|
*/
|
|
8
8
|
function getUserChannelsPermissions(user) {
|
|
9
|
+
return getChannelPermissions(user.roles);
|
|
10
|
+
}
|
|
11
|
+
exports.getUserChannelsPermissions = getUserChannelsPermissions;
|
|
12
|
+
/**
|
|
13
|
+
* @description
|
|
14
|
+
* Returns an array of Channels and permissions on those Channels for the given Roles.
|
|
15
|
+
*/
|
|
16
|
+
function getChannelPermissions(roles) {
|
|
9
17
|
const channelsMap = {};
|
|
10
|
-
for (const role of
|
|
18
|
+
for (const role of roles) {
|
|
11
19
|
for (const channel of role.channels) {
|
|
12
20
|
if (!channelsMap[channel.code]) {
|
|
13
21
|
channelsMap[channel.code] = {
|
|
@@ -25,5 +33,5 @@ function getUserChannelsPermissions(user) {
|
|
|
25
33
|
}
|
|
26
34
|
return Object.values(channelsMap).sort((a, b) => (a.id < b.id ? -1 : 1));
|
|
27
35
|
}
|
|
28
|
-
exports.
|
|
36
|
+
exports.getChannelPermissions = getChannelPermissions;
|
|
29
37
|
//# sourceMappingURL=get-user-channels-permissions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-user-channels-permissions.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/get-user-channels-permissions.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;
|
|
1
|
+
{"version":3,"file":"get-user-channels-permissions.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/get-user-channels-permissions.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;AAYpD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACjD,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AAFD,gEAEC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,KAAa;IAC/C,MAAM,WAAW,GAA+C,EAAE,CAAC;IAEnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;oBACxB,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,EAAE;iBAClB,CAAC;aACL;YACD,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,IAAA,eAAM,EAAC;gBAC3C,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW;gBACxC,GAAG,IAAI,CAAC,WAAW;aACtB,CAAC,CAAC;SACN;KACJ;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AArBD,sDAqBC"}
|
|
@@ -10,6 +10,7 @@ import { EventBus } from '../../event-bus';
|
|
|
10
10
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
11
11
|
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
12
12
|
import { PasswordCipher } from '../helpers/password-cipher/password-cipher';
|
|
13
|
+
import { RequestContextService } from '../helpers/request-context/request-context.service';
|
|
13
14
|
import { RoleService } from './role.service';
|
|
14
15
|
import { UserService } from './user.service';
|
|
15
16
|
/**
|
|
@@ -27,7 +28,8 @@ export declare class AdministratorService {
|
|
|
27
28
|
private roleService;
|
|
28
29
|
private customFieldRelationService;
|
|
29
30
|
private eventBus;
|
|
30
|
-
|
|
31
|
+
private requestContextService;
|
|
32
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, passwordCipher: PasswordCipher, userService: UserService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, requestContextService: RequestContextService);
|
|
31
33
|
/** @internal */
|
|
32
34
|
initAdministrators(): Promise<void>;
|
|
33
35
|
/**
|
|
@@ -55,6 +57,12 @@ export declare class AdministratorService {
|
|
|
55
57
|
* Update an existing Administrator.
|
|
56
58
|
*/
|
|
57
59
|
update(ctx: RequestContext, input: UpdateAdministratorInput): Promise<Administrator>;
|
|
60
|
+
/**
|
|
61
|
+
* @description
|
|
62
|
+
* Checks that the active user is allowed to grant the specified Roles when creating or
|
|
63
|
+
* updating an Administrator.
|
|
64
|
+
*/
|
|
65
|
+
private checkActiveUserCanGrantRoles;
|
|
58
66
|
/**
|
|
59
67
|
* @description
|
|
60
68
|
* Assigns a Role to the Administrator's User entity.
|
|
@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.AdministratorService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
15
|
-
const request_context_1 = require("../../api/common/request-context");
|
|
16
15
|
const errors_1 = require("../../common/error/errors");
|
|
17
16
|
const index_1 = require("../../common/index");
|
|
18
17
|
const config_1 = require("../../config");
|
|
19
18
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
20
19
|
const administrator_entity_1 = require("../../entity/administrator/administrator.entity");
|
|
21
20
|
const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
|
|
21
|
+
const index_2 = require("../../entity/index");
|
|
22
22
|
const user_entity_1 = require("../../entity/user/user.entity");
|
|
23
23
|
const event_bus_1 = require("../../event-bus");
|
|
24
24
|
const administrator_event_1 = require("../../event-bus/events/administrator-event");
|
|
@@ -26,6 +26,8 @@ const role_change_event_1 = require("../../event-bus/events/role-change-event");
|
|
|
26
26
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
27
27
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
28
28
|
const password_cipher_1 = require("../helpers/password-cipher/password-cipher");
|
|
29
|
+
const request_context_service_1 = require("../helpers/request-context/request-context.service");
|
|
30
|
+
const get_user_channels_permissions_1 = require("../helpers/utils/get-user-channels-permissions");
|
|
29
31
|
const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
30
32
|
const role_service_1 = require("./role.service");
|
|
31
33
|
const user_service_1 = require("./user.service");
|
|
@@ -36,7 +38,7 @@ const user_service_1 = require("./user.service");
|
|
|
36
38
|
* @docsCategory services
|
|
37
39
|
*/
|
|
38
40
|
let AdministratorService = class AdministratorService {
|
|
39
|
-
constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService, eventBus) {
|
|
41
|
+
constructor(connection, configService, listQueryBuilder, passwordCipher, userService, roleService, customFieldRelationService, eventBus, requestContextService) {
|
|
40
42
|
this.connection = connection;
|
|
41
43
|
this.configService = configService;
|
|
42
44
|
this.listQueryBuilder = listQueryBuilder;
|
|
@@ -45,6 +47,7 @@ let AdministratorService = class AdministratorService {
|
|
|
45
47
|
this.roleService = roleService;
|
|
46
48
|
this.customFieldRelationService = customFieldRelationService;
|
|
47
49
|
this.eventBus = eventBus;
|
|
50
|
+
this.requestContextService = requestContextService;
|
|
48
51
|
}
|
|
49
52
|
/** @internal */
|
|
50
53
|
async initAdministrators() {
|
|
@@ -97,6 +100,7 @@ let AdministratorService = class AdministratorService {
|
|
|
97
100
|
* Create a new Administrator.
|
|
98
101
|
*/
|
|
99
102
|
async create(ctx, input) {
|
|
103
|
+
await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
|
|
100
104
|
const administrator = new administrator_entity_1.Administrator(input);
|
|
101
105
|
administrator.user = await this.userService.createAdminUser(ctx, input.emailAddress, input.password);
|
|
102
106
|
let createdAdministrator = await this.connection
|
|
@@ -118,6 +122,9 @@ let AdministratorService = class AdministratorService {
|
|
|
118
122
|
if (!administrator) {
|
|
119
123
|
throw new errors_1.EntityNotFoundError('Administrator', input.id);
|
|
120
124
|
}
|
|
125
|
+
if (input.roleIds) {
|
|
126
|
+
await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
|
|
127
|
+
}
|
|
121
128
|
let updatedAdministrator = (0, patch_entity_1.patchEntity)(administrator, input);
|
|
122
129
|
await this.connection.getRepository(ctx, administrator_entity_1.Administrator).save(administrator, { reload: false });
|
|
123
130
|
if (input.emailAddress) {
|
|
@@ -156,6 +163,23 @@ let AdministratorService = class AdministratorService {
|
|
|
156
163
|
this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, administrator, 'updated', input));
|
|
157
164
|
return updatedAdministrator;
|
|
158
165
|
}
|
|
166
|
+
/**
|
|
167
|
+
* @description
|
|
168
|
+
* Checks that the active user is allowed to grant the specified Roles when creating or
|
|
169
|
+
* updating an Administrator.
|
|
170
|
+
*/
|
|
171
|
+
async checkActiveUserCanGrantRoles(ctx, roleIds) {
|
|
172
|
+
const roles = await this.connection
|
|
173
|
+
.getRepository(ctx, index_2.Role)
|
|
174
|
+
.findByIds(roleIds, { relations: ['channels'] });
|
|
175
|
+
const permissionsRequired = (0, get_user_channels_permissions_1.getChannelPermissions)(roles);
|
|
176
|
+
for (const channelPermissions of permissionsRequired) {
|
|
177
|
+
const activeUserHasRequiredPermissions = await this.roleService.userHasAllPermissionsOnChannel(ctx, channelPermissions.id, channelPermissions.permissions);
|
|
178
|
+
if (!activeUserHasRequiredPermissions) {
|
|
179
|
+
throw new errors_1.UserInputError('error.active-user-does-not-have-sufficient-permissions');
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
159
183
|
/**
|
|
160
184
|
* @description
|
|
161
185
|
* Assigns a Role to the Administrator's User entity.
|
|
@@ -226,14 +250,18 @@ let AdministratorService = class AdministratorService {
|
|
|
226
250
|
},
|
|
227
251
|
});
|
|
228
252
|
if (!superAdminUser) {
|
|
253
|
+
const ctx = await this.requestContextService.create({ apiType: 'admin' });
|
|
229
254
|
const superAdminRole = await this.roleService.getSuperAdminRole();
|
|
230
|
-
const administrator =
|
|
255
|
+
const administrator = new administrator_entity_1.Administrator({
|
|
231
256
|
emailAddress: superadminCredentials.identifier,
|
|
232
|
-
password: superadminCredentials.password,
|
|
233
257
|
firstName: 'Super',
|
|
234
258
|
lastName: 'Admin',
|
|
235
|
-
roleIds: [superAdminRole.id],
|
|
236
259
|
});
|
|
260
|
+
administrator.user = await this.userService.createAdminUser(ctx, superadminCredentials.identifier, superadminCredentials.password);
|
|
261
|
+
const createdAdministrator = await this.connection
|
|
262
|
+
.getRepository(ctx, administrator_entity_1.Administrator)
|
|
263
|
+
.save(administrator);
|
|
264
|
+
await this.assignRole(ctx, createdAdministrator.id, superAdminRole.id);
|
|
237
265
|
}
|
|
238
266
|
else {
|
|
239
267
|
const superAdministrator = await this.connection.rawConnection
|
|
@@ -275,7 +303,8 @@ AdministratorService = __decorate([
|
|
|
275
303
|
user_service_1.UserService,
|
|
276
304
|
role_service_1.RoleService,
|
|
277
305
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
278
|
-
event_bus_1.EventBus
|
|
306
|
+
event_bus_1.EventBus,
|
|
307
|
+
request_context_service_1.RequestContextService])
|
|
279
308
|
], AdministratorService);
|
|
280
309
|
exports.AdministratorService = AdministratorService;
|
|
281
310
|
//# sourceMappingURL=administrator.service.js.map
|