@vendure/core 3.7.3-master-202608240231 → 3.7.3-master-202608260231

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.
Files changed (35) hide show
  1. package/dist/api/common/request-context.d.ts +27 -6
  2. package/dist/api/common/request-context.js +38 -20
  3. package/dist/api/common/request-context.js.map +1 -1
  4. package/dist/api/resolvers/admin/channel.resolver.d.ts +6 -3
  5. package/dist/api/resolvers/admin/channel.resolver.js +8 -15
  6. package/dist/api/resolvers/admin/channel.resolver.js.map +1 -1
  7. package/dist/api/resolvers/entity/user-entity.resolver.d.ts +3 -1
  8. package/dist/api/resolvers/entity/user-entity.resolver.js +12 -8
  9. package/dist/api/resolvers/entity/user-entity.resolver.js.map +1 -1
  10. package/dist/service/helpers/utils/order-utils.d.ts +11 -0
  11. package/dist/service/helpers/utils/order-utils.js +27 -2
  12. package/dist/service/helpers/utils/order-utils.js.map +1 -1
  13. package/dist/service/services/administrator.service.d.ts +9 -6
  14. package/dist/service/services/administrator.service.js +68 -44
  15. package/dist/service/services/administrator.service.js.map +1 -1
  16. package/dist/service/services/channel.service.d.ts +33 -0
  17. package/dist/service/services/channel.service.js +63 -0
  18. package/dist/service/services/channel.service.js.map +1 -1
  19. package/dist/service/services/customer.service.js +3 -1
  20. package/dist/service/services/customer.service.js.map +1 -1
  21. package/dist/service/services/fulfillment.service.d.ts +13 -0
  22. package/dist/service/services/fulfillment.service.js +27 -0
  23. package/dist/service/services/fulfillment.service.js.map +1 -1
  24. package/dist/service/services/history.service.d.ts +22 -2
  25. package/dist/service/services/history.service.js +40 -4
  26. package/dist/service/services/history.service.js.map +1 -1
  27. package/dist/service/services/order.service.js +11 -1
  28. package/dist/service/services/order.service.js.map +1 -1
  29. package/dist/service/services/payment.service.d.ts +15 -0
  30. package/dist/service/services/payment.service.js +25 -7
  31. package/dist/service/services/payment.service.js.map +1 -1
  32. package/dist/service/services/role.service.d.ts +30 -1
  33. package/dist/service/services/role.service.js +69 -21
  34. package/dist/service/services/role.service.js.map +1 -1
  35. package/package.json +2 -2
