Fix admin route access and backend configuration
- Added /admin redirect to login page in nginx config - Fixed backend server.js route ordering for proper admin handling - Updated authentication middleware and routes - Added user management routes - Configured PostgreSQL integration - Updated environment configuration
This commit is contained in:
@@ -1,36 +1,42 @@
|
||||
const express = require('express');
|
||||
const session = require('express-session');
|
||||
const pgSession = require('connect-pg-simple')(session);
|
||||
const path = require('path');
|
||||
const { pool } = require('./config/database');
|
||||
require('dotenv').config();
|
||||
const express = require("express");
|
||||
const session = require("express-session");
|
||||
const pgSession = require("connect-pg-simple")(session);
|
||||
const path = require("path");
|
||||
const { pool } = require("./config/database");
|
||||
require("dotenv").config();
|
||||
|
||||
const app = express();
|
||||
const PORT = process.env.PORT || 3000;
|
||||
const PORT = process.env.PORT || 5000;
|
||||
|
||||
app.set('view engine', 'ejs');
|
||||
app.set('views', path.join(__dirname, 'views'));
|
||||
// Serve static files from /var/www/skyartshop
|
||||
app.use(express.static("/var/www/skyartshop/public"));
|
||||
app.use("/assets", express.static("/var/www/skyartshop/assets"));
|
||||
app.use("/uploads", express.static("/var/www/skyartshop/uploads"));
|
||||
|
||||
app.use(express.json());
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
app.use('/assets', express.static(path.join(__dirname, '../wwwroot/assets')));
|
||||
app.use('/uploads', express.static(path.join(__dirname, '../wwwroot/uploads')));
|
||||
|
||||
app.use(session({
|
||||
store: new pgSession({
|
||||
pool: pool,
|
||||
tableName: 'session',
|
||||
createTableIfMissing: true
|
||||
}),
|
||||
secret: process.env.SESSION_SECRET || 'skyart-shop-secret-2025',
|
||||
resave: false,
|
||||
saveUninitialized: false,
|
||||
cookie: {
|
||||
secure: false,
|
||||
httpOnly: true,
|
||||
maxAge: 24 * 60 * 60 * 1000
|
||||
}
|
||||
}));
|
||||
app.use(
|
||||
session({
|
||||
store: new pgSession({
|
||||
pool: pool,
|
||||
tableName: "session",
|
||||
createTableIfMissing: true,
|
||||
}),
|
||||
secret: process.env.SESSION_SECRET || "skyart-shop-secret-2025",
|
||||
resave: false,
|
||||
saveUninitialized: false,
|
||||
cookie: {
|
||||
secure: process.env.NODE_ENV === "production" ? true : false,
|
||||
httpOnly: true,
|
||||
maxAge: 24 * 60 * 60 * 1000,
|
||||
sameSite: "lax",
|
||||
domain: process.env.NODE_ENV === "production" ? ".ddns.net" : "localhost",
|
||||
},
|
||||
proxy: true,
|
||||
name: "skyartshop.sid",
|
||||
})
|
||||
);
|
||||
|
||||
app.use((req, res, next) => {
|
||||
res.locals.session = req.session;
|
||||
@@ -38,47 +44,66 @@ app.use((req, res, next) => {
|
||||
next();
|
||||
});
|
||||
|
||||
const authRoutes = require('./routes/auth');
|
||||
const adminRoutes = require('./routes/admin');
|
||||
const publicRoutes = require('./routes/public');
|
||||
// API Routes
|
||||
const authRoutes = require("./routes/auth");
|
||||
const adminRoutes = require("./routes/admin");
|
||||
const publicRoutes = require("./routes/public");
|
||||
const usersRoutes = require("./routes/users");
|
||||
|
||||
app.use('/admin', authRoutes);
|
||||
app.use('/admin', adminRoutes);
|
||||
app.use('/', publicRoutes);
|
||||
// Admin redirect - handle /admin to redirect to login (must be before static files)
|
||||
app.get("/admin", (req, res) => {
|
||||
res.redirect("/admin/login.html");
|
||||
});
|
||||
|
||||
app.get('/health', (req, res) => {
|
||||
res.json({
|
||||
status: 'ok',
|
||||
app.get("/admin/", (req, res) => {
|
||||
res.redirect("/admin/login.html");
|
||||
});
|
||||
|
||||
// API Routes
|
||||
app.use("/api/admin", authRoutes);
|
||||
app.use("/api/admin", adminRoutes);
|
||||
app.use("/api/admin/users", usersRoutes);
|
||||
app.use("/api", publicRoutes);
|
||||
|
||||
// Admin static files (must be after redirect routes)
|
||||
app.use("/admin", express.static("/var/www/skyartshop/admin"));
|
||||
|
||||
// Root redirect to admin login
|
||||
app.get("/", (req, res) => {
|
||||
res.redirect("/admin/login.html");
|
||||
});
|
||||
|
||||
app.get("/health", (req, res) => {
|
||||
res.json({
|
||||
status: "ok",
|
||||
timestamp: new Date().toISOString(),
|
||||
database: 'connected'
|
||||
database: "connected",
|
||||
});
|
||||
});
|
||||
|
||||
app.use((req, res) => {
|
||||
res.status(404).render('public/404', {
|
||||
title: '404 - Page Not Found'
|
||||
});
|
||||
res.status(404).json({ error: "Not found" });
|
||||
});
|
||||
|
||||
app.use((err, req, res, next) => {
|
||||
console.error('Error:', err);
|
||||
res.status(500).send('Server error');
|
||||
console.error("Error:", err);
|
||||
res.status(500).json({ error: "Server error" });
|
||||
});
|
||||
|
||||
app.listen(PORT, '0.0.0.0', () => {
|
||||
console.log('========================================');
|
||||
console.log(' SkyArtShop Backend Server');
|
||||
console.log('========================================');
|
||||
app.listen(PORT, "0.0.0.0", () => {
|
||||
console.log("========================================");
|
||||
console.log(" SkyArtShop Backend Server");
|
||||
console.log("========================================");
|
||||
console.log(`🚀 Server running on http://localhost:${PORT}`);
|
||||
console.log(`📦 Environment: ${process.env.NODE_ENV || 'development'}`);
|
||||
console.log(`📦 Environment: ${process.env.NODE_ENV || "development"}`);
|
||||
console.log(`🗄️ Database: PostgreSQL (${process.env.DB_NAME})`);
|
||||
console.log('========================================');
|
||||
console.log("========================================");
|
||||
});
|
||||
|
||||
process.on('SIGTERM', () => {
|
||||
console.log('SIGTERM received, closing server...');
|
||||
process.on("SIGTERM", () => {
|
||||
console.log("SIGTERM received, closing server...");
|
||||
pool.end(() => {
|
||||
console.log('Database pool closed');
|
||||
console.log("Database pool closed");
|
||||
process.exit(0);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user