npm - @vendure/core - Versions diffs - 1.0.0-stackblitz.0 → 1.0.3 - Mend

@vendure/core 1.0.0-stackblitz.0 → 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.

Files changed (47) hide show

package/dist/event-bus/event-bus.js.map CHANGED Viewed

	@@ -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"}

package/dist/i18n/messages/en.json CHANGED Viewed

@@ -53,6 +53,7 @@
     "COUPON_CODE_EXPIRED_ERROR": "Coupon code \"{ couponCode }\" has expired",
     "COUPON_CODE_INVALID_ERROR": "Coupon code \"{ couponCode }\" is not valid",
     "COUPON_CODE_LIMIT_ERROR": "Coupon code cannot be used more than {limit, plural, one {once} other {# times}} per customer",
+    "CREATE_FULFILLMENT_ERROR": "An error occurred when attempting to create the Fulfillment",
     "EMAIL_ADDRESS_CONFLICT_ERROR": "The email address is not available.",
     "EMPTY_ORDER_LINE_SELECTION_ERROR": "At least one OrderLine must be specified",
     "IDENTIFIER_CHANGE_TOKEN_INVALID_ERROR": "Identifier change token not recognized",

package/dist/migrate.js CHANGED Viewed

@@ -146,7 +146,7 @@ function createConnectionOptions(userConfig) {
  * See https://github.com/typeorm/typeorm/issues/2576#issuecomment-499506647
  */
 async function disableForeignKeysForSqLite(connection, work) {
-    const isSqLite = connection.options.type === 'sqlite';
+    const isSqLite = connection.options.type === 'sqlite' || connection.options.type === 'better-sqlite3';
     if (isSqLite) {
         await connection.query('PRAGMA foreign_keys=OFF');
     }

package/dist/migrate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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~~IACtD~~,IAAI,QAAQ,EAAE;QACV,MAAM,UAAU,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;KACrD;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,IAAI,QAAQ,EAAE;QACV,MAAM,UAAU,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;KACpD;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,WAAW,CAAC,IAAY,EAAE,SAAiB,EAAE,MAAgB,EAAE,QAAkB;IACtF,OAAO;;eAEI,uBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,SAAS;;;EAG9C,MAAM,CAAC,IAAI,CAAC;CACb,CAAC;;;;EAIA,QAAQ,CAAC,IAAI,CAAC;CACf,CAAC;;;;CAID,CAAC;AACF,CAAC"}
1	+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/indexer/indexer.controller.js CHANGED Viewed

@@ -128,7 +128,12 @@ let IndexerController = class IndexerController {
         const ctx = request_context_1.RequestContext.deserialize(data.ctx);
         const variants = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findByIds(data.variantIds);
         if (variants.length) {
-            await this.removeSearchIndexItems(ctx.languageCode, ctx.channelId, variants.map(v => v.id));
+            const languageVariants = unique_1.unique([
+                ...variants
+                    .reduce((vt, v) => [...vt, ...v.translations], [])
+                    .map(t => t.languageCode),
+            ]);
+            await this.removeSearchIndexItems(ctx.channelId, variants.map(v => v.id), languageVariants);
         }
         return true;
     }
@@ -145,8 +150,11 @@ let IndexerController = class IndexerController {
         return this.updateVariantsInChannel(ctx, [data.productVariantId], data.channelId);
     }
     async removeVariantFromChannel(data) {
+        var _a;
         const ctx = request_context_1.RequestContext.deserialize(data.ctx);
-        await this.removeSearchIndexItems(ctx.languageCode, data.channelId, [data.productVariantId]);
+        const variant = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findOne(data.productVariantId);
+        const languageVariants = (_a = variant === null || variant === void 0 ? void 0 : variant.translations.map(t => t.languageCode)) !== null && _a !== void 0 ? _a : [];
+        await this.removeSearchIndexItems(data.channelId, [data.productVariantId], languageVariants);
         return true;
     }
     async updateAsset(data) {
@@ -214,9 +222,15 @@ let IndexerController = class IndexerController {
             relations: ['variants'],
         });
         if (product) {
+            const languageVariants = unique_1.unique([
+                ...product.translations.map(t => t.languageCode),
+                ...product.variants
+                    .reduce((vt, v) => [...vt, ...v.translations], [])
+                    .map(t => t.languageCode),
+            ]);
             const removedVariantIds = product.variants.map(v => v.id);
             if (removedVariantIds.length) {
-                await this.removeSearchIndexItems(ctx.languageCode, channelId, removedVariantIds);
+                await this.removeSearchIndexItems(channelId, removedVariantIds, languageVariants);
             }
         }
         return true;
@@ -360,13 +374,18 @@ let IndexerController = class IndexerController {
     /**
      * Remove items from the search index
      */
-    async removeSearchIndexItems(languageCode, channelId, variantIds) {
-        const compositeKeys = variantIds.map(id => ({
-            productVariantId: id,
-            channelId,
-            languageCode,
-        }));
-        await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).delete(compositeKeys));
+    async removeSearchIndexItems(channelId, variantIds, languageCodes) {
+        const keys = [];
+        for (const productVariantId of variantIds) {
+            for (const languageCode of languageCodes) {
+                keys.push({
+                    productVariantId,
+                    channelId,
+                    languageCode,
+                });
+            }
+        }
+        await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).delete(keys));
     }
     /**
      * Prevent postgres errors from too-long indices

package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/external-authentication/external-authentication.service.d.ts CHANGED Viewed

@@ -6,7 +6,6 @@ import { ChannelService } from '../../services/channel.service';
 import { CustomerService } from '../../services/customer.service';
 import { HistoryService } from '../../services/history.service';
 import { RoleService } from '../../services/role.service';
-import { UserService } from '../../services/user.service';
 import { TransactionalConnection } from '../../transaction/transactional-connection';
 /**
  * @description
@@ -22,8 +21,7 @@ export declare class ExternalAuthenticationService {
     private customerService;
     private administratorService;
     private channelService;
-    private userService;
-    constructor(connection: TransactionalConnection, roleService: RoleService, historyService: HistoryService, customerService: CustomerService, administratorService: AdministratorService, channelService: ChannelService, userService: UserService);
+    constructor(connection: TransactionalConnection, roleService: RoleService, historyService: HistoryService, customerService: CustomerService, administratorService: AdministratorService, channelService: ChannelService);
     /**
      * @description
      * Looks up a User based on their identifier from an external authentication
@@ -67,4 +65,5 @@ export declare class ExternalAuthenticationService {
         roles: Role[];
     }): Promise<User>;
     findUser(ctx: RequestContext, strategy: string, externalIdentifier: string): Promise<User | undefined>;
+    private findExistingCustomerUserByEmailAddress;
 }

package/dist/service/helpers/external-authentication/external-authentication.service.js CHANGED Viewed

@@ -21,7 +21,6 @@ const channel_service_1 = require("../../services/channel.service");
 const customer_service_1 = require("../../services/customer.service");
 const history_service_1 = require("../../services/history.service");
 const role_service_1 = require("../../services/role.service");
-const user_service_1 = require("../../services/user.service");
 const transactional_connection_1 = require("../../transaction/transactional-connection");
 /**
  * @description
@@ -31,14 +30,13 @@ const transactional_connection_1 = require("../../transaction/transactional-conn
  * @docsCategory auth
  */
 let ExternalAuthenticationService = class ExternalAuthenticationService {
-    constructor(connection, roleService, historyService, customerService, administratorService, channelService, userService) {
+    constructor(connection, roleService, historyService, customerService, administratorService, channelService) {
         this.connection = connection;
         this.roleService = roleService;
         this.historyService = historyService;
         this.customerService = customerService;
         this.administratorService = administratorService;
         this.channelService = channelService;
-        this.userService = userService;
     }
     /**
      * @description
@@ -79,7 +77,7 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
      */
     async createCustomerAndUser(ctx, config) {
         let user;
-        const existingUser = await this.userService.getUserByEmailAddress(ctx, config.emailAddress);
+        const existingUser = await this.findExistingCustomerUserByEmailAddress(ctx, config.emailAddress);
         if (existingUser) {
             user = existingUser;
         }
@@ -160,19 +158,27 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
         return newUser;
     }
     async findUser(ctx, strategy, externalIdentifier) {
-        const user = await this.connection
+        const usersWithMatchingIdentifier = await this.connection
             .getRepository(ctx, user_entity_1.User)
             .createQueryBuilder('user')
             .leftJoinAndSelect('user.authenticationMethods', 'authMethod')
             .andWhere('authMethod.externalIdentifier = :externalIdentifier', { externalIdentifier })
             .andWhere('user.deletedAt IS NULL')
+            .getMany();
+        const matchingUser = usersWithMatchingIdentifier.find(user => user.authenticationMethods.find(m => m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod && m.strategy === strategy));
+        return matchingUser;
+    }
+    async findExistingCustomerUserByEmailAddress(ctx, emailAddress) {
+        const customer = await this.connection
+            .getRepository(ctx, customer_entity_1.Customer)
+            .createQueryBuilder('customer')
+            .leftJoinAndSelect('customer.user', 'user')
+            .leftJoin('customer.channels', 'channel')
+            .leftJoinAndSelect('user.authenticationMethods', 'authMethod')
+            .andWhere('customer.emailAddress = :emailAddress', { emailAddress })
+            .andWhere('user.deletedAt IS NULL')
             .getOne();
-        const userHasMatchingAuthMethod = !!(user === null || user === void 0 ? void 0 : user.authenticationMethods.find(m => {
-            return m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod && m.strategy === strategy;
-        }));
-        if (userHasMatchingAuthMethod) {
-            return user;
-        }
+        return customer === null || customer === void 0 ? void 0 : customer.user;
     }
 };
 ExternalAuthenticationService = __decorate([
@@ -182,8 +188,7 @@ ExternalAuthenticationService = __decorate([
         history_service_1.HistoryService,
         customer_service_1.CustomerService,
         administrator_service_1.AdministratorService,
-        channel_service_1.ChannelService,
-        user_service_1.UserService])
+        channel_service_1.ChannelService])
 ], ExternalAuthenticationService);
 exports.ExternalAuthenticationService = ExternalAuthenticationService;
 //# sourceMappingURL=external-authentication.service.js.map

