Merge pull request #501 from datum-cloud/refactor/update-info-page-and-enable-signup-form-in-prod

Author: AriaEdo

src/components/forms/Signup.astro

@@ -1,13 +1,6 @@
 ---
 export const prerender = false;
 import Icon from '@components/Icon.astro';
-
-const mode = process.env.MODE || import.meta.env.MODE;
-
-// Only for development mode, to ease testing
-if (mode == 'production') {
-  return;
-}
 ---
 
 <div class="footer-signup">

src/libs/oidc.ts

@@ -6,10 +6,10 @@ import type {
   IDToken,
 } from 'openid-client';
 
-const server = import.meta.env.AUTH_OIDC_ISSUER || process.env.AUTH_OIDC_ISSUER;
-const clientId = import.meta.env.AUTH_OIDC_CLIENT_ID || process.env.AUTH_OIDC_CLIENT_ID;
-const clientSecret = import.meta.env.AUTH_OIDC_CLIENT_SECRET || process.env.AUTH_OIDC_CLIENT_SECRET;
-const redirect_uri = import.meta.env.AUTH_OIDC_REDIRECT_URI || process.env.AUTH_OIDC_REDIRECT_URI;
+const server = process.env.AUTH_OIDC_ISSUER || import.meta.env.AUTH_OIDC_ISSUER;
+const clientId = process.env.AUTH_OIDC_CLIENT_ID || import.meta.env.AUTH_OIDC_CLIENT_ID;
+const clientSecret = process.env.AUTH_OIDC_CLIENT_SECRET || import.meta.env.AUTH_OIDC_CLIENT_SECRET;
+const redirect_uri = process.env.AUTH_OIDC_REDIRECT_URI || import.meta.env.AUTH_OIDC_REDIRECT_URI;
 
 export interface callbackResult {
   accessToken: string;

src/libs/postgres.ts

@@ -27,11 +27,11 @@ async function dbConnect() {
   if (!sql) {
     const postgres = (await import('postgres')).default;
 
-    const USER = import.meta.env.POSTGRES_USER || process.env.POSTGRES_USER;
-    const PASSWORD = import.meta.env.POSTGRES_PASSWORD || process.env.POSTGRES_PASSWORD;
-    const HOST = import.meta.env.POSTGRES_HOST || process.env.POSTGRES_HOST;
-    const PORT = import.meta.env.POSTGRES_PORT || process.env.POSTGRES_PORT || 5432;
-    const DB = import.meta.env.POSTGRES_DB || process.env.POSTGRES_DB;
+    const USER = 'datum-net';
+    const PASSWORD = process.env.POSTGRES_PASSWORD || import.meta.env.POSTGRES_PASSWORD || '';
+    const HOST = process.env.privateIP || import.meta.env.POSTGRES_HOST;
+    const PORT = process.env.POSTGRES_PORT || import.meta.env.POSTGRES_PORT || 5432;
+    const DB = process.env.POSTGRES_DB || import.meta.env.POSTGRES_DB || 'datum-net';
     const connectionString = `postgres://${USER}:${PASSWORD}@${HOST}:${PORT}/${DB}`;
 
     if (!connectionString) {

src/pages/api/info.astro

@@ -1,5 +1,6 @@
 ---
 export const prerender = false;
+import { dbConnect } from '@libs/postgres';
 
 const mode = process.env.MODE || import.meta.env.MODE;
 
@@ -8,9 +9,28 @@ if (mode == 'production') {
   return;
 }
 
+/**
+ * Database testing
+ */
+let dbConnected = false;
+try {
+  const sql = await dbConnect();
+  const tables = await sql`SHOW TABLES`;
+  if (tables) {
+    dbConnected = true;
+  }
+} catch {
+  dbConnected = false;
+}
+
 type EnvValue = string | number | boolean | undefined;
 type EnvRecord = Record<string, EnvValue>;
 
+/**
+ * Filters out sensitive environment variables by masking their values.
+ * Sensitive variables are identified by common keywords in their names
+ * or if their values contain user-specific file paths.
+ */
 const filterSensitiveVars = (envVars: EnvRecord): EnvRecord => {
   return Object.fromEntries(
     Object.entries(envVars).map(([key, value]) => {
@@ -70,7 +90,11 @@ const responseObj = {
     release: process.release,
     uptime: process.uptime(),
   },
+  database: {
+    connected: dbConnected,
+  },
 };
+
 return new Response(JSON.stringify(responseObj, null, 2), {
   status: 200,
   headers: {