Updated envar flow

.gitignore

@@ -4,4 +4,4 @@ node_modules/
 package-lock.json
 # Env files
 .env
-.env.development
+.env.dev

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

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 }));

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!");
       });