From 86c71e0e903fd65d9f3168ecb0a34e62b619e325 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 21 Aug 2021 22:50:36 -0600
Subject: [PATCH] Updated envar flow

---
 .gitignore         | 2 +-
 docker-compose.yml | 3 +++
 server/index.js    | 4 ++--
 src/Stash.js       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b5254b..d32e99f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ node_modules/
 package-lock.json
 # Env files
 .env
-.env.development
+.env.dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 583ce7a..9983851 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,9 @@ services:
       - "80:52026"
     networks:
       - dunestorm_dev
+    environment:
+      - CAIRO_PUBLIC_URL=${CAIRO_PUBLIC_URL}
+      - NUBIAN_INTERNAL_URL=${NUBIAN_INTERNAL_URL}
 networks:
   dunestorm_dev:
     external: true
diff --git a/server/index.js b/server/index.js
index 440845d..b143414 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,8 +1,8 @@
 const express = require("express");
 const { createProxyMiddleware } = require("http-proxy-middleware");
 const port = process.env.PORT ?? 52026;
-const cairoUrl = process.env.CAIRO_URL ?? "http://cairo.dunestorm.net:52000";
-const nubianUrl = process.env.NUBIAN_URL ?? "http://nubian.dunestorm.net:52001";
+const cairoUrl = process.env.CAIRO_PUBLIC_URL;
+const nubianUrl = process.env.NUBIAN_INTERNAL_URL;
 const app = express();
 app.use("/", express.static("build"));
 app.use("/cairo", createProxyMiddleware({ target: cairoUrl }));
diff --git a/src/Stash.js b/src/Stash.js
index 394ea7e..71a7992 100644
--- a/src/Stash.js
+++ b/src/Stash.js
@@ -33,7 +33,7 @@ class Stash extends React.Component {
       .catch((error) => {
         if (error.response && error.response.status === 401)
           return window.location.replace(
-            `${process.env.REACT_APP_CAIRO_URL}${api.cairo.urls.login}?redirectUri=${window.location.href}`
+            `${process.env.REACT_APP_CAIRO_PUBLIC_URL}${api.cairo.urls.login}?redirectUri=${window.location.href}`
           );
         console.error("Auth server not up/configured properly!");
       });