@medusajs/medusa 1.1.44-next.1 → 1.1.47

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.47](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.46...@medusajs/medusa@1.1.47) (2021-10-23)
+
+### Bug Fixes
+
+- pull missing fields ([b82b43b](https://github.com/medusajs/medusa/commit/b82b43b4c64dc5bc705a439a214f9d1dc9976e21))
+
+## [1.1.46](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.45...@medusajs/medusa@1.1.46) (2021-10-19)
+
+### Bug Fixes
+
+- add integration test ([38813ec](https://github.com/medusajs/medusa/commit/38813ec66f23526054f7e35adf4157ce98703167))
+- allow changing regions safely ([06f5fe2](https://github.com/medusajs/medusa/commit/06f5fe267013d95231d96318fe8a055ad8040174))
+- cleanup ([5441d47](https://github.com/medusajs/medusa/commit/5441d47f88d759742e3d3d29b29bc38feceac583))
+- prettier ([5a67d1e](https://github.com/medusajs/medusa/commit/5a67d1e7fd3d9da9dca0781d0feab60db1f1099a))
+
+## [1.1.45](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.44...@medusajs/medusa@1.1.45) (2021-10-18)
+
+**Note:** Version bump only for package @medusajs/medusa
+
+## [1.1.44](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.43...@medusajs/medusa@1.1.44) (2021-10-18)
+
+### Bug Fixes
+
+- undefined references ([5afd0df](https://github.com/medusajs/medusa/commit/5afd0dfbabaebfb6b09f0e2f055386ac76059372))
+
 ## [1.1.43](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.41...@medusajs/medusa@1.1.43) (2021-10-18)
 
 ### Bug Fixes

package/dist/api/routes/store/carts/update-cart.js

@@ -93,8 +93,8 @@ var _default = /*#__PURE__*/function () {
               region_id: _medusaCoreUtils.Validator.string().optional(),
               country_code: _medusaCoreUtils.Validator.string().optional(),
               email: _medusaCoreUtils.Validator.string().email().optional(),
-              billing_address: _medusaCoreUtils.Validator.address().optional(),
-              shipping_address: _medusaCoreUtils.Validator.address().optional(),
+              billing_address: _medusaCoreUtils.Validator.address().optional().allow(null),
+              shipping_address: _medusaCoreUtils.Validator.address().optional().allow(null),
               gift_cards: _medusaCoreUtils.Validator.array().items({
                 code: _medusaCoreUtils.Validator.string()
               }).optional(),

package/dist/api/routes/store/customers/reset-password.js

@@ -59,56 +59,46 @@ var _default = /*#__PURE__*/function () {
             throw new _medusaCoreUtils.MedusaError(_medusaCoreUtils.MedusaError.Types.INVALID_DATA, error.details);
 
           case 4:
-            _context.prev = 4;
             customerService = req.scope.resolve("customerService");
-            _context.next = 8;
-            return customerService.retrieveByEmail(value.email);
+            _context.next = 7;
+            return customerService.retrieveByEmail(value.email, {
+              select: ["id", "password_hash"]
+            });
 
-          case 8:
+          case 7:
             customer = _context.sent;
-            _context.next = 11;
-            return _jsonwebtoken["default"].verify(value.token, customer.password_hash);
-
-          case 11:
-            decodedToken = _context.sent;
+            decodedToken = _jsonwebtoken["default"].verify(value.token, customer.password_hash);
 
             if (!(!decodedToken || customer.id !== decodedToken.customer_id)) {
-              _context.next = 15;
+              _context.next = 12;
               break;
             }
 
             res.status(401).send("Invalid or expired password reset token");
             return _context.abrupt("return");
 
-          case 15:
-            _context.next = 17;
+          case 12:
+            _context.next = 14;
             return customerService.update(customer.id, {
               password: value.password
             });
 
-          case 17:
-            _context.next = 19;
+          case 14:
+            _context.next = 16;
             return customerService.retrieve(customer.id);
 
-          case 19:
+          case 16:
             customer = _context.sent;
             res.status(200).json({
               customer: customer
             });
-            _context.next = 26;
-            break;
-
-          case 23:
-            _context.prev = 23;
-            _context.t0 = _context["catch"](4);
-            throw _context.t0;
 
-          case 26:
+          case 18:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[4, 23]]);
+    }, _callee);
   }));
 
   return function (_x, _x2) {

package/dist/loaders/search-index.js

@@ -44,7 +44,7 @@ function _loadProductsIntoSearchEngine() {
                 gt: lastSeenId
               }
             }, {
-              select: ["id", "title", "subtitle", "description", "handle", "is_giftcard", "discountable", "thumbnail", "profile_id", "collection_id", "type_id", "origin_country", "created_at", "updated_at"],
+              select: ["id", "title", "status", "subtitle", "description", "handle", "is_giftcard", "discountable", "thumbnail", "profile_id", "collection_id", "type_id", "origin_country", "created_at", "updated_at"],
               relations: ["variants", "tags", "type", "collection", "variants.prices", "variants.options", "options"],
               take: TAKE,
               order: {

package/dist/services/cart.js

@@ -1580,7 +1580,7 @@ var CartService = /*#__PURE__*/function (_BaseService) {
     key: "updateBillingAddress_",
     value: function () {
       var _updateBillingAddress_ = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18(cart, addressOrId, addrRepo) {
-        var addr, created;
+        var updated, addr, created;
         return _regenerator["default"].wrap(function _callee18$(_context18) {
           while (1) {
             switch (_context18.prev = _context18.next) {
@@ -1604,42 +1604,46 @@ var CartService = /*#__PURE__*/function (_BaseService) {
                 addressOrId.country_code = addressOrId.country_code.toLowerCase();
 
                 if (!addressOrId.id) {
-                  _context18.next = 10;
+                  _context18.next = 12;
                   break;
                 }
 
-                cart.billing_address_id = addressOrId.id;
-                cart.billing_address = addressOrId;
-                _context18.next = 20;
+                _context18.next = 8;
+                return addrRepo.save(addressOrId);
+
+              case 8:
+                updated = _context18.sent;
+                cart.billing_address = updated;
+                _context18.next = 22;
                 break;
 
-              case 10:
+              case 12:
                 if (!cart.billing_address_id) {
-                  _context18.next = 18;
+                  _context18.next = 20;
                   break;
                 }
 
-                _context18.next = 13;
+                _context18.next = 15;
                 return addrRepo.findOne({
                   where: {
                     id: cart.billing_address_id
                   }
                 });
 
-              case 13:
+              case 15:
                 addr = _context18.sent;
-                _context18.next = 16;
+                _context18.next = 18;
                 return addrRepo.save(_objectSpread(_objectSpread({}, addr), addressOrId));
 
-              case 16:
-                _context18.next = 20;
+              case 18:
+                _context18.next = 22;
                 break;
 
-              case 18:
+              case 20:
                 created = addrRepo.create(_objectSpread({}, addressOrId));
                 cart.billing_address = created;
 
-              case 20:
+              case 22:
               case "end":
                 return _context18.stop();
             }
@@ -1664,77 +1668,92 @@ var CartService = /*#__PURE__*/function (_BaseService) {
     key: "updateShippingAddress_",
     value: function () {
       var _updateShippingAddress_ = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19(cart, addressOrId, addrRepo) {
-        var addr, created;
+        var _addressOrId$country_, _addressOrId$country_2;
+
+        var updated, addr, created;
         return _regenerator["default"].wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
               case 0:
+                if (!(addressOrId === null)) {
+                  _context19.next = 3;
+                  break;
+                }
+
+                cart.shipping_address = null;
+                return _context19.abrupt("return");
+
+              case 3:
                 if (!(typeof addressOrId === "string")) {
-                  _context19.next = 4;
+                  _context19.next = 7;
                   break;
                 }
 
-                _context19.next = 3;
+                _context19.next = 6;
                 return addrRepo.findOne({
                   where: {
                     id: addressOrId
                   }
                 });
 
-              case 3:
+              case 6:
                 addressOrId = _context19.sent;
 
-              case 4:
-                addressOrId.country_code = addressOrId.country_code.toLowerCase();
+              case 7:
+                addressOrId.country_code = (_addressOrId$country_ = (_addressOrId$country_2 = addressOrId.country_code) === null || _addressOrId$country_2 === void 0 ? void 0 : _addressOrId$country_2.toLowerCase()) !== null && _addressOrId$country_ !== void 0 ? _addressOrId$country_ : null;
 
-                if (cart.region.countries.find(function (_ref13) {
+                if (!(addressOrId.country_code && !cart.region.countries.find(function (_ref13) {
                   var iso_2 = _ref13.iso_2;
                   return addressOrId.country_code === iso_2;
-                })) {
-                  _context19.next = 7;
+                }))) {
+                  _context19.next = 10;
                   break;
                 }
 
                 throw new _medusaCoreUtils.MedusaError(_medusaCoreUtils.MedusaError.Types.INVALID_DATA, "Shipping country must be in the cart region");
 
-              case 7:
+              case 10:
                 if (!addressOrId.id) {
-                  _context19.next = 12;
+                  _context19.next = 17;
                   break;
                 }
 
-                cart.shipping_address = addressOrId;
-                cart.shipping_address_id = addressOrId.id;
-                _context19.next = 22;
+                _context19.next = 13;
+                return addrRepo.save(addressOrId);
+
+              case 13:
+                updated = _context19.sent;
+                cart.shipping_address = updated;
+                _context19.next = 27;
                 break;
 
-              case 12:
+              case 17:
                 if (!cart.shipping_address_id) {
-                  _context19.next = 20;
+                  _context19.next = 25;
                   break;
                 }
 
-                _context19.next = 15;
+                _context19.next = 20;
                 return addrRepo.findOne({
                   where: {
                     id: cart.shipping_address_id
                   }
                 });
 
-              case 15:
+              case 20:
                 addr = _context19.sent;
-                _context19.next = 18;
+                _context19.next = 23;
                 return addrRepo.save(_objectSpread(_objectSpread({}, addr), addressOrId));
 
-              case 18:
-                _context19.next = 22;
+              case 23:
+                _context19.next = 27;
                 break;
 
-              case 20:
+              case 25:
                 created = addrRepo.create(_objectSpread({}, addressOrId));
                 cart.shipping_address = created;
 
-              case 22:
+              case 27:
               case "end":
                 return _context19.stop();
             }
@@ -3087,6 +3106,14 @@ var CartService = /*#__PURE__*/function (_BaseService) {
                 cart.items = _context40.sent;
 
               case 12:
+                /*
+                 * When changing the region you are changing the set of countries that your
+                 * cart can be shipped to so we need to make sure that the current shipping
+                 * address adheres to the new country set.
+                 *
+                 * First check if there is an existing shipping address on the cart if so
+                 * fetch the entire thing so we can modify the shipping country
+                 */
                 shippingAddress = {};
 
                 if (!cart.shipping_address_id) {
@@ -3132,6 +3159,14 @@ var CartService = /*#__PURE__*/function (_BaseService) {
                 break;
 
               case 25:
+                /*
+                 * In the case where the country code is not specified we need to check
+                 *
+                 *   1. if the region we are switching to has only one country preselect
+                 *      that
+                 *   2. if the region has multiple countries we need to unset the country
+                 *      and wait for client to decide which country to use
+                 */
                 _updated = _objectSpread({}, shippingAddress); // If the country code of a shipping address is set we need to clear it
 
                 if (!_lodash["default"].isEmpty(shippingAddress) && shippingAddress.country_code) {

package/dist/services/customer.js

@@ -152,7 +152,9 @@ var CustomerService = /*#__PURE__*/function (_BaseService) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return this.retrieve(customerId);
+                return this.retrieve(customerId, {
+                  select: ["id", "has_account", "password_hash", "email", "first_name", "last_name"]
+                });
 
               case 2:
                 customer = _context.sent;

package/dist/subscribers/product.js

@@ -21,7 +21,7 @@ var _product = _interopRequireDefault(require("../services/product"));
 
 var _medusaCoreUtils = require("medusa-core-utils");
 
-var searchFields = ["id", "title", "subtitle", "description", "handle", "is_giftcard", "discountable", "thumbnail", "profile_id", "collection_id", "type_id", "origin_country", "created_at", "updated_at"];
+var searchFields = ["id", "title", "subtitle", "status", "description", "handle", "is_giftcard", "discountable", "thumbnail", "profile_id", "collection_id", "type_id", "origin_country", "created_at", "updated_at"];
 var searchRelations = ["variants", "tags", "type", "collection", "variants.prices", "variants.options", "options"];
 
 var ProductSearchSubscriber = function ProductSearchSubscriber(_ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.44-next.1+116f85e7",
+  "version": "1.1.47",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": {
@@ -20,11 +20,11 @@
     "@babel/cli": "^7.14.3",
     "@babel/core": "^7.14.3",
     "@babel/preset-typescript": "^7.13.0",
-    "babel-preset-medusa-package": "^1.1.15",
+    "babel-preset-medusa-package": "^1.1.17",
     "cross-env": "^5.2.1",
     "eslint": "^6.8.0",
     "jest": "^25.5.2",
-    "medusa-interfaces": "^1.1.25",
+    "medusa-interfaces": "^1.1.27",
     "nodemon": "^2.0.1",
     "prettier": "^1.19.1",
     "sqlite3": "^5.0.2",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^16.1.8",
-    "@medusajs/medusa-cli": "^1.1.20",
+    "@medusajs/medusa-cli": "^1.1.22",
     "@types/lodash": "^4.14.168",
     "awilix": "^4.2.3",
     "body-parser": "^1.19.0",
@@ -67,8 +67,8 @@
     "joi": "^17.3.0",
     "joi-objectid": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
-    "medusa-core-utils": "^1.1.24",
-    "medusa-test-utils": "^1.1.27",
+    "medusa-core-utils": "^1.1.26",
+    "medusa-test-utils": "^1.1.29",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",
     "passport": "^0.4.0",
@@ -87,5 +87,5 @@
     "uuid": "^8.3.1",
     "winston": "^3.2.1"
   },
-  "gitHead": "116f85e7e1870c5a1e4a2e8b7288267614aa7883"
+  "gitHead": "81847456f1b2229d58f0e4e46a7fc079277e4b2b"
 }