Merge remote-tracking branch 'github/develop'

Author: tkostuch

CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.12.3] - 2020.07.23
+
+### Fixed
+
+- Bump version for `vsf-utilities` - @gibkigonzo (#495)
+
+
+## [1.12.2] - 2020.07.20
+
+### Added
+
+- Added validation for user profile update. - @gibkigonzo (#488) - **Breaking change!** - from this change you can't send anything when you update user data. You can only send what is specified in `src/models/userProfileUpdate.schema.json`. If you still want to send anything then change `"additionalProperties": false,` to `true`.
+- add `getToken` to handle getting token from header - @gibkigonzo (#488)
+- Allow filter elasticsearch request for security reasons - @seSze (#476)
+
+### Fixed
+
+- Fix default value for `maxAgeForResponse` - @lauraseidler (#485)
+- Adds `vsf-utlilities`. Use productEquals to compare products in o2m - @gibkigonzo (#477)
 
 ## [1.12.1] - 2020.06.22
 

config/default.json

@@ -12,6 +12,9 @@
     "invalidateCacheForwardUrl": "http://localhost:3000/invalidate?key=aeSu7aip&tag=",
     "showErrorStack": false
   },
+  "users": {
+    "tokenInHeader": false
+  },
   "orders": {
     "useServerQueue": false
   },
@@ -40,6 +43,9 @@
       "review"
     ],
     "apiVersion": "5.6",
+    "useRequestFilter": false,
+    "overwriteRequestSourceParams": false,
+    "requestParamsBlacklist": [],
     "cacheRequest": false,
     "searchScoring": {
       "attributes": {
@@ -81,21 +87,21 @@
       "tax_class_id": "tci",
       "description": "desc",
       "minimal_regular_price": "mrp",
-      "final_price": "fp", 
-      "price": "p", 
+      "final_price": "fp",
+      "price": "p",
       "special_price": "sp",
       "original_final_price": "ofp",
       "original_price": "op",
       "original_special_price": "osp",
-      "final_price_incl_tax": "fpit", 
+      "final_price_incl_tax": "fpit",
       "original_price_incl_tax": "opit",
       "price_incl_tax": "pit",
-      "special_price_incl_tax": "spit", 
+      "special_price_incl_tax": "spit",
       "final_price_tax": "fpt",
       "price_tax": "pt",
       "special_price_tax": "spt",
       "original_price_tax": "opt",
-      "image": "i", 
+      "image": "i",
       "small_image": "si",
       "thumbnail": "t"
     },
@@ -106,7 +112,7 @@
       "default": 10,
       "size": 10,
       "color": 10
-    },    
+    },
     "priceFilterKey": "final_price",
     "priceFilters": {
       "ranges": [
@@ -115,10 +121,10 @@
         { "from": 100, "to": 150 },
         { "from": 150 }
       ]
-    }    
+    }
   },
   "varnish": {
-    "host": "185.246.52.88",
+    "host": "localhost",
     "port": 80,
     "method": "BAN",
     "enabled": false
@@ -234,7 +240,7 @@
     "useOnlyDefaultUserGroupId": false
   },
   "review": {
-    "defaultReviewStatus": 2 
+    "defaultReviewStatus": 2
   },
   "bodyLimit": "100kb",
   "corsHeaders": [
@@ -347,15 +353,6 @@
         "includeFields": [ "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable" ],
         "loadByAttributeMetadata": false
       },
-      "productList": {
-        "sort": "",
-        "includeFields": [ "type_id", "sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "url_key" ],
-        "excludeFields": [ "configurable_children", "description", "configurable_options", "sgn" ]
-      },
-      "productListWithChildren": {
-        "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax", "configurable_children.color", "configurable_children.size", "product_links", "url_key"],
-        "excludeFields": [ "description", "sgn"]
-      },
       "product": {
         "excludeFields": [ "updated_at", "created_at", "attribute_set_id", "status", "visibility", "tier_prices", "options_container", "msrp_display_actual_price_type", "has_options", "stock.manage_stock", "stock.use_config_min_qty", "stock.use_config_notify_stock_qty", "stock.stock_id",  "stock.use_config_backorders", "stock.use_config_enable_qty_inc", "stock.enable_qty_increments", "stock.use_config_manage_stock", "stock.use_config_min_sale_qty", "stock.notify_stock_qty", "stock.use_config_max_sale_qty", "stock.use_config_max_sale_qty", "stock.qty_increments", "small_image"],
         "includeFields": null,

docker/varnish/docker-compose copy/docker-compose.nodejs.yml

@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront-api",
-  "version": "1.12.1",
+  "version": "1.12.3",
   "private": true,
   "description": "vue-storefront API and data services",
   "main": "dist",
@@ -93,6 +93,7 @@
     "storefront-query-builder": "https://github.com/DivanteLtd/storefront-query-builder.git",
     "syswide-cas": "latest",
     "tsconfig-paths": "^3.9.0",
+    "vsf-utilities": "^1.0.2",
     "winston": "^2.4.2"
   },
   "devDependencies": {

docker/varnish/docker-compose copy/docker-compose.varnish.yml

@@ -76,7 +76,7 @@ async function setAttributeInCache (attributeList, config) {
  * @param attribute - attribute object
  * @param optionsIds - list of only needed options ids
  */
-function clearAttributeOpitons (attribute, optionsIds: number[]) {
+function clearAttributeOptions (attribute, optionsIds: number[]) {
   const stringOptionsIds = optionsIds.map(String)
   return {
     ...attribute,
@@ -102,7 +102,7 @@ async function list (attributesParam: AttributeListParam, config, indexName: str
         attributeCodes.splice(index, 1)
 
         // clear unused options
-        return clearAttributeOpitons(cachedAttribute, attributeOptionsIds)
+        return clearAttributeOptions(cachedAttribute, attributeOptionsIds)
       }
     })
     // remove empty results from cache.get
@@ -134,7 +134,7 @@ async function list (attributesParam: AttributeListParam, config, indexName: str
         const attributeOptionsIds = attributesParam[fetchedAttribute.attribute_code]
 
         // clear unused options
-        return clearAttributeOpitons(fetchedAttribute, attributeOptionsIds)
+        return clearAttributeOptions(fetchedAttribute, attributeOptionsIds)
       })
     ]