Merge pull request #233 from DivanteLtd/release/v1.9

Release/v1.9

Author: lukeromanowicz

.travis.yml

@@ -0,0 +1,22 @@
+sudo: required
+language: node_js
+
+cache:
+  yarn: true
+  directories:
+    - node_modules
+
+install:
+  - yarn
+
+jobs:
+  include:
+    - stage: Build
+      script:
+        - yarn lint
+        - yarn build
+      node_js: "8"
+    - script:
+        - yarn lint
+        - yarn build
+      node_js: "10"

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.9.0] - 2019.05.06
+- Changed location of magento1 platform js client. Moved from `src/platform/magento1/module` to [magento1-vsbridge-client](https://github.com/DivanteLtd/magento1-vsbridge-client) - @mtarld (#195)
+- Update Babel from 6 to 7 - @lukeromanowicz
+- 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) 
+- `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
 - Use encrypted token for user authentication - @pkarw
 
@@ -14,6 +23,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Magento 1 bridge client - @afirlejczyk (#190)
 - configurable ElasticSearch `apiVersion` - @Resubaka (#192)
 
-
 ## [1.8.1] - 2019.02.11
 - Fixed `apiVersion` property for ElasticSearch driver - now it's available thru `config/*.json` - @mdanilowicz (#185)

babel.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env', {
+        targets: {
+          node: "8"
+        }
+      }
+    ]
+  ]
+};

docker-compose.nodejs.yml

@@ -16,6 +16,7 @@ services:
       - './ecosystem.json:/var/www/ecosystem.json'
       - './migrations:/var/www/migrations'
       - './package.json:/var/www/package.json'
+      - './babel.config.js:/var/www/babel.config.js'
       - './scripts:/var/www/scripts'
       - './src:/var/www/src'
       - './var:/var/www/var'

migrations/1530101328854-local_es_config_fix.js

@@ -17,14 +17,14 @@ var files = fs.readdirSync(configDir).filter(function(file) {
 
 module.exports.up = next => {
   files.forEach(function(file) {
-    var file = path.join(configDir, file)
+    var path = path.join(configDir, file)
 
     try {
-      console.log(`Searching for deprecated parameters in file '${file}'...`)
-      let config = JSON.parse(fs.readFileSync(file))
+      console.log(`Searching for deprecated parameters in file '${path}'...`)
+      let config = JSON.parse(fs.readFileSync(path))
 
       if ("esHost" in config) {
-        console.log("Parameter 'esHost' found - rewriting...", file)
+        console.log("Parameter 'esHost' found - rewriting...", path)
         let esHostPort = config.esHost.split(':')
         _set(config, 'elasticsearch.host', esHostPort[0])
         _set(config, 'elasticsearch.port', esHostPort[1])
@@ -37,8 +37,8 @@ module.exports.up = next => {
         delete config.esIndexes
       }
 
-      fs.writeFileSync(file, JSON.stringify(config, null, 2))
-      console.log(`File '${file}' updated.`)
+      fs.writeFileSync(path, JSON.stringify(config, null, 2))
+      console.log(`File '${path}' updated.`)
     } catch (e) {
       throw e
     }

package.json

@@ -1,12 +1,12 @@
 {
   "name": "vue-storefront-api",
-  "version": "0.1.0",
+  "version": "1.9.0",
   "private": true,
   "description": "vue-storefront API and data services",
   "main": "dist",
   "scripts": {
-    "dev": "nodemon -w src --exec \"babel-node src --presets env,stage-0\"",
-    "build": "babel src -s -D -d dist --presets env,stage-0",
+    "dev": "nodemon -w src --exec \"babel-node src\"",
+    "build": "babel src -s -D -d dist",
     "start": "pm2 start ecosystem.json $PM2_ARGS",
     "db": "node scripts/db.js",
     "seo": "node scripts/seo.js",
@@ -33,11 +33,12 @@
   "eslintConfig": {
     "extends": "eslint:recommended",
     "parserOptions": {
-      "ecmaVersion": 7,
+      "ecmaVersion": 2018,
       "sourceType": "module"
     },
     "env": {
-      "node": true
+      "node": true,
+      "es6": true
     },
     "rules": {
       "no-console": 0,
@@ -52,6 +53,7 @@
   "license": "MIT",
   "dependencies": {
     "ajv": "^6.4.0",
+    "ajv-keywords": "^3.4.0",
     "body-parser": "^1.18.2",
     "bodybuilder": "2.2.13",
     "commander": "^2.19.0",
@@ -71,6 +73,7 @@
     "kue": "^0.11.6",
     "lodash": "^4.17.10",
     "mage2vuestorefront": "git+https://github.com/DivanteLtd/mage2vuestorefront.git",
+    "magento1-vsbridge-client": "github:DivanteLtd/magento1-vsbridge-client",
     "magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
     "merge-graphql-schemas": "^1.5.2",
     "migrate": "^1.6.2",
@@ -87,12 +90,11 @@
     "winston": "^2.4.2"
   },
   "devDependencies": {
-    "@babel/polyfill": "^7.2.5",
     "apollo-server-express": "^1.3.6",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-0": "^6.24.1",
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.4.0",
+    "@babel/node": "^7.2.2",
+    "@babel/preset-env": "^7.4.2",
     "eslint": "^4.16.0",
     "nodemon": "^1.18.7"
   },

scripts/mage2vs.js

@@ -38,6 +38,7 @@ function getMagentoDefaultConfig(storeCode) {
     MAGENTO_URL: apiConfig.url,
     REDIS_HOST: config.redis.host,
     REDIS_PORT: config.redis.port,
+    REDIS_DB: config.redis.db,
     INDEX_NAME: config.elasticsearch.indices[0],
     DATABASE_URL: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`
   }

src/api/order.js

@@ -24,18 +24,19 @@ export default ({ config, db }) => resource({
 	 * POST create an order with JSON payload compliant with models/order.md
 	 */
 	create(req, res) {
-		
 
 		const ajv = new Ajv();
-		const orderSchema = require('../models/order.schema.json')
+		require('ajv-keywords')(ajv, 'regexp');
+
+		const orderSchema = require('../models/order.schema.js')
 		const orderSchemaExtension = require('../models/order.schema.extension.json')
 		const validate = ajv.compile(merge(orderSchema, orderSchemaExtension));
 
 		if (!validate(req.body)) { // schema validation of upcoming order
 			console.dir(validate.errors);
-			apiStatus(res, validate.errors, 500);
+			apiStatus(res, validate.errors, 400);
 			return;
-		}				
+		}
 		const incomingOrder = { title: 'Incoming order received on ' + new Date() + ' / ' + req.ip, ip: req.ip, agent: req.headers['user-agent'], receivedAt: new Date(), order: req.body  }/* parsed using bodyParser.json middleware */
 		console.log(JSON.stringify(incomingOrder))
 
