fix(env): rename NODE_ENV to API_ENV to avoid Render overrides (#536)

boklisten · Aug 8, 2024 · 53f926a · 53f926a
1 parent a780a71
commit 53f926a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "prettier": "prettier --write . --ignore-path=.gitignore",
     "prettier:check": "prettier --check . --ignore-path=.gitignore",
     "lint": "eslint .",
-    "test": "NODE_ENV=test mocha \"src/**/*.spec.ts\"",
+    "test": "API_ENV=test mocha \"src/**/*.spec.ts\"",
     "load_fixtures": "mongodb-fixtures rebuild -u mongodb://127.0.0.1:27017/test"
   },
   "license": "ISC",

diff --git a/src/config/api-path.ts b/src/config/api-path.ts
@@ -7,7 +7,7 @@ export class ApiPath {
   private readonly baseHost: string;
 
   constructor() {
-    if (assertEnv(BlEnvironment.NODE_ENV) === "production") {
+    if (assertEnv(BlEnvironment.API_ENV) === "production") {
       this.baseHost = APP_CONFIG.path.host;
     } else {
       this.baseHost = APP_CONFIG.path.local.host;

diff --git a/src/config/environment.ts b/src/config/environment.ts
@@ -5,7 +5,7 @@ import { isNullish } from "../helper/typescript-helpers";
 export enum BlEnvironment {
   PORT = "PORT",
   SERVER_PATH = "SERVER_PATH",
-  NODE_ENV = "NODE_ENV",
+  API_ENV = "API_ENV",
   LOG_LEVEL = "LOG_LEVEL",
   URI_WHITELIST = "URI_WHITELIST",
   ACCESS_TOKEN_SECRET = "ACCESS_TOKEN_SECRET",
@@ -43,7 +43,7 @@ const testPlaceHolders: {
  */
 export function assertEnv(key: BlEnvironment): string {
   const value = process.env[key];
-  if (process.env[BlEnvironment.NODE_ENV] === "test")
+  if (process.env[BlEnvironment.API_ENV] === "test")
     return testPlaceHolders[key] ?? "placeholder";
   if (isNullish(value)) {
     throw new BlError(`${key} is a required environment variable`).code(200);

diff --git a/src/logger/logger.ts b/src/logger/logger.ts
@@ -21,7 +21,7 @@ export const logger = createLogger({
   format: format.combine(
     format.printf((info) => {
       const colorizer = format.colorize();
-      const nodeEnv = assertEnv(BlEnvironment.NODE_ENV);
+      const nodeEnv = assertEnv(BlEnvironment.API_ENV);
       if (nodeEnv === "production" || nodeEnv === "dev") {
         return `${info.level} ${info.message}`;
       }
@@ -31,7 +31,7 @@ export const logger = createLogger({
       );
     }),
     format.colorize({
-      all: assertEnv(BlEnvironment.NODE_ENV) !== "production",
+      all: assertEnv(BlEnvironment.API_ENV) !== "production",
     }),
   ),
   transports: [

diff --git a/src/server/server.ts b/src/server/server.ts
@@ -117,7 +117,7 @@ export class Server {
     };
 
     this.app.use(
-      assertEnv(BlEnvironment.NODE_ENV) === "production"
+      assertEnv(BlEnvironment.API_ENV) === "production"
         ? cors(corsConfig)
         : cors(),
     );
@@ -132,7 +132,7 @@ export class Server {
         if (
           !(
             req.url.includes("auth") &&
-            assertEnv(BlEnvironment.NODE_ENV) === "production"
+            assertEnv(BlEnvironment.API_ENV) === "production"
           )
         ) {
           let body: string;
@@ -151,7 +151,7 @@ export class Server {
     this.app.get("*", (req, res, next) => {
       if (
         req.headers["x-forwarded-proto"] !== "https" &&
-        assertEnv(BlEnvironment.NODE_ENV) === "production"
+        assertEnv(BlEnvironment.API_ENV) === "production"
       ) {
         res.redirect("https://" + req.hostname + req.url);
       } else {