package/dist/service/helpers/external-authentication/external-authentication.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"external-authentication.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/external-authentication/external-authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAuE;AAGvE,6FAAmF;AACnF,uIAA2H;~~AAE3H~~,8EAAoE;AAEpE,kEAAwD;AACxD,gFAA4E;AAC5E,oEAAgE;AAChE,sEAAkE;AAClE,oEAAgE;AAChE,8DAA0D;AAC1D,~~8DAA0D;AAC1D,~~yFAAqF;AAErF;;;;;;GAMG;AAEH,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IACtC,YACY,UAAmC,EACnC,WAAwB,EACxB,cAA8B,EAC9B,eAAgC,EAChC,oBAA0C,EAC1C,cAA8B~~,EAC9B,WAAwB~~;~~QANxB~~,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;~~QAC9B~~,~~gBAAW,GAAX,WAAW,CAAa;IACjC,~~CAAC;IAEJ;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,QAAgB,EAChB,kBAA0B;QAE1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAEpE,IAAI,IAAI,EAAE;YACN,iDAAiD;YACjD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,QAAQ,EAAE;gBACV,OAAO,IAAI,CAAC;aACf;SACJ;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CACvB,GAAmB,EACnB,QAAgB,EAChB,kBAA0B;QAE1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpE,IAAI,IAAI,EAAE;YACN,uDAAuD;YACvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACpF,IAAI,aAAa,EAAE;gBACf,OAAO,IAAI,CAAC;aACf;SACJ;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CACvB,GAAmB,EACnB,MAOC;QAED,IAAI,IAAU,CAAC;QAEf,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,~~WAAW~~,CAAC,~~qBAAqB,CAAC,~~GAAG,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;~~QAC5F~~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~~IAAI~~,GAAG,MAAM,IAAI,CAAC,UAAU;~~aAC7B~~,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,iBAAiB,CAAC,4BAA4B,EAAE,YAAY,CAAC;aAC7D,QAAQ,CAAC,qDAAqD,EAAE,EAAE,kBAAkB,EAAE,CAAC;aACvF,QAAQ,CAAC,wBAAwB,CAAC;aAClC,~~MAAM~~,EAAE,CAAC;~~QAEd~~,MAAM,~~yBAAyB~~,GAAG,CAAC,~~EAAC,~~IAAI,~~aAAJ~~,IAAI,~~uBAAJ~~,IAAI,~~CAAE~~,qBAAqB,CAAC,IAAI,~~CAAC~~,CAAC,CAAC,EAAE~~;YACrE~~,~~OAAO~~,CAAC,YAAY,oEAA4B,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;~~QAChF~~,CAAC,~~EAAC~~,CAAC;~~QAEH~~,IAAI,~~yBAAyB~~,EAAE;~~YAC3B~~,OAAO,IAAI,CAAC;~~SACf;IACL~~,CAAC;CACJ,CAAA;~~AAvMY~~,6BAA6B;IADzC,mBAAU,EAAE;qCAGe,kDAAuB;QACtB,0BAAW;QACR,gCAAc;QACb,kCAAe;QACV,4CAAoB;QAC1B,gCAAc;~~QACjB~~,~~0BAAW;GAR3B,~~6BAA6B,~~CAuMzC~~;~~AAvMY~~,sEAA6B"}
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/dist/service/helpers/password-cipher/password-ciper.js CHANGED Viewed

