From 3fe5585092c47c081b84636d48974076c14b888a Mon Sep 17 00:00:00 2001
From: Thomas Rosenau <thomas.rosenau@seitenbau.com>
Date: Thu, 14 Apr 2016 16:25:47 +0200
Subject: [PATCH] #1 Add second example project URLs

The backend does not yet work as wanted. We need to fix #6 first.
---
 .../config/services/GET.mock.development.json |  6 +++-
 src/example2/example2-public/index.html       | 29 +++++++++++++++----
 src/lib/routing.js                            |  3 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/example2/config/services/GET.mock.development.json b/src/example2/config/services/GET.mock.development.json
index c15efe8..b096066 100644
--- a/src/example2/config/services/GET.mock.development.json
+++ b/src/example2/config/services/GET.mock.development.json
@@ -2,9 +2,13 @@
     "active": true,
     "services": [
         {
-            "active": true,
             "path": "exampleEndpoint",
             "file": "get-result.example.json"
+        }, {
+            "path": "mix-n-mock",
+            "error": {
+                "status": 500
+            }
         }
     ]
 }
diff --git a/src/example2/example2-public/index.html b/src/example2/example2-public/index.html
index f489e3c..ebaeaf1 100644
--- a/src/example2/example2-public/index.html
+++ b/src/example2/example2-public/index.html
@@ -38,7 +38,7 @@
     }
 
     button {
-        width: 15em;
+        width: 30em;
         height: 2em;
         text-align: center;
     }
@@ -71,29 +71,48 @@ <h2>Advanced example</h2>
 <a href="img/example.by.Marcelo.Quinan.from.unsplash.com-CC-zero.jpg" target="_blank">static file</a>
 <ul>
     <li>
-        <button type="submit" data-method="GET" data-action="rest/exampleEndpoint">
+        <button type="submit" data-method="GET" data-action="exampleEndpoint">
             Submit GET-Request
         </button>
         <span>(no delay)</span>
     </li>
     <li>
-        <button type="submit" data-method="POST" data-action="rest/exampleEndpoint">
+        <button type="submit" data-method="POST" data-action="exampleEndpoint">
             Submit POST-Request
         </button>
         <span>(100ms delay)</span>
     </li>
     <li>
-        <button type="submit" data-method="PUT" data-action="rest/exampleEndpoint">
+        <button type="submit" data-method="PUT" data-action="exampleEndpoint">
             Submit PUT-Request
         </button>
         <span>(1s delay)</span>
     </li>
     <li>
-        <button type="submit" data-method="DELETE" data-action="rest/exampleEndpoint">
+        <button type="submit" data-method="DELETE" data-action="exampleEndpoint">
             Submit DELETE-Request
         </button>
         <span>(5s delay)</span>
     </li>
+    <li>
+        <button type="submit" data-method="GET" data-action="repos/SEITENBAU/mix-n-mock">
+            Get mix-n-mock repo info from Github
+        </button>
+        <span>(proxied)</span>
+    </li>
+    <li>
+        <button type="submit" data-method="GET" data-action="repos/github/github-services">
+            Get github/github-services repo info from Github
+        </button>
+        <span>(proxied)</span>
+    </li>
+    <li>
+        <button type="submit" data-method="GET" data-action="repos/mix-n-mock">
+            Get repos/mix-n-mock
+        </button>
+        <span>(simulated error)</span>
+    </li>
+
 </ul>
 <div class="hidden">
     <div class="result"></div>
diff --git a/src/lib/routing.js b/src/lib/routing.js
index 8c3135e..0d811de 100644
--- a/src/lib/routing.js
+++ b/src/lib/routing.js
@@ -20,6 +20,7 @@ const express = require('express');
 const request = require('request');
 const fileExists = require('file-exists');
 const path = require('path');
+const url = require('url');
 
 const getFilePath = require('./helpers/getFilePath');
 
@@ -154,7 +155,7 @@ let setup = (expressWare, roots, paths, localProxyConfig, serverProxyConfig, pro
          */
         let pipeRequest = (requestConfig, req, res) => {
             let remote = request(Object.assign({}, requestConfig, {
-                url: serverProxyConfig.backend + req.url.replace(roots.serverRoot, '')
+                url: url.resolve(serverProxyConfig.backend, req.url.replace(roots.serverRoot, ''))
             }));
             req.pipe(remote);
             remote.pipe(res);