From b306ed948ce7fb16d4e04b625ddda2cd17e113f0 Mon Sep 17 00:00:00 2001
From: Max-Z80 <dossiermax@gmail.com>
Date: Fri, 2 Nov 2018 13:27:32 +0000
Subject: [PATCH] use PassengerBaseURI to adapt API calls to production
 environment.

---
 clarkson.js                          | 16 ++++++++--------
 flyway/flyway                        |  0
 server/config.js                     |  4 +++-
 src/environments/environment.prod.ts |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 flyway/flyway

diff --git a/clarkson.js b/clarkson.js
index ef8dc1e..a1d35f4 100644
--- a/clarkson.js
+++ b/clarkson.js
@@ -18,18 +18,18 @@ app.use(morgan("combined", {
 app.use(express.static(path.join(__dirname, 'dist')));
 
 // Unauthenticated endpoint used for checking user credentials
-app.use("/api/auth", require("./server/routes/auth"));
-app.use("/api/units", require("./server/routes/units"));
-app.use("/api/ping", require("./server/routes/ping"));
+app.use(config.baseURI + "/api/auth", require("./server/routes/auth"));
+app.use(config.baseURI + "/api/units", require("./server/routes/units"));
+app.use(config.baseURI + "/api/ping", require("./server/routes/ping"));
 
 // User endpoint contains a mix of authenticated and unauthenticated endpoints
-app.use("/api/user", require("./server/routes/user"));
+app.use(config.baseURI + "/api/user", require("./server/routes/user"));
 
 // All authenticated endpoints - user must provide a valid JWT in the header
-app.use("/api/vehicle", auth.verify, require("./server/routes/vehicle"));
-app.use("/api/fuel", auth.verify, require("./server/routes/fuel"));
-app.use("/api/cost", auth.verify, require("./server/routes/cost"));
-app.use("/api/dashboard", auth.verify, require("./server/routes/dashboard"));
+app.use(config.baseURI + "/api/vehicle", auth.verify, require("./server/routes/vehicle"));
+app.use(config.baseURI + "/api/fuel", auth.verify, require("./server/routes/fuel"));
+app.use(config.baseURI + "/api/cost", auth.verify, require("./server/routes/cost"));
+app.use(config.baseURI + "/api/dashboard", auth.verify, require("./server/routes/dashboard"));
 
 // Serve the main web app
 app.get("*", function(req, res) {
diff --git a/flyway/flyway b/flyway/flyway
old mode 100644
new mode 100755
diff --git a/server/config.js b/server/config.js
index 47a9cf5..dc43270 100644
--- a/server/config.js
+++ b/server/config.js
@@ -16,7 +16,9 @@ module.exports = (function() {
 
         auth: {
             jwtSecret: hash.random()
-        }
+        },
+	
+	baseURI: process.env.PassengerBaseURI || ''
     };
 
 }());
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 788cb25..5717f4e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
 export const environment = {
     production: true,
-    apiBaseUrl: window.location.origin + '/api',
+    apiBaseUrl: 'http://YOUR_IP/clarkson' + '/api',
     enableRegistrations: true
 };