@vendure/core 1.0.2 → 1.0.3

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.
@@ -91,7 +91,6 @@ async function createGraphQLOptions(i18nService, configService, idCodecService,
91
91
  .map(e => (typeof e.schema === 'function' ? e.schema() : e.schema))
92
92
  .filter(shared_utils_1.notNullOrUndefined)
93
93
  .forEach(documentNode => (schema = graphql_2.extendSchema(schema, documentNode)));
94
- schema = generate_permissions_1.generatePermissionEnum(schema, configService.authOptions.customPermissions);
95
94
  schema = generate_list_options_1.generateListOptions(schema);
96
95
  schema = graphql_custom_fields_1.addGraphQLCustomFields(schema, customFields, apiType === 'shop');
97
96
  schema = graphql_custom_fields_1.addOrderLineCustomFieldsInput(schema, customFields.OrderLine || []);
@@ -105,6 +104,7 @@ async function createGraphQLOptions(i18nService, configService, idCodecService,
105
104
  if (apiType === 'shop') {
106
105
  schema = graphql_custom_fields_1.addRegisterCustomerCustomFieldsInput(schema, customFields.Customer || []);
107
106
  }
107
+ schema = generate_permissions_1.generatePermissionEnum(schema, configService.authOptions.customPermissions);
108
108
  return schema;
109
109
  }
110
110
  }