@@ -5,22 +5,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PasswordCiper = void 0;
 const common_1 = require("@nestjs/common");
-// tslint:disable-next-line:no-var-requires
-const bcrypt = require('bcryptjs');
+const bcrypt_1 = __importDefault(require("bcrypt"));
 const SALT_ROUNDS = 12;
 /**
  * A cipher which uses bcrypt (https://en.wikipedia.org/wiki/Bcrypt) to hash plaintext password strings.
  */
 let PasswordCiper = class PasswordCiper {
     hash(plaintext) {
-        const salt = bcrypt.genSaltSync(SALT_ROUNDS);
-        return bcrypt.hashSync(plaintext, salt);
+        return bcrypt_1.default.hash(plaintext, SALT_ROUNDS);
     }
     check(plaintext, hash) {
-        return bcrypt.compareSync(plaintext, hash);
+        return bcrypt_1.default.compare(plaintext, hash);
     }
 };
 PasswordCiper = __decorate([

package/dist/service/helpers/password-cipher/password-ciper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"password-ciper.js","sourceRoot":"","sources":["../../../../src/service/helpers/password-cipher/password-ciper.ts"],"names":[],"mappings":"~~;;;;;;;;;~~AAAA,2CAA4C;AAC5C,~~2CAA2C~~;~~AAC3C~~,MAAM,~~MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC,MAAM,~~WAAW,GAAG,EAAE,CAAC;AAEvB;;GAEG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAa;IACtB,IAAI,CAAC,SAAiB;QAClB,~~MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC7C,~~OAAO,~~MAAM~~,CAAC,~~QAAQ~~,CAAC,SAAS,EAAE,~~IAAI~~,CAAC,CAAC;~~IAC5C~~,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,OAAO,~~MAAM~~,CAAC,~~WAAW~~,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;~~IAC/C~~,CAAC;CACJ,CAAA;~~AATY~~,aAAa;IADzB,mBAAU,EAAE;GACA,aAAa,~~CASzB~~;~~AATY~~,sCAAa"}
1	+ {"version":3,"file":"password-ciper.js","sourceRoot":"","sources":["../../../../src/service/helpers/password-cipher/password-ciper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oDAA4B;AAE5B,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;GAEG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAa;IACtB,IAAI,CAAC,SAAiB;QAClB,OAAO,gBAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,OAAO,gBAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;AARY,aAAa;IADzB,mBAAU,EAAE;GACA,aAAa,CAQzB;AARY,sCAAa"}

package/dist/service/services/channel.service.d.ts CHANGED Viewed

@@ -33,7 +33,7 @@ export declare class ChannelService {
     /**
      * Removes the entity from the given Channels and saves.
      */
-    removeFromChannels<T extends ChannelAware & VendureEntity>(ctx: RequestContext, entityType: Type<T>, entityId: ID, channelIds: ID[]): Promise<T>;
+    removeFromChannels<T extends ChannelAware & VendureEntity>(ctx: RequestContext, entityType: Type<T>, entityId: ID, channelIds: ID[]): Promise<T | undefined>;
     /**
      * Given a channel token, returns the corresponding Channel if it exists.
      */

package/dist/service/services/channel.service.js CHANGED Viewed

@@ -71,9 +71,12 @@ let ChannelService = class ChannelService {
      * Removes the entity from the given Channels and saves.
      */
     async removeFromChannels(ctx, entityType, entityId, channelIds) {
-        const entity = await this.connection.getEntityOrThrow(ctx, entityType, entityId, {
+        const entity = await this.connection.getRepository(ctx, entityType).findOne(entityId, {
             relations: ['channels'],
         });
+        if (!entity) {
+            return;
+        }
         for (const id of channelIds) {
             entity.channels = entity.channels.filter(c => !utils_1.idsAreEqual(c.id, id));
         }

package/dist/service/services/channel.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAQ6C;AAC7C,2EAA4E;AAE5E,uDAAoD;AAEpD,sEAAkE;AAClE,kEAAyF;AACzF,sDAA2G;AAC3G,sGAA8F;AAE9F,8CAA8D;AAC9D,gEAA4D;AAE5D,wEAA8D;AAC9D,4GAAgG;AAChG,wEAA8D;AAC9D,+DAAqD;AACrD,kHAA4G;AAC5G,gEAA4D;AAC5D,sFAAkF;AAElF,uEAAkE;AAGlE,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,YACY,UAAmC,EACnC,aAA4B,EAC5B,qBAA4C,EAC5C,0BAAsD;QAHtD,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,+BAA0B,GAA1B,0BAA0B,CAA4B;QAN1D,gBAAW,GAAc,EAAE,CAAC;IAOjC,CAAC;IAEJ;;;OAGG;IACH,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAyB,MAAS,EAAE,GAAmB;QACzE,MAAM,UAAU,GAAG,eAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAQ,CAAC;QACxD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,UAAmB,EACnB,QAAY,EACZ,UAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE;YAC7E,SAAS,EAAE,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;QACH,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACjC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACpB,GAAmB,EACnB,UAAmB,EACnB,QAAY,EACZ,UAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,~~gBAAgB~~,CAAC,GAAG,EAAE,UAAU,~~EAAE~~,QAAQ,EAAE;~~YAC7E~~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~~AAxOY~~,cAAc;IAD1B,mBAAU,EAAE;qCAKe,kDAAuB;QACpB,8BAAa;QACL,+CAAqB;QAChB,0DAA0B;GAPzD,cAAc,~~CAwO1B~~;~~AAxOY~~,wCAAc"}
1	+ {"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/collection.service.js CHANGED Viewed

@@ -74,9 +74,7 @@ let CollectionService = class CollectionService {
                 vendure_logger_1.Logger.verbose(`Processing ${job.data.collectionIds.length} Collections`);
                 let completed = 0;
                 for (const collectionId of job.data.collectionIds) {
-                    const collection = await this.connection.getRepository(collection_entity_1.Collection).findOne(collectionId, {
-                        relations: ['productVariants'],
-                    });
+                    const collection = await this.connection.getRepository(collection_entity_1.Collection).findOne(collectionId);
                     if (!collection) {
                         vendure_logger_1.Logger.warn(`Could not find Collection with id ${collectionId}, skipping`);
                         continue;
@@ -392,8 +390,9 @@ let CollectionService = class CollectionService {
             const productVariants = await this.connection
                 .getRepository(ctx, product_variant_entity_1.ProductVariant)
                 .createQueryBuilder('variant')
+                .select('variant.id', 'id')
                 .innerJoin('variant.collections', 'collection', 'collection.id = :id', { id: collection.id })
-                .getMany();
+                .getRawMany();
             return productVariants.map(v => v.id);
         }
     }

package/dist/service/services/collection.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/payment.service.js CHANGED Viewed

@@ -87,26 +87,25 @@ let PaymentService = class PaymentService {
         });
         const { paymentMethod, handler } = await this.paymentMethodService.getMethodAndOperations(ctx, payment.method);
         const settlePaymentResult = await handler.settlePayment(ctx, payment.order, payment, paymentMethod.handler.args);
+        const fromState = payment.state;
+        let toState;
+        payment.metadata = this.mergePaymentMetadata(payment.metadata, settlePaymentResult.metadata);
         if (settlePaymentResult.success) {
-            const fromState = payment.state;
-            const toState = 'Settled';
-            try {
-                await this.paymentStateMachine.transition(ctx, payment.order, payment, toState);
-            }
-            catch (e) {
-                const transitionError = ctx.translate(e.message, { fromState, toState });
-                return new generated_graphql_admin_errors_1.PaymentStateTransitionError(transitionError, fromState, toState);
-            }
-            payment.metadata = this.mergePaymentMetadata(payment.metadata, settlePaymentResult.metadata);
-            await this.connection.getRepository(ctx, payment_entity_1.Payment).save(payment, { reload: false });
-            this.eventBus.publish(new payment_state_transition_event_1.PaymentStateTransitionEvent(fromState, toState, ctx, payment, payment.order));
+            toState = 'Settled';
         }
         else {
+            toState = settlePaymentResult.state || 'Error';
             payment.errorMessage = settlePaymentResult.errorMessage;
-            payment.metadata = this.mergePaymentMetadata(payment.metadata, settlePaymentResult.metadata);
-            await this.paymentStateMachine.transition(ctx, payment.order, payment, settlePaymentResult.state || 'Error');
-            await this.connection.getRepository(ctx, payment_entity_1.Payment).save(payment, { reload: false });
         }
+        try {
+            await this.paymentStateMachine.transition(ctx, payment.order, payment, toState);
+        }
+        catch (e) {
+            const transitionError = ctx.translate(e.message, { fromState, toState });
+            return new generated_graphql_admin_errors_1.PaymentStateTransitionError(transitionError, fromState, toState);
+        }
+        await this.connection.getRepository(ctx, payment_entity_1.Payment).save(payment, { reload: false });
+        this.eventBus.publish(new payment_state_transition_event_1.PaymentStateTransitionEvent(fromState, toState, ctx, payment, payment.order));
         return payment;
     }
     /**