Merge pull request #94 from lukeromanowicz/release/v1.10

Release v1.10

.gitignore

@@ -3,3 +3,4 @@ src/test_reindex.sh
 src/node_modules
 package-lock.json
 node_modules
+.idea

CHANGELOG.md

@@ -4,8 +4,16 @@ 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).
 
-<<<<<<< HEAD
-## [1.9]
+# [1.10] - 2019.07.10
+### Added
+ - Added optional Redis Auth functionality. - @rain2o (#42)
+ - MSI support - @dimasch (#86)
+
+### Fixed
+ - Import throwing an error when product's first category name was empty - @Loac-fr (#92)
+ - Typos in documentation - @kkdg, @adityasharma7 (#90, #91)
+
+## [1.9] - 2019.03.14
 ### Added
 - New ENV variable `SEO_USE_URL_DISPATCHER` (default = true) added. When set, then the `product.url_path` and `category.url_path` are automatically populated for the UrlDispatche featu$
 

README.md

@@ -220,7 +220,8 @@ node --harmony cli.js productsworker
 ```
 
 **Please note:** We're using [kue based on Redis queue](https://github.com/Automattic/kue) which may be configured via `src/config.js` - `kue` + `redis` section.
-**Please note:** There is no authorization mechanism in place for the webapi calls. Please keep it local / private networked or add some kind of authorization as a PR to this project please :-)
+
+ **Please note:** Redis now supports auth. In order to use Redis with auth simply pass the password to the `REDIS_AUTH` env variable.
 
 
 ### Multistore setup

src/adapters/abstract.js

@@ -19,8 +19,12 @@ class AbstractAdapter {
     if (global.cache == null) {
       this.cache = Redis.createClient(this.config.redis); // redis client
       this.cache.on('error', (err) => { // workaround for https://github.com/NodeRedis/node_redis/issues/713
-        global.cache = Redis.createClient(this.config.redis); // redis client
+        this.cache = Redis.createClient(this.config.redis); // redis client
       });
+      // redis auth if provided
+      if (this.config.redis.auth) {
+        this.cache.auth(this.config.redis.auth);
+      }
       global.cache = this.cache;
     } else this.cache = global.cache;
 

src/config.js

@@ -7,9 +7,15 @@ module.exports = {
     productUrlPathMapper: (product) => {
       let destPath = ''
       if (product.category && product.category.length > 0) {
-        const firstCat = product.category[0]
-        destPath = (firstCat.path ? (firstCat.path) : _slugify(firstCat.name)) + '/' + (product.slug ? product.slug : _slugify(product.name + '-' + product.id))
-      } else {
+        for (let i = 0; i < product.category.length; i++) {
+          if (typeof product.category[i].name !== 'undefined') {
+            const firstValidCat = product.category[i]
+            destPath = (firstValidCat.path ? (firstValidCat.path) : _slugify(firstValidCat.name)) + '/' + (product.slug ? product.slug : _slugify(product.name + '-' + product.id))
+            break
+          }
+        }
+      }
+      if (destPath === '') {
         destPath = (product.slug ? product.slug : _slugify(product.name + '-' + product.id))
       }
       destPath += '.html'
@@ -61,6 +67,7 @@ module.exports = {
   redis: {
     host: process.env.REDIS_HOST || '127.0.0.1',
     port: process.env.REDIS_PORT || 6379,
+    auth: process.env.REDIS_AUTH || false,
     db: process.env.REDIS_DB || 0
   },