Merge branch 'release/v1.11-rc1' into add-website-id-to-password-reset

Author: andrzejewsky

.eslintrc.js

@@ -0,0 +1,58 @@
+module.exports = {
+  root: true,
+  env: { jest: true, node: true, es6: true},
+  parserOptions: {
+    parser: '@typescript-eslint/parser',
+    ecmaVersion: 2018,
+    sourceType: 'module'
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: [
+    'standard',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  plugins: ['vue-storefront', '@typescript-eslint'],
+  // add your custom rules here
+  rules: {
+    '@typescript-eslint/no-var-requires': 1,
+    '@typescript-eslint/indent': ['error', 2],
+    '@typescript-eslint/camelcase': 0,
+    semi: 'off',
+    '@typescript-eslint/semi': 0,
+    '@typescript-eslint/member-delimiter-style': ['error', { 'multiline': { 'delimiter': 'comma', 'requireLast': false }, 'singleline': { 'delimiter': 'comma' } }],
+    '@typescript-eslint/no-empty-interface': 1,
+    '@typescript-eslint/no-use-before-define': 1,
+    '@typescript-eslint/no-explicit-any': 0,
+    '@typescript-eslint/class-name-casing': 1,
+    '@typescript-eslint/no-unused-vars': 0,
+    '@typescript-eslint/explicit-function-return-type': 0,
+    '@typescript-eslint/no-var-requires': 0,
+    'handle-callback-err': 1,
+    'prefer-promise-reject-errors': 0,
+    'import/no-duplicates': ['warning'],
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    'prefer-arrow-callback': 1,
+    // allow async-await
+    'generator-star-spacing': 0,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'no-restricted-imports': [2, { paths: ['lodash-es'] }],
+    'vue-storefront/no-corecomponent-import': 'error',
+    'vue-storefront/no-corecomponent': 'error',
+    'vue-storefront/no-corepage-import': 'error',
+    'vue-storefront/no-corepage': 'error',
+    'no-console': 0,
+    'no-unused-vars': 1
+  },
+  overrides: [
+    {
+      // @todo check if this is closed https://github.com/typescript-eslint/typescript-eslint/issues/342
+      // This is an issue with interfaces so we need to wait until it fixed.
+      files: ['core/**/*.ts'],
+      rules: {
+        'no-undef': 1
+      }
+    }
+  ]
+};

.gitignore

@@ -9,6 +9,7 @@ api_test.sh
 package-lock.json
 src/config.json
 config/local.json
+config/certs/*.pem
 var/magento2-sample-data/
 .migrate
 *.iml

.travis.yml

@@ -21,3 +21,12 @@ jobs:
     - <<: *build
       node_js: '8'
 
+    - &unit
+      stage: Test
+      script: yarn test:unit
+      name: "NodeJS 10 unit tests"
+      node_js: "10"
+
+    - <<: *unit
+      name: "NodeJS 8 unit tests"
+      node_js: "8"

CHANGELOG.md

@@ -4,6 +4,36 @@ 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.11.0-rc.2] - unreleased
+
+### Fixed
+
+- Fixed some smaller issues with graphql so that it is now working again with the fronted - #350
+
+
+## [1.11.0-rc.1] - 2019.10.03
+
+### Added
+- Output cache support with tagging and cache invalidate requests forwarding - @pkarw @resubaka (https://github.com/DivanteLtd/vue-storefront/issues/3367, #333)
+- Constant for Mailchimp subscription status - @KonstantinSoelch (#294)
+- mage2vs import now has optional `--generate-unique-url-keys` parameter which defaults to `false` to enable/disable the url key generation with name and id for categories - @rain2o (#232)
+- `extensions/elastic-stock` module added which is a drop-in replacement for `stock`; the difference is that it's getting the stock information from Elastic, not from e-Commerce backend directly; to use it - please just make sure your `config/local.json` file has `elastic-stock` in the `registeredExtensions` collection; then please make sure in the `vue-storefront` to change the `config.stock.ednpoint`  from `http://<your-api-host>/api/stock` to `http://<your-api-host>/api/ext/elastic-stock`
+- Added eslint config from vue-storefront so we have the same config and in both repos typescript support - @resubaka (#320)
+- Added jest support - @resubaka (#321)
+- Added caching factory and action factory for the image endpoint. This gives the possibility to use other services for caching or image processing - @resubaka (#317, #315)
+- Added support for tax calculation where the values from customer_tax_class_ids is used - @resubaka (#307)
+
+### Fixed
+- The `product.price_*` fields have been normalized with the backward compatibility support (see `config.tax.deprecatedPriceFieldsSupport` which is by default true) - @pkarw (#289)
+- The `product.final_price` field is now being taken into product price calcualtion. Moreover, we've added the `config.tax.finalPriceIncludesTax` - which is set to `true` by default. All the `price`, `original_price` and `special_price` fields are calculated accordingly. It was required as Magento2 uses `final_price` to set the catalog pricing rules after-prices - @pkarw (#289)
+- Force ES connections to use protocol config option - @cewald (#303, #304)
+- Better handling of HTTP error codes provided by API client - #3151
+
+### Changed
+- Error responses for mailchimp - @andrzejewsky (#3337)
+- Replaced function arguments to object destructuring in `calculateProductTax` - @andrzejewsky (#3337)
+- Refactor `taxcalc.js` similar to frontend - @gibkigonzo (#356)
+
 ## [1.10.0] - 2019.08.12
 
 ### Added
@@ -16,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Extensions have ability to modify Elasticsearch results. - @grimasod (#269)
 - Refactored Travis build config - @Tjitse-E (#273)
 - Multistore support for `magento1`-platform using `magento1-vsbridge` - @cewald (#276)
+- Support self signed certificates - @lukeromanowicz (#287)
 
 ### Changed
 - Sharp dependency has been updated. *It might require reinstalling yarn dependencies* - @lukeromanowicz
@@ -56,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support unicode characters in order requests - @lukeromanowicz (#201)
 - TravisCI configured for building and linting - @lukeromanowicz (#204)
 - Use Redis database from configuration in mage2vs - @Cyclonecode (#211)
-- Requests with invalid body result in HTTP code 400 instead of 500 - @AndreiBelokopytov (#220) 
+- Requests with invalid body result in HTTP code 400 instead of 500 - @AndreiBelokopytov (#220)
 - `src/models/order.schema.json` was moved to `src/models/order.schema.js` to support regex transformation - @lukeromanowicz (#201)
 
 ## [1.8.4] - 2019.04.17

README.md

@@ -82,7 +82,7 @@ This backend is using ElasticSearch data formats popularized by [ElasticSuite fo
 Please use data migration mechanism provided to manipulate Redis, ElasticSearch or kue. Details: https://github.com/DivanteLtd/vue-storefront-api/tree/master/doc 
 
 ## Adding custom modules with own dependencies (Yarn only)
-When adding custom [Extensions to the API](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Extending%20vue-storefront-api.md) you might want to define some dependencies inside them. Thanks to [Yarn workspaces](https://yarnpkg.com/lang/en/docs/workspaces/) dependecies defined inside your custom module will be intaled when you execute `yarn` at project root level, so it's way esier and faster than installing all modules dependcies separetly.
+When adding custom [Extensions to the API](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Extending%20vue-storefront-api.md) you might want to define some dependencies inside them. Thanks to [Yarn workspaces](https://yarnpkg.com/lang/en/docs/workspaces/) dependencies defined inside your custom module will be installed when you execute `yarn` at project root level, so it's way easier and faster than installing all modules dependencies separately.
 
 To do this, define the `package.json` with your dependencies in your custom module:
 - `src/api/extensions/{your-custom-extension}/package.json` 
@@ -94,6 +94,24 @@ NOTE: `npm` users will still have to install the dependencies individually in th
 
 ## Reviews
 To use review feature you need to install custom module for Magento 2: [Divante ReviewApi](https://github.com/DivanteLtd/magento2-review-api)
+By default new reviews will be added with status "Pending". 
+```json
+  "review": {
+    "defaultReviewStatus": 2 
+  },
+```
+
+## Output Cache
+Vue Storefront API supports output cache for catalog operations. Cache is tagged and can by dynamically invalidated. Please find the details how to configure it [in our docs](https://docs.vuestorefront.io/guide/basics/ssr-cache.html).
+
+You can manually clear the Redis cache for specific tags by running the following command:
+
+```bash
+npm run cache clear
+npm run cache clear -- --tag=product,category
+npm run cache clear -- --tag=P198
+npm run cache clear -- --tag=*
+```
 
 ## Running initial Magento2 import
 
@@ -141,6 +159,11 @@ You can use the following command to run a delta indexer for a specific storevie
 yarn mage2vs productsdelta --store-code=de
 ```
 
+## Self signed certificates
+
+Often in non production environment other services are using self signed certificates for secure connection.
+You can easily setup the application to trust them by putting them in config/certs directory.  
+
 License
 -------
 

config/certs/.gitkeep

@@ -2,7 +2,14 @@
   "server": {
     "host": "localhost",
     "port": 8080,
-    "searchEngine": "elasticsearch"
+    "searchEngine": "elasticsearch",
+    "useOutputCacheTagging": false,
+    "useOutputCache": false,
+    "outputCacheDefaultTtl": 86400,
+    "availableCacheTags": ["P", "C", "T", "A", "product", "category", "attribute", "taxrule"],
+    "invalidateCacheKey": "aeSu7aip",
+    "invalidateCacheForwarding": false,
+    "invalidateCacheForwardUrl": "http://localhost:3000/invalidate?key=aeSu7aip&tag="
   },
   "orders": {
     "useServerQueue": false
@@ -14,8 +21,6 @@
     "host": "localhost",
     "port": 9200,
     "protocol": "http",
-    "user": "elastic",
-    "password": "changeme",
     "min_score": 0.01,
     "indices": [
       "vue_storefront_catalog",
@@ -70,8 +75,12 @@
       "tax": {
         "defaultCountry": "DE",
         "defaultRegion": "",
+        "deprecatedPriceFieldsSupport": true,
         "calculateServerSide": true,
-		    "sourcePriceIncludesTax": false
+        "sourcePriceIncludesTax": false,
+        "finalPriceIncludesTax": true,
+        "userGroupId": null,
+        "useOnlyDefaultUserGroupId": false
       },
       "i18n": {
         "fullCountryName": "Germany",
@@ -102,7 +111,11 @@
         "defaultCountry": "IT",
         "defaultRegion": "",
         "calculateServerSide": true,
-		"sourcePriceIncludesTax": false
+        "sourcePriceIncludesTax": false,
+        "deprecatedPriceFieldsSupport": true,
+        "finalPriceIncludesTax": true,
+        "userGroupId": null,
+        "useOnlyDefaultUserGroupId": false
       },
       "i18n": {
         "fullCountryName": "Italy",
@@ -128,7 +141,14 @@
     "alwaysSyncPlatformPricesOver": false,
     "usePlatformTotals": true,
     "setConfigurableProductOptions": true,
-	"sourcePriceIncludesTax": false
+    "sourcePriceIncludesTax": false,
+    "deprecatedPriceFieldsSupport": true,
+    "finalPriceIncludesTax": true,
+    "userGroupId": null,
+    "useOnlyDefaultUserGroupId": false
+  },
+  "review": {
+    "defaultReviewStatus": 2 
   },
   "bodyLimit": "100kb",
   "corsHeaders": [
@@ -140,13 +160,15 @@
     "example-magento-api",
     "cms-data",
     "mail-service",
-    "example-processor"
+    "example-processor",
+    "elastic-stock"
   ],
   "extensions": {
     "mailchimp": {
       "listId": "e06875a7e1",
       "apiKey": "a9a3318ea7d30f5c5596bd4a78ae0985-us3",
-      "apiUrl": "https://us3.api.mailchimp.com/3.0"
+      "apiUrl": "https://us3.api.mailchimp.com/3.0",
+      "userStatus": "subscribed"
     },
     "mailService": {
       "transport": {
@@ -210,7 +232,22 @@
       "queue": 2,
       "process": 4
     },
-    "simd": true
+    "simd": true,
+    "caching": {
+      "active": false,
+      "type": "file",
+      "file": {
+        "path": "/tmp/vue-storefront-api"
+      },
+      "google-cloud-storage": {
+        "libraryOptions": {},
+        "bucket": "",
+        "prefix": "vue-storefront-api/image-cache"
+      }
+    },
+    "action": {
+      "type": "local"
+    }
   },
   "entities": {
       "category": {

config/default.json

@@ -0,0 +1 @@
+{}

config/test.json

@@ -5,7 +5,6 @@ services:
     build: docker/elasticsearch/
     volumes:
       - ./docker/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
-      - ./docker/elasticsearch/data:/usr/share/elasticsearch/data
     ports:
       - '9200:9200'
       - '9300:9300'

docker-compose.yml

@@ -7,6 +7,7 @@ WORKDIR /var/www
 RUN apk add --no-cache curl git
 
 COPY package.json ./
+COPY yarn.lock ./
 
 RUN apk add --no-cache --virtual .build-deps ca-certificates wget && \
     yarn install --no-cache && \