@@ -1 +1 @@
1
- {"version":3,"file":"configure-graphql-module.js","sourceRoot":"","sources":["../../../src/api/config/configure-graphql-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configure-graphql-module.js","sourceRoot":"","sources":["../../../src/api/config/configure-graphql-module.ts"],"names":[],"mappings":"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"}
@@ -4,10 +4,10 @@ exports.generatePermissionEnum = void 0;
4
4
  const stitch_1 = require("@graphql-tools/stitch");
5
5
  const graphql_1 = require("graphql");
6
6
  const constants_1 = require("../../common/constants");
7
- const PERMISSION_DESCRIPTION = `@description
8
- Permissions for administrators and customers. Used to control access to
9
- GraphQL resolvers via the {@link Allow} decorator.
10
-
7
+ const PERMISSION_DESCRIPTION = `@description
8
+ Permissions for administrators and customers. Used to control access to
9
+ GraphQL resolvers via the {@link Allow} decorator.
10
+
11
11
  @docsCategory common`;
12
12
  /**
13
13
  * Generates the `Permission` GraphQL enum based on the default & custom permission definitions.
@@ -21,8 +21,8 @@ export declare class CollectionEntityResolver {
21
21
  options: ProductVariantListOptions;
22
22
  }, apiType: ApiType): Promise<PaginatedList<Translated<ProductVariant>>>;
23
23
  breadcrumbs(ctx: RequestContext, collection: Collection): Promise<CollectionBreadcrumb[]>;
24
- parent(ctx: RequestContext, collection: Collection): Promise<Collection>;
25
- children(ctx: RequestContext, collection: Collection): Promise<Collection[]>;
24
+ parent(ctx: RequestContext, collection: Collection, apiType: ApiType): Promise<Collection | undefined>;
25
+ children(ctx: RequestContext, collection: Collection, apiType: ApiType): Promise<Collection[]>;
26
26
  featuredAsset(ctx: RequestContext, collection: Collection): Promise<Asset | undefined>;
27
27
  assets(ctx: RequestContext, collection: Collection): Promise<Asset[] | undefined>;
28
28
  }
@@ -48,17 +48,25 @@ let CollectionEntityResolver = class CollectionEntityResolver {
48
48
  async breadcrumbs(ctx, collection) {
49
49
  return this.collectionService.getBreadcrumbs(ctx, collection);
50
50
  }
51
- async parent(ctx, collection) {
51
+ async parent(ctx, collection, apiType) {
52
+ let parent;
52
53
  if (collection.parent) {
53
- return collection.parent;
54
+ parent = collection.parent;
54
55
  }
55
- return this.collectionService.getParent(ctx, collection.id);
56
+ else {
57
+ parent = (await this.collectionService.getParent(ctx, collection.id));
58
+ }
59
+ return apiType === 'shop' && parent.isPrivate ? undefined : parent;
56
60
  }
57
- async children(ctx, collection) {
61
+ async children(ctx, collection, apiType) {
62
+ let children = [];
58
63
  if (collection.children) {
59
- return collection.children;
64
+ children = collection.children;
65
+ }
66
+ else {
67
+ children = (await this.collectionService.getChildren(ctx, collection.id));
60
68
  }
61
- return this.collectionService.getChildren(ctx, collection.id);
69
+ return children.filter(c => (apiType === 'shop' ? !c.isPrivate : true));
62
70
  }
63
71
  async featuredAsset(ctx, collection) {
64
72
  if (collection.featuredAsset) {
@@ -113,16 +121,22 @@ __decorate([
113
121
  ], CollectionEntityResolver.prototype, "breadcrumbs", null);
114
122
  __decorate([
115
123
  graphql_1.ResolveField(),
116
- __param(0, request_context_decorator_1.Ctx()), __param(1, graphql_1.Parent()),
124
+ __param(0, request_context_decorator_1.Ctx()),
125
+ __param(1, graphql_1.Parent()),
126
+ __param(2, api_decorator_1.Api()),
117
127
  __metadata("design:type", Function),
118
- __metadata("design:paramtypes", [request_context_1.RequestContext, entity_1.Collection]),
128
+ __metadata("design:paramtypes", [request_context_1.RequestContext,
129
+ entity_1.Collection, String]),
119
130
  __metadata("design:returntype", Promise)
120
131
  ], CollectionEntityResolver.prototype, "parent", null);
121
132
  __decorate([
122
133
  graphql_1.ResolveField(),
123
- __param(0, request_context_decorator_1.Ctx()), __param(1, graphql_1.Parent()),
134
+ __param(0, request_context_decorator_1.Ctx()),
135
+ __param(1, graphql_1.Parent()),
136
+ __param(2, api_decorator_1.Api()),
124
137
  __metadata("design:type", Function),
125
- __metadata("design:paramtypes", [request_context_1.RequestContext, entity_1.Collection]),
138
+ __metadata("design:paramtypes", [request_context_1.RequestContext,
139
+ entity_1.Collection, String]),
126
140
  __metadata("design:returntype", Promise)
127
141
  ], CollectionEntityResolver.prototype, "children", null);
128
142
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"collection-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/collection-entity.resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collection-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/collection-entity.resolver.ts"],"names":[],"mappings":"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"}
@@ -17,9 +17,7 @@ enum DeletionResult {
17
17
  }
18
18
 
19
19
  # Populated at run-time
20
- enum Permission {
21
- Placeholder
22
- }
20
+ enum Permission
23
21
 
24
22
  enum SortOrder {
25
23
  ASC
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.defaultCollectionFilters = exports.variantNameCollectionFilter = exports.facetValueCollectionFilter = void 0;
4
7
  const generated_types_1 = require("@vendure/common/lib/generated-types");
8
+ const nanoid_1 = __importDefault(require("nanoid"));
5
9
  const errors_1 = require("../../common/error/errors");
6
10
  const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
7
11
  const collection_filter_1 = require("./collection-filter");
@@ -80,17 +84,30 @@ exports.variantNameCollectionFilter = new collection_filter_1.CollectionFilter({
80
84
  code: 'variant-name-filter',
81
85
  description: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Filter by ProductVariant name' }],
82
86
  apply: (qb, args) => {
83
- qb.leftJoin('productVariant.translations', 'translation');
87
+ const translationAlias = `variant_name_filter_translation`;
88
+ const termName = `term_${nanoid_1.default(6)}`;
89
+ const hasJoinOnTranslations = !!qb.expressionMap.joinAttributes.find(ja => ja.entityOrProperty === 'productVariant.translations');
90
+ if (!hasJoinOnTranslations) {
91
+ qb.leftJoin('productVariant.translations', translationAlias);
92
+ }
84
93
  const LIKE = qb.connection.options.type === 'postgres' ? 'ILIKE' : 'LIKE';
85
94
  switch (args.operator) {
86
95
  case 'contains':
87
- return qb.andWhere(`translation.name ${LIKE} :term`, { term: `%${args.term}%` });
96
+ return qb.andWhere(`${translationAlias}.name ${LIKE} :${termName}`, {
97
+ [termName]: `%${args.term}%`,
98
+ });
88
99
  case 'doesNotContain':
89
- return qb.andWhere(`translation.name NOT ${LIKE} :term`, { term: `%${args.term}%` });
100
+ return qb.andWhere(`${translationAlias}.name NOT ${LIKE} :${termName}`, {
101
+ [termName]: `%${args.term}%`,
102
+ });
90
103
  case 'startsWith':
91
- return qb.andWhere(`translation.name ${LIKE} :term`, { term: `${args.term}%` });
104
+ return qb.andWhere(`${translationAlias}.name ${LIKE} :${termName}`, {
105
+ [termName]: `${args.term}%`,
106
+ });
92
107
  case 'endsWith':
93
- return qb.andWhere(`translation.name ${LIKE} :term`, { term: `%${args.term}` });
108
+ return qb.andWhere(`${translationAlias}.name ${LIKE} :${termName}`, {
109
+ [termName]: `%${args.term}`,
110
+ });
94
111
  default:
95
112
  throw new errors_1.UserInputError(`${args.operator} is not a valid operator`);
96
113
  }
@@ -1 +1 @@
1
- {"version":3,"file":"default-collection-filters.js","sourceRoot":"","sources":["../../../src/config/catalog/default-collection-filters.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"default-collection-filters.js","sourceRoot":"","sources":["../../../src/config/catalog/default-collection-filters.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,43 @@ import { VendureEvent } from './vendure-event';
6
6
  * @description
7
7
  * The EventBus is used to globally publish events which can then be subscribed to.
8
8
  *
9
+ * Events are published whenever certain actions take place within the Vendure server, for example:
10
+ *
11
+ * * when a Product is updated ({@link ProductEvent})
12
+ * * when an Order transitions state ({@link OrderStateTransitionEvent})
13
+ * * when a Customer registers a new account ({@link AccountRegistrationEvent})
14
+ *
15
+ * Using the EventBus it is possible to subscribe to an take action when these events occur.
16
+ * This is done with the `.ofType()` method, which takes an event type and returns an rxjs observable
17
+ * stream of events:
18
+ *
19
+ * @example
20
+ * ```TypeScript
21
+ * import { OnApplicationBootstrap } from '\@nestjs/common';
22
+ * import { EventBus, PluginCommonModule, VendurePlugin } from '\@vendure/core';
23
+ * import { filter } from 'rxjs/operators';
24
+ *
25
+ * \@VendurePlugin({
26
+ * imports: [PluginCommonModule]
27
+ * })
28
+ * export class MyPlugin implements OnApplicationBootstrap {
29
+ *
30
+ * constructor(private eventBus: EventBus) {}
31
+ *
32
+ * async onApplicationBootstrap() {
33
+ *
34
+ * this.eventBus
35
+ * .ofType(OrderStateTransitionEvent)
36
+ * .pipe(
37
+ * filter(event => event.toState === 'PaymentSettled'),
38
+ * )
39
+ * .subscribe((event) => {
40
+ * // do some action when this event fires
41
+ * });
42
+ * }
43
+ * }
44
+ * ```
45
+ *
9
46
  * @docsCategory events
10
47
  * */
11
48
  export declare class EventBus implements OnModuleDestroy {
@@ -16,6 +16,43 @@ const constants_1 = require("../common/constants");
16
16
  * @description
17
17
  * The EventBus is used to globally publish events which can then be subscribed to.
18
18
  *
19
+ * Events are published whenever certain actions take place within the Vendure server, for example:
20
+ *
21
+ * * when a Product is updated ({@link ProductEvent})
22
+ * * when an Order transitions state ({@link OrderStateTransitionEvent})
23
+ * * when a Customer registers a new account ({@link AccountRegistrationEvent})
24
+ *
25
+ * Using the EventBus it is possible to subscribe to an take action when these events occur.
26
+ * This is done with the `.ofType()` method, which takes an event type and returns an rxjs observable
27
+ * stream of events:
28
+ *
29
+ * @example
30
+ * ```TypeScript
31
+ * import { OnApplicationBootstrap } from '\@nestjs/common';
32
+ * import { EventBus, PluginCommonModule, VendurePlugin } from '\@vendure/core';
33
+ * import { filter } from 'rxjs/operators';
34
+ *
35
+ * \@VendurePlugin({
36
+ * imports: [PluginCommonModule]
37
+ * })
38
+ * export class MyPlugin implements OnApplicationBootstrap {
39
+ *
40
+ * constructor(private eventBus: EventBus) {}
41
+ *
42
+ * async onApplicationBootstrap() {
43
+ *
44
+ * this.eventBus
45
+ * .ofType(OrderStateTransitionEvent)
46
+ * .pipe(
47
+ * filter(event => event.toState === 'PaymentSettled'),
48
+ * )
49
+ * .subscribe((event) => {
50
+ * // do some action when this event fires
51
+ * });
52
+ * }
53
+ * }
54
+ * ```
55
+ *
19
56
  * @docsCategory events
20
57
  * */
21
58
  let EventBus = class EventBus {
@@ -1 +1 @@
1
- {"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/event-bus/event-bus.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6D;AAE7D,+BAA2C;AAC3C,8CAAmD;AAEnD,mEAA+D;AAC/D,mDAA8D;AAI9D;;;;;KAKK;AAEL,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAArB;QACY,gBAAW,GAAG,IAAI,cAAO,EAAgB,CAAC;QAC1C,aAAQ,GAAG,IAAI,cAAO,EAAE,CAAC;IAiDrC,CAAC;IA/CG;;;OAGG;IACH,OAAO,CAAyB,KAAQ;QACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAyB,IAAa;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CACvC,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EACxB,kBAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAS,CAAC,WAAW,KAAK,IAAI,CAAC,CAC9B,CAAC;IACvB,CAAC;IAED,gBAAgB;IAChB,eAAe;QACX,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;OAWG;IACK,qBAAqB,CAAyB,KAAQ;QAC1D,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAuB,CAAC,CAAC;YAChD,IAAI,QAAQ,YAAY,gCAAc,EAAE;gBACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAChC,OAAQ,OAAe,CAAC,mCAAuB,CAAC,CAAC;gBAChD,KAAK,CAAC,YAAuB,CAAS,GAAG,OAAO,CAAC;aACrD;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAnDY,QAAQ;IADpB,mBAAU,EAAE;GACA,QAAQ,CAmDpB;AAnDY,4BAAQ"}
1
+ {"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/event-bus/event-bus.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6D;AAE7D,+BAA2C;AAC3C,8CAAmD;AAEnD,mEAA+D;AAC/D,mDAA8D;AAI9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0CK;AAEL,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAArB;QACY,gBAAW,GAAG,IAAI,cAAO,EAAgB,CAAC;QAC1C,aAAQ,GAAG,IAAI,cAAO,EAAE,CAAC;IAiDrC,CAAC;IA/CG;;;OAGG;IACH,OAAO,CAAyB,KAAQ;QACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAyB,IAAa;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CACvC,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EACxB,kBAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAS,CAAC,WAAW,KAAK,IAAI,CAAC,CAC9B,CAAC;IACvB,CAAC;IAED,gBAAgB;IAChB,eAAe;QACX,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;OAWG;IACK,qBAAqB,CAAyB,KAAQ;QAC1D,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAuB,CAAC,CAAC;YAChD,IAAI,QAAQ,YAAY,gCAAc,EAAE;gBACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAChC,OAAQ,OAAe,CAAC,mCAAuB,CAAC,CAAC;gBAChD,KAAK,CAAC,YAAuB,CAAS,GAAG,OAAO,CAAC;aACrD;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAnDY,QAAQ;IADpB,mBAAU,EAAE;GACA,QAAQ,CAmDpB;AAnDY,4BAAQ"}
@@ -53,6 +53,7 @@
53
53
  "COUPON_CODE_EXPIRED_ERROR": "Coupon code \"{ couponCode }\" has expired",
54
54
  "COUPON_CODE_INVALID_ERROR": "Coupon code \"{ couponCode }\" is not valid",
55
55
  "COUPON_CODE_LIMIT_ERROR": "Coupon code cannot be used more than {limit, plural, one {once} other {# times}} per customer",
56
+ "CREATE_FULFILLMENT_ERROR": "An error occurred when attempting to create the Fulfillment",
56
57
  "EMAIL_ADDRESS_CONFLICT_ERROR": "The email address is not available.",
57
58
  "EMPTY_ORDER_LINE_SELECTION_ERROR": "At least one OrderLine must be specified",
58
59
  "IDENTIFIER_CHANGE_TOKEN_INVALID_ERROR": "Identifier change token not recognized",
@@ -6,7 +6,6 @@ import { ChannelService } from '../../services/channel.service';
6
6
  import { CustomerService } from '../../services/customer.service';
7
7
  import { HistoryService } from '../../services/history.service';
8
8
  import { RoleService } from '../../services/role.service';
9
- import { UserService } from '../../services/user.service';
10
9
  import { TransactionalConnection } from '../../transaction/transactional-connection';
11
10
  /**
12
11
  * @description
@@ -22,8 +21,7 @@ export declare class ExternalAuthenticationService {
22
21
  private customerService;
23
22
  private administratorService;
24
23
  private channelService;
25
- private userService;
26
- constructor(connection: TransactionalConnection, roleService: RoleService, historyService: HistoryService, customerService: CustomerService, administratorService: AdministratorService, channelService: ChannelService, userService: UserService);
24
+ constructor(connection: TransactionalConnection, roleService: RoleService, historyService: HistoryService, customerService: CustomerService, administratorService: AdministratorService, channelService: ChannelService);
27
25
  /**
28
26
  * @description
29
27
  * Looks up a User based on their identifier from an external authentication
@@ -67,4 +65,5 @@ export declare class ExternalAuthenticationService {
67
65
  roles: Role[];
68
66
  }): Promise<User>;
69
67
  findUser(ctx: RequestContext, strategy: string, externalIdentifier: string): Promise<User | undefined>;
68
+ private findExistingCustomerUserByEmailAddress;
70
69
  }
@@ -21,7 +21,6 @@ const channel_service_1 = require("../../services/channel.service");
21
21
  const customer_service_1 = require("../../services/customer.service");
22
22
  const history_service_1 = require("../../services/history.service");
23
23
  const role_service_1 = require("../../services/role.service");
24
- const user_service_1 = require("../../services/user.service");
25
24
  const transactional_connection_1 = require("../../transaction/transactional-connection");
26
25
  /**
27
26
  * @description
@@ -31,14 +30,13 @@ const transactional_connection_1 = require("../../transaction/transactional-conn
31
30
  * @docsCategory auth
32
31
  */
33
32
  let ExternalAuthenticationService = class ExternalAuthenticationService {
34
- constructor(connection, roleService, historyService, customerService, administratorService, channelService, userService) {
33
+ constructor(connection, roleService, historyService, customerService, administratorService, channelService) {
35
34
  this.connection = connection;
36
35
  this.roleService = roleService;
37
36
  this.historyService = historyService;
38
37
  this.customerService = customerService;
39
38
  this.administratorService = administratorService;
40
39
  this.channelService = channelService;
41
- this.userService = userService;
42
40
  }
43
41
  /**
44
42
  * @description
@@ -79,7 +77,7 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
79
77
  */
80
78
  async createCustomerAndUser(ctx, config) {
81
79
  let user;
82
- const existingUser = await this.userService.getUserByEmailAddress(ctx, config.emailAddress);
80
+ const existingUser = await this.findExistingCustomerUserByEmailAddress(ctx, config.emailAddress);
83
81
  if (existingUser) {
84
82
  user = existingUser;
85
83
  }
@@ -160,19 +158,27 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
160
158
  return newUser;
161
159
  }
162
160
  async findUser(ctx, strategy, externalIdentifier) {
163
- const user = await this.connection
161
+ const usersWithMatchingIdentifier = await this.connection
164
162
  .getRepository(ctx, user_entity_1.User)
165
163
  .createQueryBuilder('user')
166
164
  .leftJoinAndSelect('user.authenticationMethods', 'authMethod')
167
165
  .andWhere('authMethod.externalIdentifier = :externalIdentifier', { externalIdentifier })
168
166
  .andWhere('user.deletedAt IS NULL')
167
+ .getMany();
168
+ const matchingUser = usersWithMatchingIdentifier.find(user => user.authenticationMethods.find(m => m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod && m.strategy === strategy));
169
+ return matchingUser;
170
+ }
171
+ async findExistingCustomerUserByEmailAddress(ctx, emailAddress) {
172
+ const customer = await this.connection
173
+ .getRepository(ctx, customer_entity_1.Customer)
174
+ .createQueryBuilder('customer')
175
+ .leftJoinAndSelect('customer.user', 'user')
176
+ .leftJoin('customer.channels', 'channel')
177
+ .leftJoinAndSelect('user.authenticationMethods', 'authMethod')
178
+ .andWhere('customer.emailAddress = :emailAddress', { emailAddress })
179
+ .andWhere('user.deletedAt IS NULL')
169
180
  .getOne();
170
- const userHasMatchingAuthMethod = !!(user === null || user === void 0 ? void 0 : user.authenticationMethods.find(m => {
171
- return m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod && m.strategy === strategy;
172
- }));
173
- if (userHasMatchingAuthMethod) {
174
- return user;
175
- }
181
+ return customer === null || customer === void 0 ? void 0 : customer.user;
176
182
  }
177
183
  };
178
184
  ExternalAuthenticationService = __decorate([
@@ -182,8 +188,7 @@ ExternalAuthenticationService = __decorate([
182
188
  history_service_1.HistoryService,
183
189
  customer_service_1.CustomerService,
184
190
  administrator_service_1.AdministratorService,
185
- channel_service_1.ChannelService,
186
- user_service_1.UserService])
191
+ channel_service_1.ChannelService])
187
192
  ], ExternalAuthenticationService);
188
193
  exports.ExternalAuthenticationService = ExternalAuthenticationService;
189
194
  //# sourceMappingURL=external-authentication.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"external-authentication.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/external-authentication/external-authentication.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"external-authentication.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/external-authentication/external-authentication.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": "1.0.2",
3
+ "version": "1.0.3",
4
4
  "description": "A modern, headless ecommerce framework",
5
5
  "repository": {
6
6
  "type": "git",
@@ -47,7 +47,7 @@
47
47
  "@nestjs/testing": "7.6.17",
48
48
  "@nestjs/typeorm": "7.1.5",
49
49
  "@types/fs-extra": "^9.0.1",
50
- "@vendure/common": "^1.0.2",
50
+ "@vendure/common": "^1.0.3",
51
51
  "apollo-server-express": "2.24.1",
52
52
  "bcrypt": "^5.0.0",
53
53
  "body-parser": "^1.19.0",
@@ -98,5 +98,5 @@
98
98
  "sqlite3": "^5.0.0",
99
99
  "typescript": "4.1.5"
100
100
  },
101
- "gitHead": "31a45c68a79eae6261b64439c8107e72e07b9ae2"
101
+ "gitHead": "b3c5fa87198620ab40b76934fbf5beb032f2d6e9"
102
102
  }