@@ -47,7 +48,7 @@ export default ({ config, db }) => resource({
 				key.sku = product.sku
 			}
 			// console.log(key)
-			
+
 			if (!config.tax.usePlatformTotals) {
 				if (!hmac.verify(key, product.sgn, config.objHashSecret)) {
 					console.error('Invalid hash for ' + product.sku + ': ' + product.sgn)

src/api/user.js

@@ -91,14 +91,16 @@ export default ({config, db}) => {
 		}
 		try {
 			const decodedToken = jwt.decode(req.body ? decryptToken(req.body.refreshToken, config.authHashSecret ? config.authHashSecret : config.objHashSecret) : '', config.authHashSecret ? config.authHashSecret : config.objHashSecret)
-			if (!decodedToken) {
+
+      if (!decodedToken) {
 				return apiStatus(res, 'Invalid refresh token provided', 500);
 			}
+
 			userProxy.login(decodedToken).then((result) => {
 				apiStatus(res, result, 200, {refreshToken: encryptToken(jwt.encode(decodedToken, config.authHashSecret ? config.authHashSecret : config.objHashSecret), config.authHashSecret ? config.authHashSecret : config.objHashSecret)});
 			}).catch(err => {
 				apiStatus(res, err, 500);
-			})			
+			})
 		} catch (err) {
 			return apiStatus(res, err.message, 500);
 		}

src/index.js

@@ -1,4 +1,3 @@
-import '@babel/polyfill/noConflict';
 import http from 'http';
 import express from 'express';
 import cors from 'cors';