Merge pull request #67 from nzzdev/release-2.3.0

Release 2.3.0
nzzdev · Jun 27, 2017 · c109009 · c109009
2 parents e22ce10 + 2fa2920
commit c109009
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/docs/about-targets.md b/docs/about-targets.md
@@ -77,6 +77,10 @@ const tools = {
         demo2: {
           path: '/rendering-info/html-static',
           //...
+        },
+        demo3: {
+          url: 'https://some-other-service.example.com/rendering-info', // you can use url to use an external service providing the rendering information
+          //...
         }
       }
   //...

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nzz/q-server",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/processing/rendering-info-fetcher.js b/processing/rendering-info-fetcher.js
@@ -21,6 +21,14 @@ function getRenderingInfo(data, target, toolRuntimeConfig) {
 
   const baseUrl = server.settings.app.tools.get(`/${toolName}/baseUrl`, { target: target })
   const endpoint = server.settings.app.tools.get(`/${toolName}/endpoint`, { target: target })
+  let requestUrl;
+  if (endpoint.hasOwnProperty('path')) {
+    requestUrl = `${baseUrl}${endpoint.path}`;
+  } else if (endpoint.hasOwnProperty('url')) {
+    requestUrl = endpoint.url;
+  } else {
+    throw new Error('Endpoint has no path nor url configured');
+  }
 
   // add _id, createdDate and updatedDate as query params to rendering info request
   let queryParams = ['_id', 'createdDate', 'updatedDate'];
@@ -38,7 +46,7 @@ function getRenderingInfo(data, target, toolRuntimeConfig) {
     toolRuntimeConfig: toolRuntimeConfig
   }
 
-  return fetch(`${baseUrl}${endpoint.path}?${queryString}`, {
+  return fetch(`${requestUrl}?${queryString}`, {
       method: 'POST',
       body: JSON.stringify(body),
       headers: {