Merge branch 'main' of https://github.com/kittendevv/Invio

Author: kittendevv

backend/src/app.ts

@@ -17,7 +17,7 @@ const app = new Hono();
 
 // Check for required credentials in environment
 try {
-  ensureEnv(["JWT_SECRET"]);
+  ensureEnv(["JWT_SECRET", "ADMIN_USER", "ADMIN_PASS"]);
 
   const { username: adminUsername, password: adminPassword } = getAdminCredentials();
   if (!adminUsername || adminUsername.trim().length === 0) {

backend/src/middleware/auth.ts

@@ -1,12 +1,6 @@
 import type { Context, Next } from "hono";
 import { verifyJWT } from "../utils/jwt.ts";
-
-function getAdminCredentials(): { username: string; password: string } {
-  return {
-    username: Deno.env.get("ADMIN_USER") || "admin",
-    password: Deno.env.get("ADMIN_PASS") || "supersecret",
-  };
-}
+import { getAdminCredentials } from "../utils/env.ts";
 
 function unauthorized(): Response {
   return new Response("Unauthorized", {

docker-compose-dev.yml

@@ -6,9 +6,9 @@ services:
     env_file:
       - .env
     environment:
-      ADMIN_USER: ${ADMIN_USER:-admin}
-      ADMIN_PASS: ${ADMIN_PASS:-supersecret}
-      JWT_SECRET: ${JWT_SECRET:-change-me-in-prod}
+      ADMIN_USER: ${ADMIN_USER}
+      ADMIN_PASS: ${ADMIN_PASS}
+      JWT_SECRET: ${JWT_SECRET}
       DATABASE_PATH: ${DATABASE_PATH:-/app/data/invio.db}
     volumes:
       - invio_data:/app/data

docker-compose.yml

@@ -6,9 +6,9 @@ services:
     env_file:
       - .env
     environment:
-      ADMIN_USER: ${ADMIN_USER:-admin}
-      ADMIN_PASS: ${ADMIN_PASS:-supersecret}
-      JWT_SECRET: ${JWT_SECRET:-change-me-in-prod}
+      ADMIN_USER: ${ADMIN_USER}
+      ADMIN_PASS: ${ADMIN_PASS}
+      JWT_SECRET: ${JWT_SECRET}
       DATABASE_PATH: ${DATABASE_PATH:-/app/data/invio.db}
     volumes:
       - invio_data:/app/data