@@ -144,35 +144,56 @@ export declare class RequestContext {
144
144
  /**
145
145
  * @description
146
146
  * Returns `true` if there is an active Session & User associated with this request,
147
- * and that User has **at least one** of the specified permissions on the active Channel.
147
+ * and that User has **at least one** of the specified permissions on the given Channel.
148
+ * The Channel defaults to the active Channel of this request.
148
149
  *
149
150
  * This method uses OR logic - it checks if the user has ANY of the given permissions,
150
151
  * not ALL of them. For AND logic, use {@link userHasAllPermissions}.
151
152
  *
152
153
  * @example
153
154
  * ```ts
154
- * // Returns true if user has ReadProduct OR ReadCatalog
155
+ * // Returns true if user has ReadProduct OR ReadCatalog on the active Channel
155
156
  * ctx.userHasPermissions([Permission.ReadProduct, Permission.ReadCatalog]);
157
+ *
158
+ * // Returns true if user has UpdateChannel on the Channel with the given id
159
+ * ctx.userHasPermissions([Permission.UpdateChannel], channelId);
156
160
  * ```
161
+ *
162
+ * @param permissions The permissions to check for.
163
+ * @param channelId The id of the Channel to check the permissions on. Defaults to the
164
+ * active Channel of this request. Since 3.7.3.
157
165
  */
158
- userHasPermissions(permissions: Permission[]): boolean;
166
+ userHasPermissions(permissions: Permission[], channelId?: ID): boolean;
159
167
  /**
160
168
  * @description
161
169
  * Returns `true` if there is an active Session & User associated with this request,
162
- * and that User has **all** of the specified permissions on the active Channel.
170
+ * and that User has **all** of the specified permissions on the given Channel.
171
+ * The Channel defaults to the active Channel of this request.
163
172
  *
164
173
  * This method uses AND logic - it checks if the user has EVERY one of the given permissions.
165
174
  * For OR logic (any permission), use {@link userHasPermissions}.
166
175
  *
167
176
  * @example
168
177
  * ```ts
169
- * // Returns true only if user has BOTH ReadProduct AND UpdateProduct
178
+ * // Returns true only if user has BOTH ReadProduct AND UpdateProduct on the active Channel
170
179
  * ctx.userHasAllPermissions([Permission.ReadProduct, Permission.UpdateProduct]);
180
+ *
181
+ * // Returns true only if user has BOTH permissions on the Channel with the given id
182
+ * ctx.userHasAllPermissions([Permission.ReadProduct, Permission.UpdateProduct], channelId);
171
183
  * ```
172
184
  *
185
+ * @param permissions The permissions to check for.
186
+ * @param channelId The id of the Channel to check the permissions on. Defaults to the
187
+ * active Channel of this request. Since 3.7.3.
188
+ *
173
189
  * @since 3.6.0
174
190
  */
175
- userHasAllPermissions(permissions: Permission[]): boolean;
191
+ userHasAllPermissions(permissions: Permission[], channelId?: ID): boolean;
192
+ /**
193
+ * Returns the permissions the session User holds on the given Channel, or `undefined` if there
194
+ * is no session User, no Channel id, or the User holds no Role on that Channel.
195
+ */
196
+ private getUserPermissionsOnChannel;
176
197
  /**
177
198
  * @description
178
199
  * Serializes the RequestContext object into a JSON-compatible simple object.
@@ -172,57 +172,75 @@ class RequestContext {
172
172
  /**
173
173
  * @description
174
174
  * Returns `true` if there is an active Session & User associated with this request,
175
- * and that User has **at least one** of the specified permissions on the active Channel.
175
+ * and that User has **at least one** of the specified permissions on the given Channel.
176
+ * The Channel defaults to the active Channel of this request.
176
177
  *
177
178
  * This method uses OR logic - it checks if the user has ANY of the given permissions,
178
179
  * not ALL of them. For AND logic, use {@link userHasAllPermissions}.
179
180
  *
180
181
  * @example
181
182
  * ```ts
182
- * // Returns true if user has ReadProduct OR ReadCatalog
183
+ * // Returns true if user has ReadProduct OR ReadCatalog on the active Channel
183
184
  * ctx.userHasPermissions([Permission.ReadProduct, Permission.ReadCatalog]);
185
+ *
186
+ * // Returns true if user has UpdateChannel on the Channel with the given id
187
+ * ctx.userHasPermissions([Permission.UpdateChannel], channelId);
184
188
  * ```
189
+ *
190
+ * @param permissions The permissions to check for.
191
+ * @param channelId The id of the Channel to check the permissions on. Defaults to the
192
+ * active Channel of this request. Since 3.7.3.
185
193
  */
186
- userHasPermissions(permissions) {
187
- var _a;
188
- const user = (_a = this.session) === null || _a === void 0 ? void 0 : _a.user;
189
- if (!user || !this.channelId) {
190
- return false;
191
- }
192
- const permissionsOnChannel = user.channelPermissions.find(c => (0, utils_1.idsAreEqual)(c.id, this.channelId));
194
+ userHasPermissions(permissions, channelId = this.channelId) {
195
+ const permissionsOnChannel = this.getUserPermissionsOnChannel(channelId);
193
196
  if (permissionsOnChannel) {
194
- return this.arraysIntersect(permissionsOnChannel.permissions, permissions);
197
+ return this.arraysIntersect(permissionsOnChannel, permissions);
195
198
  }
196
199
  return false;
197
200
  }
198
201
  /**
199
202
  * @description
200
203
  * Returns `true` if there is an active Session & User associated with this request,
201
- * and that User has **all** of the specified permissions on the active Channel.
204
+ * and that User has **all** of the specified permissions on the given Channel.
205
+ * The Channel defaults to the active Channel of this request.
202
206
  *
203
207
  * This method uses AND logic - it checks if the user has EVERY one of the given permissions.
204
208
  * For OR logic (any permission), use {@link userHasPermissions}.
205
209
  *
206
210
  * @example
207
211
  * ```ts
208
- * // Returns true only if user has BOTH ReadProduct AND UpdateProduct
212
+ * // Returns true only if user has BOTH ReadProduct AND UpdateProduct on the active Channel
209
213
  * ctx.userHasAllPermissions([Permission.ReadProduct, Permission.UpdateProduct]);
214
+ *
215
+ * // Returns true only if user has BOTH permissions on the Channel with the given id
216
+ * ctx.userHasAllPermissions([Permission.ReadProduct, Permission.UpdateProduct], channelId);
210
217
  * ```
211
218
  *
219
+ * @param permissions The permissions to check for.
220
+ * @param channelId The id of the Channel to check the permissions on. Defaults to the
221
+ * active Channel of this request. Since 3.7.3.
222
+ *
212
223
  * @since 3.6.0
213
224
  */
214
- userHasAllPermissions(permissions) {
215
- var _a;
216
- const user = (_a = this.session) === null || _a === void 0 ? void 0 : _a.user;
217
- if (!user || !this.channelId) {
218
- return false;
219
- }
220
- const permissionsOnChannel = user.channelPermissions.find(c => (0, utils_1.idsAreEqual)(c.id, this.channelId));
225
+ userHasAllPermissions(permissions, channelId = this.channelId) {
226
+ const permissionsOnChannel = this.getUserPermissionsOnChannel(channelId);
221
227
  if (permissionsOnChannel) {
222
- return permissions.every(permission => permissionsOnChannel.permissions.includes(permission));
228
+ return permissions.every(permission => permissionsOnChannel.includes(permission));
223
229
  }
224
230
  return false;
225
231
  }
232
+ /**
233
+ * Returns the permissions the session User holds on the given Channel, or `undefined` if there
234
+ * is no session User, no Channel id, or the User holds no Role on that Channel.
235
+ */
236
+ getUserPermissionsOnChannel(channelId) {
237
+ var _a, _b;
238
+ const user = (_a = this.session) === null || _a === void 0 ? void 0 : _a.user;
239
+ if (!user || !channelId) {
240
+ return undefined;
241
+ }
242
+ return (_b = user.channelPermissions.find(c => (0, utils_1.idsAreEqual)(c.id, channelId))) === null || _b === void 0 ? void 0 : _b.permissions;
243
+ }
226
244
  /**
227
245
  * @description
228
246
  * Serializes the RequestContext object into a JSON-compatible simple object.
@@ -1 +1 @@
1
- {"version":3,"file":"request-context.js","sourceRoot":"","sources":["../../../src/api/common/request-context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request-context.js","sourceRoot":"","sources":["../../../src/api/common/request-context.ts"],"names":[],"mappings":"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"}
@@ -3,17 +3,20 @@ import { PaginatedList } from '@vendure/common/lib/shared-types';
3
3
  import { ErrorResultUnion } from '../../../common/error/error-result';
4
4
  import { Channel } from '../../../entity/channel/channel.entity';
5
5
  import { ChannelService } from '../../../service/services/channel.service';
6
- import { RoleService } from '../../../service/services/role.service';
7
6
  import { RequestContext } from '../../common/request-context';
8
7
  export declare class ChannelResolver {
9
8
  private channelService;
10
- private roleService;
11
- constructor(channelService: ChannelService, roleService: RoleService);
9
+ constructor(channelService: ChannelService);
12
10
  channels(ctx: RequestContext, args: QueryChannelsArgs): Promise<PaginatedList<Channel>>;
13
11
  channel(ctx: RequestContext, args: QueryChannelArgs): Promise<Channel | undefined>;
14
12
  activeChannel(ctx: RequestContext): Promise<Channel>;
15
13
  createChannel(ctx: RequestContext, args: MutationCreateChannelArgs): Promise<ErrorResultUnion<CreateChannelResult, Channel>>;
16
14
  updateChannel(ctx: RequestContext, args: MutationUpdateChannelArgs): Promise<ErrorResultUnion<UpdateChannelResult, Channel>>;
17
15
  deleteChannel(ctx: RequestContext, args: MutationDeleteChannelArgs): Promise<DeletionResponse>;
16
+ /**
17
+ * ChannelService.delete() checks the DeleteChannel permission on each Channel before it touches
18
+ * any data, so a Channel outside the scope of the Role is never deleted, whatever happens to the
19
+ * other ids in the same call. See GHSA-22x4-937q-5fr5.
20
+ */
18
21
  deleteChannels(ctx: RequestContext, args: MutationDeleteChannelsArgs): Promise<DeletionResponse[]>;
19
22
  }
@@ -15,17 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.ChannelResolver = void 0;
16
16
  const graphql_1 = require("@nestjs/graphql");
17
17
  const generated_types_1 = require("@vendure/common/lib/generated-types");
18
- const error_result_1 = require("../../../common/error/error-result");
19
18
  const channel_service_1 = require("../../../service/services/channel.service");
20
- const role_service_1 = require("../../../service/services/role.service");
21
19
  const request_context_1 = require("../../common/request-context");
22
20
  const allow_decorator_1 = require("../../decorators/allow.decorator");
23
21
  const request_context_decorator_1 = require("../../decorators/request-context.decorator");
24
22
  const transaction_decorator_1 = require("../../decorators/transaction.decorator");
25
23
  let ChannelResolver = class ChannelResolver {
26
- constructor(channelService, roleService) {
24
+ constructor(channelService) {
27
25
  this.channelService = channelService;
28
- this.roleService = roleService;
29
26
  }
30
27
  async channels(ctx, args) {
31
28
  return this.channelService.findAll(ctx, args.options || undefined);
@@ -37,15 +34,7 @@ let ChannelResolver = class ChannelResolver {
37
34
  return ctx.channel;
38
35
  }
39
36
  async createChannel(ctx, args) {
40
- const result = await this.channelService.create(ctx, args.input);
41
- if ((0, error_result_1.isGraphQlErrorResult)(result)) {
42
- return result;
43
- }
44
- const superAdminRole = await this.roleService.getSuperAdminRole(ctx);
45
- const customerRole = await this.roleService.getCustomerRole(ctx);
46
- await this.roleService.assignRoleToChannel(ctx, superAdminRole.id, result.id);
47
- await this.roleService.assignRoleToChannel(ctx, customerRole.id, result.id);
48
- return result;
37
+ return this.channelService.create(ctx, args.input);
49
38
  }
50
39
  async updateChannel(ctx, args) {
51
40
  return this.channelService.update(ctx, args.input);
@@ -53,6 +42,11 @@ let ChannelResolver = class ChannelResolver {
53
42
  async deleteChannel(ctx, args) {
54
43
  return this.channelService.delete(ctx, args.id);
55
44
  }
45
+ /**
46
+ * ChannelService.delete() checks the DeleteChannel permission on each Channel before it touches
47
+ * any data, so a Channel outside the scope of the Role is never deleted, whatever happens to the
48
+ * other ids in the same call. See GHSA-22x4-937q-5fr5.
49
+ */
56
50
  async deleteChannels(ctx, args) {
57
51
  return Promise.all(args.ids.map(id => this.channelService.delete(ctx, id)));
58
52
  }
@@ -126,7 +120,6 @@ __decorate([
126
120
  ], ChannelResolver.prototype, "deleteChannels", null);
127
121
  exports.ChannelResolver = ChannelResolver = __decorate([
128
122
  (0, graphql_1.Resolver)('Channel'),
129
- __metadata("design:paramtypes", [channel_service_1.ChannelService,
130
- role_service_1.RoleService])
123
+ __metadata("design:paramtypes", [channel_service_1.ChannelService])
131
124
  ], ChannelResolver);
132
125
  //# sourceMappingURL=channel.resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"channel.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/channel.resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"channel.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/channel.resolver.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,13 @@
1
1
  import { AuthenticationMethod as AuthenticationMethodType } from '@vendure/common/lib/generated-types';
2
2
  import { Role } from '../../../entity/role/role.entity';
3
3
  import { User } from '../../../entity/user/user.entity';
4
+ import { RoleService } from '../../../service/services/role.service';
4
5
  import { UserService } from '../../../service/services/user.service';
5
6
  import { RequestContext } from '../../common/request-context';
6
7
  export declare class UserEntityResolver {
7
8
  private userService;
8
- constructor(userService: UserService);
9
+ private roleService;
10
+ constructor(userService: UserService, roleService: RoleService);
9
11
  authenticationMethods(ctx: RequestContext, user: User): Promise<AuthenticationMethodType[]>;
10
12
  roles(ctx: RequestContext, user: User): Promise<Role[]>;
11
13
  }
@@ -14,15 +14,18 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.UserEntityResolver = void 0;
16
16
  const graphql_1 = require("@nestjs/graphql");
17
+ const utils_1 = require("../../../common/utils");
17
18
  const native_authentication_strategy_1 = require("../../../config/auth/native-authentication-strategy");
18
19
  const external_authentication_method_entity_1 = require("../../../entity/authentication-method/external-authentication-method.entity");
19
20
  const user_entity_1 = require("../../../entity/user/user.entity");
21
+ const role_service_1 = require("../../../service/services/role.service");
20
22
  const user_service_1 = require("../../../service/services/user.service");
21
23
  const request_context_1 = require("../../common/request-context");
22
24
  const request_context_decorator_1 = require("../../decorators/request-context.decorator");
23
25
  let UserEntityResolver = class UserEntityResolver {
24
- constructor(userService) {
26
+ constructor(userService, roleService) {
25
27
  this.userService = userService;
28
+ this.roleService = roleService;
26
29
  }
27
30
  async authenticationMethods(ctx, user) {
28
31
  let methodEntities = [];
@@ -35,12 +38,12 @@ let UserEntityResolver = class UserEntityResolver {
35
38
  return methodEntities.map(m => (Object.assign(Object.assign({}, m), { id: m.id.toString(), strategy: m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod ? m.strategy : native_authentication_strategy_1.NATIVE_AUTH_STRATEGY_NAME })));
36
39
  }
37
40
  async roles(ctx, user) {
38
- if (user.roles) {
39
- return user.roles;
40
- }
41
- let roles = [];
42
- roles = await this.userService.getUserById(ctx, user.id).then(u => { var _a; return (_a = u === null || u === void 0 ? void 0 : u.roles) !== null && _a !== void 0 ? _a : []; });
43
- return roles;
41
+ var _a;
42
+ const roles = (_a = user.roles) !== null && _a !== void 0 ? _a : (await this.userService.getUserById(ctx, user.id).then(u => { var _a; return (_a = u === null || u === void 0 ? void 0 : u.roles) !== null && _a !== void 0 ? _a : []; }));
43
+ // Neither the Roles preloaded on a parent entity nor the UserService fallback pass through
44
+ // the RoleService, so the visibility check is applied here too.
45
+ const visibleRoleIds = await this.roleService.getVisibleRoleIds(ctx);
46
+ return roles.filter(role => visibleRoleIds.some(id => (0, utils_1.idsAreEqual)(id, role.id)));
44
47
  }
45
48
  };
46
49
  exports.UserEntityResolver = UserEntityResolver;
@@ -63,6 +66,7 @@ __decorate([
63
66
  ], UserEntityResolver.prototype, "roles", null);
64
67
  exports.UserEntityResolver = UserEntityResolver = __decorate([
65
68
  (0, graphql_1.Resolver)('User'),
66
- __metadata("design:paramtypes", [user_service_1.UserService])
69
+ __metadata("design:paramtypes", [user_service_1.UserService,
70
+ role_service_1.RoleService])
67
71
  ], UserEntityResolver);
68
72
  //# sourceMappingURL=user-entity.resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"user-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/user-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAGjE,wGAAgG;AAEhG,uIAA2H;AAE3H,kEAAwD;AACxD,yEAAqE;AACrE,kEAA8D;AAC9D,0FAAiE;AAG1D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC3B,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAG1C,AAAN,KAAK,CAAC,qBAAqB,CAChB,GAAmB,EAChB,IAAU;QAEpB,IAAI,cAAc,GAA2B,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAChD,CAAC;QACD,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW;aAClC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;aACzB,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,qBAAqB,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QAE/C,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCACxB,CAAC,KACJ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EACnB,QAAQ,EAAE,CAAC,YAAY,oEAA4B,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,0DAAyB,IAC9F,CAAC,CAAC;IACR,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,IAAU;QACxD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;QACD,IAAI,KAAK,GAAW,EAAE,CAAC;QACvB,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAhCY,gDAAkB;AAIrB;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACV,kBAAI;;+DAevB;AAGK;IADL,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAkB,kBAAI;;+CAO3D;6BA/BQ,kBAAkB;IAD9B,IAAA,kBAAQ,EAAC,MAAM,CAAC;qCAEoB,0BAAW;GADnC,kBAAkB,CAgC9B"}
1
+ {"version":3,"file":"user-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/user-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAGjE,iDAAoD;AACpD,wGAAgG;AAEhG,uIAA2H;AAE3H,kEAAwD;AACxD,yEAAqE;AACrE,yEAAqE;AACrE,kEAA8D;AAC9D,0FAAiE;AAG1D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC3B,YACY,WAAwB,EACxB,WAAwB;QADxB,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;IACjC,CAAC;IAGE,AAAN,KAAK,CAAC,qBAAqB,CAChB,GAAmB,EAChB,IAAU;QAEpB,IAAI,cAAc,GAA2B,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAChD,CAAC;QACD,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW;aAClC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;aACzB,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,qBAAqB,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QAE/C,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCACxB,CAAC,KACJ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,EACnB,QAAQ,EAAE,CAAC,YAAY,oEAA4B,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,0DAAyB,IAC9F,CAAC,CAAC;IACR,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,IAAU;;QACxD,MAAM,KAAK,GACP,MAAA,IAAI,CAAC,KAAK,mCAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC,CAAC;QAC/F,2FAA2F;QAC3F,gEAAgE;QAChE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACrE,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;CACJ,CAAA;AAnCY,gDAAkB;AAOrB;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACV,kBAAI;;+DAevB;AAGK;IADL,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAkB,kBAAI;;+CAO3D;6BAlCQ,kBAAkB;IAD9B,IAAA,kBAAQ,EAAC,MAAM,CAAC;qCAGY,0BAAW;QACX,0BAAW;GAH3B,kBAAkB,CAmC9B"}
@@ -1,4 +1,5 @@
1
1
  import { OrderLineInput } from '@vendure/common/lib/generated-types';
2
+ import { ID } from '@vendure/common/lib/shared-types';
2
3
  import { RequestContext } from '../../../api/common/request-context';
3
4
  import { TransactionalConnection } from '../../../connection/transactional-connection';
4
5
  import { Order } from '../../../entity/order/order.entity';
@@ -32,3 +33,13 @@ export declare function orderItemsAreShipped(order: Order): boolean;
32
33
  */
33
34
  export declare function orderLinesAreAllCancelled(order: Order): boolean;
34
35
  export declare function getOrdersFromLines(ctx: RequestContext, connection: TransactionalConnection, orderLinesInput: OrderLineInput[]): Promise<Order[]>;
36
+ /**
37
+ * Payment, Refund, Fulfillment and OrderHistoryEntry are not ChannelAware, so the parent Order is
38
+ * the only Channel boundary they have. Any operation which looks one of them up by id must check
39
+ * that the parent Order is visible in the active Channel before it mutates state or calls out to a
40
+ * payment gateway, otherwise a Channel-scoped administrator can act on another Channel's data.
41
+ *
42
+ * The error names the child entity rather than the Order, so that it cannot be used to work out
43
+ * which Order ids exist in other Channels.
44
+ */
45
+ export declare function assertOrderIsInChannel(ctx: RequestContext, connection: TransactionalConnection, orderId: ID, childEntityName: string, childEntityId: ID): Promise<void>;
@@ -8,12 +8,14 @@ exports.orderItemsArePartiallyShipped = orderItemsArePartiallyShipped;
8
8
  exports.orderItemsAreShipped = orderItemsAreShipped;
9
9
  exports.orderLinesAreAllCancelled = orderLinesAreAllCancelled;
10
10
  exports.getOrdersFromLines = getOrdersFromLines;
11
+ exports.assertOrderIsInChannel = assertOrderIsInChannel;
11
12
  const shared_utils_1 = require("@vendure/common/lib/shared-utils");
12
13
  const unique_1 = require("@vendure/common/lib/unique");
13
14
  const typeorm_1 = require("typeorm");
14
15
  const errors_1 = require("../../../common/error/errors");
15
16
  const utils_1 = require("../../../common/utils");
16
17
  const order_line_entity_1 = require("../../../entity/order-line/order-line.entity");
18
+ const order_entity_1 = require("../../../entity/order/order.entity");
17
19
  /**
18
20
  * Returns true if the Order total is covered by Payments in the specified state.
19
21
  */
@@ -122,8 +124,10 @@ async function getOrdersFromLines(ctx, connection, orderLinesInput) {
122
124
  continue;
123
125
  }
124
126
  const order = line.order;
125
- if (!order.channels.some(channel => channel.id === ctx.channelId)) {
126
- throw new errors_1.EntityNotFoundError('Order', order.id);
127
+ if (!order.channels.some(channel => (0, utils_1.idsAreEqual)(channel.id, ctx.channelId))) {
128
+ // Name the line, not the Order: the caller supplied the line id, and naming the Order
129
+ // would confirm that an Order with that id exists in another Channel.
130
+ throw new errors_1.EntityNotFoundError('OrderLine', line.id);
127
131
  }
128
132
  if (!orders.has(order.id)) {
129
133
  orders.set(order.id, order);
@@ -131,4 +135,25 @@ async function getOrdersFromLines(ctx, connection, orderLinesInput) {
131
135
  }
132
136
  return Array.from(orders.values());
133
137
  }
138
+ /**
139
+ * Payment, Refund, Fulfillment and OrderHistoryEntry are not ChannelAware, so the parent Order is
140
+ * the only Channel boundary they have. Any operation which looks one of them up by id must check
141
+ * that the parent Order is visible in the active Channel before it mutates state or calls out to a
142
+ * payment gateway, otherwise a Channel-scoped administrator can act on another Channel's data.
143
+ *
144
+ * The error names the child entity rather than the Order, so that it cannot be used to work out
145
+ * which Order ids exist in other Channels.
146
+ */
147
+ async function assertOrderIsInChannel(ctx, connection, orderId, childEntityName, childEntityId) {
148
+ const orderIsInChannel = await connection
149
+ .getRepository(ctx, order_entity_1.Order)
150
+ .createQueryBuilder('order')
151
+ .innerJoin('order.channels', 'channel')
152
+ .where('order.id = :orderId', { orderId })
153
+ .andWhere('channel.id = :channelId', { channelId: ctx.channelId })
154
+ .getExists();
155
+ if (!orderIsInChannel) {
156
+ throw new errors_1.EntityNotFoundError(childEntityName, childEntityId);
157
+ }
158
+ }
134
159
  //# sourceMappingURL=order-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"order-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/order-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"order-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/utils/order-utils.ts"],"names":[],"mappings":";;AAmBA,kDAGC;AAKD,wDAeC;AAKD,wDAKC;AAKD,0EAMC;AA0BD,sEAMC;AAKD,oDAKC;AAKD,8DAEC;AA2BD,gDA2BC;AAWD,wDAiBC;AAhMD,mEAA2D;AAC3D,uDAAoD;AACpD,qCAA6B;AAG7B,yDAAmE;AACnE,iDAAoD;AAGpD,oFAAyE;AACzE,qEAA2D;AAI3D;;GAEG;AACH,SAAgB,mBAAmB,CAAC,KAAY,EAAE,KAAoC;IAClF,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3D,OAAO,aAAa,IAAI,KAAK,CAAC,YAAY,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,SAAgB,sBAAsB,CAAC,KAAY,EAAE,KAAqC;;IACtF,MAAM,QAAQ,GAAG,KAAK;QAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAClB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC;QACnD,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CACjB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,KAAK,UAAU,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAChF,CAAC;IACR,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC7B,MAAM,cAAc,GAAG,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,mCAAI,EAAE,CAAC;QAC3F,MAAM,kBAAkB,GAAG,IAAA,sBAAO,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC5D,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAgB,sBAAsB,CAAC,KAAY;IAC/C,OAAO,CACH,8BAA8B,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,WAAW,CAAC;QAC3E,CAAC,yBAAyB,CAAC,KAAK,CAAC,CACpC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,SAAgB,+BAA+B,CAAC,KAAY;IACxD,MAAM,MAAM,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IACrD,OAAO,CACH,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,WAAW,CAAC;QAC3C,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,WAAW,CAAC,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAC,CACtF,CAAC;AACN,CAAC;AAED,SAAS,8BAA8B,CAAC,KAAY;IAChD,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,IAAA,eAAM,EACjB,KAAK,CAAC,KAAK;SACN,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;SACnC,GAAG,CAAC,IAAI,CAAC,EAAE;QACR,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAC1D,IAAA,mBAAW,EAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,CACvC,CAAC;QACF,MAAM,cAAc,GAAG,IAAA,sBAAO,EAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,cAAc,EAAE,CAAC;YACrB,OAAO,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC,CAAC;SACD,IAAI,EAAE,CACd,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAgB,6BAA6B,CAAC,KAAY;IACtD,MAAM,MAAM,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IACrD,OAAO,CACH,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;QACzC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAC,CACpF,CAAC;AACN,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,KAAY;IAC7C,OAAO,CACH,8BAA8B,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;QACzE,CAAC,yBAAyB,CAAC,KAAK,CAAC,CACpC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CAAC,KAAY;IAClD,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAY;IAC1C,OAAO,KAAK,CAAC,YAAY;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC;SACpC,MAAM,CACH,CAAC,gBAAgB,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAC9E,EAAuB,CAC1B,CAAC;AACV,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,KAAY;IAC3C,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACV,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrE,OAAO,GAAG,CAAC;IACf,CAAC,EACD,EAAuC,CAC1C,CAAC;IACF,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AACpE,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACpC,GAAmB,EACnB,UAAmC,EACnC,eAAiC;IAEjC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAa,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,6BAAS,CAAC,CAAC,IAAI,CAAC;QAC9D,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE;QAC1D,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACtC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;KACvB,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS;QACb,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YAC1E,sFAAsF;YACtF,sEAAsE;YACtE,MAAM,IAAI,4BAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACvC,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,sBAAsB,CACxC,GAAmB,EACnB,UAAmC,EACnC,OAAW,EACX,eAAuB,EACvB,aAAiB;IAEjB,MAAM,gBAAgB,GAAG,MAAM,UAAU;SACpC,aAAa,CAAC,GAAG,EAAE,oBAAK,CAAC;SACzB,kBAAkB,CAAC,OAAO,CAAC;SAC3B,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC;SACtC,KAAK,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,CAAC;SACzC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;SACjE,SAAS,EAAE,CAAC;IACjB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpB,MAAM,IAAI,4BAAmB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACL,CAAC"}
@@ -40,8 +40,17 @@ export declare class AdministratorService {
40
40
  /**
41
41
  * @description
42
42
  * Get an Administrator by id.
43
+ *
44
+ * Resolves to `undefined` if the Administrator is not visible to the active user, so that a
45
+ * caller cannot confirm the existence of an Administrator they are not allowed to see.
43
46
  */
44
47
  findOne(ctx: RequestContext, administratorId: ID, relations?: RelationPaths<Administrator>): Promise<Administrator | undefined>;
48
+ /**
49
+ * Restricts a list query to the Administrators which are visible to the active user. The
50
+ * restriction is applied to the query rather than to its result, so that `totalItems`,
51
+ * sorting, filtering and pagination all operate over the visible Administrators only.
52
+ */
53
+ private restrictToVisibleAdministrators;
45
54
  /**
46
55
  * @description
47
56
  * Get an Administrator based on the User id.
@@ -86,12 +95,6 @@ export declare class AdministratorService {
86
95
  * updating an Administrator.
87
96
  */
88
97
  private checkActiveUserCanGrantRoles;
89
- /**
90
- * Ensures the active user holds all of the target administrator's permissions on all of the target's
91
- * channels before allowing the target to be modified, so a lower-privileged administrator cannot
92
- * modify a higher-privileged one (including a SuperAdmin).
93
- */
94
- private checkActiveUserCanManageAdministrator;
95
98
  /**
96
99
  * @description
97
100
  * Assigns a Role to the Administrator's User entity.