updates to saving settings
This commit is contained in:
parent
2778b1590d
commit
5cba67226e
@ -26,6 +26,10 @@ COPY server.js ./
|
||||
COPY public ./public
|
||||
COPY routes ./routes
|
||||
COPY services ./services
|
||||
COPY config ./config
|
||||
COPY controllers ./controllers
|
||||
COPY middleware ./middleware
|
||||
COPY utils ./utils
|
||||
|
||||
# Create non-root user
|
||||
RUN addgroup -g 1001 -S nodejs && \
|
||||
|
||||
98
map/app/config/index.js
Normal file
98
map/app/config/index.js
Normal file
@ -0,0 +1,98 @@
|
||||
const path = require('path');
|
||||
require('dotenv').config();
|
||||
|
||||
// Helper function to parse NocoDB URLs
|
||||
function parseNocoDBUrl(url) {
|
||||
if (!url) return { projectId: null, tableId: null };
|
||||
|
||||
const patterns = [
|
||||
/#\/nc\/([^\/]+)\/([^\/\?#]+)/,
|
||||
/\/nc\/([^\/]+)\/([^\/\?#]+)/,
|
||||
/project\/([^\/]+)\/table\/([^\/\?#]+)/,
|
||||
];
|
||||
|
||||
for (const pattern of patterns) {
|
||||
const match = url.match(pattern);
|
||||
if (match) {
|
||||
return {
|
||||
projectId: match[1],
|
||||
tableId: match[2]
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return { projectId: null, tableId: null };
|
||||
}
|
||||
|
||||
// Auto-parse IDs from URLs
|
||||
let parsedIds = { projectId: null, tableId: null };
|
||||
if (process.env.NOCODB_VIEW_URL && (!process.env.NOCODB_PROJECT_ID || !process.env.NOCODB_TABLE_ID)) {
|
||||
parsedIds = parseNocoDBUrl(process.env.NOCODB_VIEW_URL);
|
||||
}
|
||||
|
||||
// Parse login sheet ID
|
||||
let loginSheetId = null;
|
||||
if (process.env.NOCODB_LOGIN_SHEET) {
|
||||
if (process.env.NOCODB_LOGIN_SHEET.startsWith('http')) {
|
||||
const { tableId } = parseNocoDBUrl(process.env.NOCODB_LOGIN_SHEET);
|
||||
loginSheetId = tableId;
|
||||
} else {
|
||||
loginSheetId = process.env.NOCODB_LOGIN_SHEET;
|
||||
}
|
||||
}
|
||||
|
||||
// Parse settings sheet ID
|
||||
let settingsSheetId = null;
|
||||
if (process.env.NOCODB_SETTINGS_SHEET) {
|
||||
if (process.env.NOCODB_SETTINGS_SHEET.startsWith('http')) {
|
||||
const { tableId } = parseNocoDBUrl(process.env.NOCODB_SETTINGS_SHEET);
|
||||
settingsSheetId = tableId;
|
||||
} else {
|
||||
settingsSheetId = process.env.NOCODB_SETTINGS_SHEET;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
// Server config
|
||||
port: process.env.PORT || 3000,
|
||||
nodeEnv: process.env.NODE_ENV || 'development',
|
||||
isProduction: process.env.NODE_ENV === 'production',
|
||||
|
||||
// NocoDB config
|
||||
nocodb: {
|
||||
apiUrl: process.env.NOCODB_API_URL,
|
||||
apiToken: process.env.NOCODB_API_TOKEN,
|
||||
projectId: process.env.NOCODB_PROJECT_ID || parsedIds.projectId,
|
||||
tableId: process.env.NOCODB_TABLE_ID || parsedIds.tableId,
|
||||
loginSheetId,
|
||||
settingsSheetId,
|
||||
viewUrl: process.env.NOCODB_VIEW_URL
|
||||
},
|
||||
|
||||
// Session config
|
||||
session: {
|
||||
secret: process.env.SESSION_SECRET || 'your-secret-key-change-in-production',
|
||||
cookieDomain: process.env.COOKIE_DOMAIN
|
||||
},
|
||||
|
||||
// CORS config
|
||||
cors: {
|
||||
allowedOrigins: process.env.ALLOWED_ORIGINS?.split(',') || []
|
||||
},
|
||||
|
||||
// Map defaults
|
||||
map: {
|
||||
defaultLat: parseFloat(process.env.DEFAULT_LAT) || 53.5461,
|
||||
defaultLng: parseFloat(process.env.DEFAULT_LNG) || -113.4938,
|
||||
defaultZoom: parseInt(process.env.DEFAULT_ZOOM) || 11,
|
||||
bounds: process.env.BOUND_NORTH ? {
|
||||
north: parseFloat(process.env.BOUND_NORTH),
|
||||
south: parseFloat(process.env.BOUND_SOUTH),
|
||||
east: parseFloat(process.env.BOUND_EAST),
|
||||
west: parseFloat(process.env.BOUND_WEST)
|
||||
} : null
|
||||
},
|
||||
|
||||
// Utility functions
|
||||
parseNocoDBUrl
|
||||
};
|
||||
138
map/app/controllers/authController.js
Normal file
138
map/app/controllers/authController.js
Normal file
@ -0,0 +1,138 @@
|
||||
const nocodbService = require('../services/nocodb');
|
||||
const logger = require('../utils/logger');
|
||||
const { extractId } = require('../utils/helpers');
|
||||
|
||||
class AuthController {
|
||||
async login(req, res) {
|
||||
try {
|
||||
const { email, password } = req.body;
|
||||
|
||||
// Validate input
|
||||
if (!email || !password) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Email and password are required'
|
||||
});
|
||||
}
|
||||
|
||||
// Validate email format
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
if (!emailRegex.test(email)) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Invalid email format'
|
||||
});
|
||||
}
|
||||
|
||||
logger.info('Login attempt:', {
|
||||
email,
|
||||
ip: req.ip,
|
||||
cfIp: req.headers['cf-connecting-ip'],
|
||||
userAgent: req.headers['user-agent']
|
||||
});
|
||||
|
||||
// Fetch user from NocoDB
|
||||
const user = await nocodbService.getUserByEmail(email);
|
||||
|
||||
if (!user) {
|
||||
logger.warn(`No user found with email: ${email}`);
|
||||
return res.status(401).json({
|
||||
success: false,
|
||||
error: 'Invalid email or password'
|
||||
});
|
||||
}
|
||||
|
||||
// Check password
|
||||
if (user.Password !== password && user.password !== password) {
|
||||
logger.warn(`Invalid password for email: ${email}`);
|
||||
return res.status(401).json({
|
||||
success: false,
|
||||
error: 'Invalid email or password'
|
||||
});
|
||||
}
|
||||
|
||||
// Update last login time
|
||||
try {
|
||||
const userId = extractId(user);
|
||||
await nocodbService.update(
|
||||
require('../config').nocodb.loginSheetId,
|
||||
userId,
|
||||
{
|
||||
'Last Login': new Date().toISOString(),
|
||||
last_login: new Date().toISOString()
|
||||
}
|
||||
);
|
||||
} catch (updateError) {
|
||||
logger.warn('Failed to update last login time:', updateError.message);
|
||||
// Don't fail the login
|
||||
}
|
||||
|
||||
// Set session
|
||||
req.session.authenticated = true;
|
||||
req.session.userEmail = email;
|
||||
req.session.userName = user.Name || user.name || email;
|
||||
req.session.isAdmin = user.Admin === true || user.Admin === 1 ||
|
||||
user.admin === true || user.admin === 1;
|
||||
req.session.userId = extractId(user);
|
||||
|
||||
// Force session save
|
||||
req.session.save((err) => {
|
||||
if (err) {
|
||||
logger.error('Session save error:', err);
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Session error. Please try again.'
|
||||
});
|
||||
}
|
||||
|
||||
logger.info(`User authenticated: ${email}, Admin: ${req.session.isAdmin}`);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'Login successful',
|
||||
user: {
|
||||
email: email,
|
||||
name: req.session.userName,
|
||||
isAdmin: req.session.isAdmin
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Login error:', error.message);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Authentication service error. Please try again later.'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async logout(req, res) {
|
||||
req.session.destroy((err) => {
|
||||
if (err) {
|
||||
logger.error('Logout error:', err);
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Logout failed'
|
||||
});
|
||||
}
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'Logged out successfully'
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async check(req, res) {
|
||||
res.json({
|
||||
authenticated: req.session?.authenticated || false,
|
||||
user: req.session?.authenticated ? {
|
||||
email: req.session.userEmail,
|
||||
name: req.session.userName,
|
||||
isAdmin: req.session.isAdmin || false
|
||||
} : null
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new AuthController();
|
||||
257
map/app/controllers/locationsController.js
Normal file
257
map/app/controllers/locationsController.js
Normal file
@ -0,0 +1,257 @@
|
||||
const nocodbService = require('../services/nocodb');
|
||||
const logger = require('../utils/logger');
|
||||
const config = require('../config');
|
||||
const {
|
||||
syncGeoFields,
|
||||
validateCoordinates,
|
||||
checkBounds,
|
||||
extractId
|
||||
} = require('../utils/helpers');
|
||||
|
||||
class LocationsController {
|
||||
async getAll(req, res) {
|
||||
try {
|
||||
const { limit = 1000, offset = 0, where } = req.query;
|
||||
|
||||
const params = { limit, offset };
|
||||
if (where) params.where = where;
|
||||
|
||||
logger.info('Fetching locations from NocoDB');
|
||||
|
||||
const response = await nocodbService.getLocations(params);
|
||||
const locations = response.list || [];
|
||||
|
||||
// Process and validate locations
|
||||
const validLocations = locations.filter(loc => {
|
||||
loc = syncGeoFields(loc);
|
||||
|
||||
if (loc.latitude && loc.longitude) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Try to parse from geodata column
|
||||
if (loc.geodata && typeof loc.geodata === 'string') {
|
||||
const parts = loc.geodata.split(';');
|
||||
if (parts.length === 2) {
|
||||
loc.latitude = parseFloat(parts[0]);
|
||||
loc.longitude = parseFloat(parts[1]);
|
||||
return !isNaN(loc.latitude) && !isNaN(loc.longitude);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
logger.info(`Retrieved ${validLocations.length} valid locations out of ${locations.length} total`);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
count: validLocations.length,
|
||||
total: response.pageInfo?.totalRows || validLocations.length,
|
||||
locations: validLocations
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error fetching locations:', error.message);
|
||||
|
||||
if (error.response) {
|
||||
res.status(error.response.status).json({
|
||||
success: false,
|
||||
error: 'Failed to fetch data from NocoDB',
|
||||
details: error.response.data
|
||||
});
|
||||
} else if (error.code === 'ECONNABORTED') {
|
||||
res.status(504).json({
|
||||
success: false,
|
||||
error: 'Request timeout'
|
||||
});
|
||||
} else {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Internal server error'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async getById(req, res) {
|
||||
try {
|
||||
const location = await nocodbService.getById(
|
||||
config.nocodb.tableId,
|
||||
req.params.id
|
||||
);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
location
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error(`Error fetching location ${req.params.id}:`, error.message);
|
||||
res.status(error.response?.status || 500).json({
|
||||
success: false,
|
||||
error: 'Failed to fetch location'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async create(req, res) {
|
||||
try {
|
||||
let locationData = { ...req.body };
|
||||
locationData = syncGeoFields(locationData);
|
||||
|
||||
const { latitude, longitude, ...additionalData } = locationData;
|
||||
|
||||
// Validate coordinates
|
||||
const validation = validateCoordinates(latitude, longitude);
|
||||
if (!validation.valid) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: validation.error
|
||||
});
|
||||
}
|
||||
|
||||
// Check bounds if configured
|
||||
if (config.map.bounds) {
|
||||
if (!checkBounds(validation.latitude, validation.longitude, config.map.bounds)) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Location is outside allowed bounds'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Format geodata
|
||||
const geodata = `${validation.latitude};${validation.longitude}`;
|
||||
|
||||
// Prepare data for NocoDB
|
||||
const finalData = {
|
||||
geodata,
|
||||
'Geo-Location': geodata,
|
||||
latitude: validation.latitude,
|
||||
longitude: validation.longitude,
|
||||
...additionalData,
|
||||
created_at: new Date().toISOString(),
|
||||
created_by: req.session.userEmail
|
||||
};
|
||||
|
||||
logger.info('Creating new location:', {
|
||||
lat: validation.latitude,
|
||||
lng: validation.longitude
|
||||
});
|
||||
|
||||
const response = await nocodbService.create(
|
||||
config.nocodb.tableId,
|
||||
finalData
|
||||
);
|
||||
|
||||
logger.info('Location created successfully:', extractId(response));
|
||||
|
||||
res.status(201).json({
|
||||
success: true,
|
||||
location: response
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error creating location:', error.message);
|
||||
|
||||
if (error.response) {
|
||||
res.status(error.response.status).json({
|
||||
success: false,
|
||||
error: 'Failed to save location to NocoDB',
|
||||
details: error.response.data
|
||||
});
|
||||
} else {
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Internal server error'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async update(req, res) {
|
||||
try {
|
||||
const locationId = req.params.id;
|
||||
|
||||
// Validate ID
|
||||
if (!locationId || locationId === 'undefined' || locationId === 'null') {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Invalid location ID'
|
||||
});
|
||||
}
|
||||
|
||||
let updateData = { ...req.body };
|
||||
|
||||
// Remove ID fields to avoid conflicts
|
||||
delete updateData.ID;
|
||||
delete updateData.Id;
|
||||
delete updateData.id;
|
||||
delete updateData._id;
|
||||
|
||||
// Sync geo fields
|
||||
updateData = syncGeoFields(updateData);
|
||||
|
||||
updateData.last_updated_at = new Date().toISOString();
|
||||
updateData.last_updated_by = req.session.userEmail;
|
||||
|
||||
logger.info(`Updating location ${locationId} by ${req.session.userEmail}`);
|
||||
|
||||
const response = await nocodbService.update(
|
||||
config.nocodb.tableId,
|
||||
locationId,
|
||||
updateData
|
||||
);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
location: response
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error(`Error updating location ${req.params.id}:`, error.message);
|
||||
|
||||
res.status(error.response?.status || 500).json({
|
||||
success: false,
|
||||
error: 'Failed to update location',
|
||||
details: error.response?.data?.message || error.message
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async delete(req, res) {
|
||||
try {
|
||||
const locationId = req.params.id;
|
||||
|
||||
// Validate ID
|
||||
if (!locationId || locationId === 'undefined' || locationId === 'null') {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Invalid location ID'
|
||||
});
|
||||
}
|
||||
|
||||
await nocodbService.delete(
|
||||
config.nocodb.tableId,
|
||||
locationId
|
||||
);
|
||||
|
||||
logger.info(`Location ${locationId} deleted by ${req.session.userEmail}`);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'Location deleted successfully'
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error(`Error deleting location ${req.params.id}:`, error.message);
|
||||
res.status(error.response?.status || 500).json({
|
||||
success: false,
|
||||
error: 'Failed to delete location'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new LocationsController();
|
||||
370
map/app/controllers/settingsController.js
Normal file
370
map/app/controllers/settingsController.js
Normal file
@ -0,0 +1,370 @@
|
||||
const nocodbService = require('../services/nocodb');
|
||||
const logger = require('../utils/logger');
|
||||
const config = require('../config');
|
||||
const { validateUrl, extractId, extractWalkSheetConfig } = require('../utils/helpers');
|
||||
|
||||
class SettingsController {
|
||||
// Default settings values
|
||||
static defaultSettings = {
|
||||
walk_sheet_title: 'Campaign Walk Sheet',
|
||||
walk_sheet_subtitle: 'Door-to-Door Canvassing Form',
|
||||
walk_sheet_footer: 'Thank you for your support!',
|
||||
qr_code_1_url: '',
|
||||
qr_code_1_label: '',
|
||||
qr_code_2_url: '',
|
||||
qr_code_2_label: '',
|
||||
qr_code_3_url: '',
|
||||
qr_code_3_label: ''
|
||||
};
|
||||
|
||||
async getStartLocation(req, res) {
|
||||
try {
|
||||
const settings = await nocodbService.getLatestSettings();
|
||||
|
||||
if (settings) {
|
||||
let lat, lng, zoom;
|
||||
|
||||
if (settings['Geo-Location']) {
|
||||
const parts = settings['Geo-Location'].split(';');
|
||||
if (parts.length === 2) {
|
||||
lat = parseFloat(parts[0]);
|
||||
lng = parseFloat(parts[1]);
|
||||
}
|
||||
} else if (settings.latitude && settings.longitude) {
|
||||
lat = parseFloat(settings.latitude);
|
||||
lng = parseFloat(settings.longitude);
|
||||
}
|
||||
|
||||
zoom = parseInt(settings.zoom) || config.map.defaultZoom;
|
||||
|
||||
if (lat && lng && !isNaN(lat) && !isNaN(lng)) {
|
||||
return res.json({
|
||||
success: true,
|
||||
location: {
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
zoom: zoom
|
||||
},
|
||||
source: 'database',
|
||||
settingsId: extractId(settings),
|
||||
lastUpdated: settings.created_at
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Return defaults
|
||||
res.json({
|
||||
success: true,
|
||||
location: {
|
||||
latitude: config.map.defaultLat,
|
||||
longitude: config.map.defaultLng,
|
||||
zoom: config.map.defaultZoom
|
||||
},
|
||||
source: 'defaults'
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error fetching start location:', error);
|
||||
|
||||
// Return defaults on error
|
||||
res.json({
|
||||
success: true,
|
||||
location: {
|
||||
latitude: config.map.defaultLat,
|
||||
longitude: config.map.defaultLng,
|
||||
zoom: config.map.defaultZoom
|
||||
},
|
||||
source: 'defaults'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async updateStartLocation(req, res) {
|
||||
try {
|
||||
const { latitude, longitude, zoom } = req.body;
|
||||
|
||||
// Validate input
|
||||
if (!latitude || !longitude) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Latitude and longitude are required'
|
||||
});
|
||||
}
|
||||
|
||||
const lat = parseFloat(latitude);
|
||||
const lng = parseFloat(longitude);
|
||||
const mapZoom = parseInt(zoom) || 11;
|
||||
|
||||
if (isNaN(lat) || isNaN(lng) || lat < -90 || lat > 90 || lng < -180 || lng > 180) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Invalid coordinates'
|
||||
});
|
||||
}
|
||||
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Settings sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
// Get current settings to preserve other fields
|
||||
let currentConfig = {};
|
||||
try {
|
||||
currentConfig = await nocodbService.getLatestSettings() || {};
|
||||
|
||||
// Debug logging to see what we're getting
|
||||
logger.info('Retrieved current config:', {
|
||||
id: currentConfig.Id || currentConfig.ID || currentConfig.id,
|
||||
walk_sheet_title: currentConfig.walk_sheet_title,
|
||||
walk_sheet_subtitle: currentConfig.walk_sheet_subtitle,
|
||||
walk_sheet_footer: currentConfig.walk_sheet_footer,
|
||||
hasFooter: !!currentConfig.walk_sheet_footer,
|
||||
footerType: typeof currentConfig.walk_sheet_footer,
|
||||
allKeys: Object.keys(currentConfig)
|
||||
});
|
||||
} catch (error) {
|
||||
logger.warn('Could not retrieve current settings for preservation, using defaults:', error.message);
|
||||
currentConfig = {};
|
||||
}
|
||||
|
||||
// Create new settings row - use values directly without || operator
|
||||
const walkSheetConfig = extractWalkSheetConfig(currentConfig, SettingsController.defaultSettings);
|
||||
|
||||
const settingData = {
|
||||
created_at: new Date().toISOString(),
|
||||
created_by: req.session.userEmail,
|
||||
// Map location fields (what we're updating)
|
||||
'Geo-Location': `${lat};${lng}`,
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
zoom: mapZoom,
|
||||
// Preserve walk sheet fields using helper function
|
||||
...walkSheetConfig
|
||||
};
|
||||
|
||||
logger.info('Creating settings row with data:', {
|
||||
walk_sheet_footer: settingData.walk_sheet_footer,
|
||||
footerLength: settingData.walk_sheet_footer?.length
|
||||
});
|
||||
|
||||
const response = await nocodbService.create(
|
||||
config.nocodb.settingsSheetId,
|
||||
settingData
|
||||
);
|
||||
|
||||
logger.info('Created new settings row with start location');
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'Start location saved successfully',
|
||||
location: { latitude: lat, longitude: lng, zoom: mapZoom },
|
||||
settingsId: extractId(response)
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error updating start location:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: error.message || 'Failed to update start location'
|
||||
});
|
||||
}
|
||||
}
|
||||
async getWalkSheetConfig(req, res) {
|
||||
try {
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
logger.warn('SETTINGS_SHEET_ID not configured, returning defaults');
|
||||
return res.json({
|
||||
success: true,
|
||||
config: SettingsController.defaultSettings,
|
||||
source: 'defaults',
|
||||
message: 'Settings sheet not configured, using defaults'
|
||||
});
|
||||
}
|
||||
|
||||
const settings = await nocodbService.getLatestSettings();
|
||||
|
||||
if (!settings) {
|
||||
logger.info('No settings found in database, returning defaults');
|
||||
return res.json({
|
||||
success: true,
|
||||
config: SettingsController.defaultSettings,
|
||||
source: 'defaults',
|
||||
message: 'No settings found in database'
|
||||
});
|
||||
}
|
||||
|
||||
const walkSheetConfig = extractWalkSheetConfig(settings, SettingsController.defaultSettings);
|
||||
|
||||
logger.info(`Retrieved walk sheet config from database (ID: ${extractId(settings)})`);
|
||||
res.json({
|
||||
success: true,
|
||||
config: walkSheetConfig,
|
||||
source: 'database',
|
||||
settingsId: extractId(settings),
|
||||
lastUpdated: settings.created_at || settings.updated_at
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Failed to get walk sheet config:', error);
|
||||
|
||||
// Return defaults if there's an error
|
||||
res.json({
|
||||
success: true,
|
||||
config: SettingsController.defaultSettings,
|
||||
source: 'defaults',
|
||||
message: 'Error retrieving from database, using defaults',
|
||||
error: error.message
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async updateWalkSheetConfig(req, res) {
|
||||
try {
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Settings sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
const configData = req.body;
|
||||
logger.info('Received walk sheet config:', JSON.stringify(configData, null, 2));
|
||||
|
||||
// Validate input
|
||||
if (!configData || typeof configData !== 'object') {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Invalid configuration data'
|
||||
});
|
||||
}
|
||||
|
||||
// Get current settings to preserve other fields
|
||||
let currentConfig = {};
|
||||
try {
|
||||
currentConfig = await nocodbService.getLatestSettings() || {};
|
||||
} catch (error) {
|
||||
logger.warn('Could not retrieve current settings for preservation, using defaults:', error.message);
|
||||
currentConfig = {};
|
||||
}
|
||||
|
||||
const userEmail = req.session.userEmail;
|
||||
const timestamp = new Date().toISOString();
|
||||
|
||||
// Prepare data for saving
|
||||
const walkSheetData = {
|
||||
created_at: timestamp,
|
||||
created_by: userEmail,
|
||||
// Preserve map location fields with consistent fallbacks
|
||||
'Geo-Location': currentConfig['Geo-Location'] || currentConfig.geodata || `${config.map.defaultLat};${config.map.defaultLng}`,
|
||||
latitude: currentConfig.latitude || config.map.defaultLat,
|
||||
longitude: currentConfig.longitude || config.map.defaultLng,
|
||||
zoom: currentConfig.zoom || config.map.defaultZoom,
|
||||
// Walk sheet fields (what we're updating)
|
||||
walk_sheet_title: (configData.walk_sheet_title || '').toString().trim(),
|
||||
walk_sheet_subtitle: (configData.walk_sheet_subtitle || '').toString().trim(),
|
||||
walk_sheet_footer: (configData.walk_sheet_footer || '').toString().trim(),
|
||||
'Walk Sheet Title': (configData.walk_sheet_title || '').toString().trim(),
|
||||
'Walk Sheet Subtitle': (configData.walk_sheet_subtitle || '').toString().trim(),
|
||||
'Walk Sheet Footer': (configData.walk_sheet_footer || '').toString().trim(),
|
||||
qr_code_1_url: validateUrl(configData.qr_code_1_url),
|
||||
qr_code_1_label: (configData.qr_code_1_label || '').toString().trim(),
|
||||
qr_code_2_url: validateUrl(configData.qr_code_2_url),
|
||||
qr_code_2_label: (configData.qr_code_2_label || '').toString().trim(),
|
||||
qr_code_3_url: validateUrl(configData.qr_code_3_url),
|
||||
qr_code_3_label: (configData.qr_code_3_label || '').toString().trim(),
|
||||
'QR Code 1 URL': validateUrl(configData.qr_code_1_url),
|
||||
'QR Code 1 Label': (configData.qr_code_1_label || '').toString().trim(),
|
||||
'QR Code 2 URL': validateUrl(configData.qr_code_2_url),
|
||||
'QR Code 2 Label': (configData.qr_code_2_label || '').toString().trim(),
|
||||
'QR Code 3 URL': validateUrl(configData.qr_code_3_url),
|
||||
'QR Code 3 Label': (configData.qr_code_3_label || '').toString().trim()
|
||||
};
|
||||
|
||||
const response = await nocodbService.create(
|
||||
config.nocodb.settingsSheetId,
|
||||
walkSheetData
|
||||
);
|
||||
|
||||
const newId = extractId(response);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'Walk sheet configuration saved successfully',
|
||||
config: walkSheetData,
|
||||
settingsId: newId,
|
||||
timestamp: timestamp
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Failed to save walk sheet config:', error);
|
||||
logger.error('Error response:', error.response?.data);
|
||||
|
||||
let errorMessage = 'Failed to save walk sheet configuration';
|
||||
let errorDetails = null;
|
||||
|
||||
if (error.response?.data) {
|
||||
if (error.response.data.message) {
|
||||
errorMessage = error.response.data.message;
|
||||
}
|
||||
if (error.response.data.errors) {
|
||||
errorDetails = error.response.data.errors;
|
||||
}
|
||||
}
|
||||
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: errorMessage,
|
||||
details: errorDetails,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Public endpoint for start location (no auth required)
|
||||
async getPublicStartLocation(req, res) {
|
||||
try {
|
||||
const settings = await nocodbService.getLatestSettings();
|
||||
|
||||
if (settings) {
|
||||
let lat, lng, zoom;
|
||||
|
||||
if (settings['Geo-Location']) {
|
||||
const parts = settings['Geo-Location'].split(';');
|
||||
if (parts.length === 2) {
|
||||
lat = parseFloat(parts[0]);
|
||||
lng = parseFloat(parts[1]);
|
||||
}
|
||||
} else if (settings.latitude && settings.longitude) {
|
||||
lat = parseFloat(settings.latitude);
|
||||
lng = parseFloat(settings.longitude);
|
||||
}
|
||||
|
||||
zoom = parseInt(settings.zoom) || config.map.defaultZoom;
|
||||
|
||||
if (lat && lng && !isNaN(lat) && !isNaN(lng)) {
|
||||
logger.info(`Returning location from database: ${lat}, ${lng}, zoom: ${zoom}`);
|
||||
return res.json({
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
zoom: zoom
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('Error fetching config start location:', error);
|
||||
}
|
||||
|
||||
// Return defaults
|
||||
logger.info(`Using default start location: ${config.map.defaultLat}, ${config.map.defaultLng}, zoom: ${config.map.defaultZoom}`);
|
||||
|
||||
res.json({
|
||||
latitude: config.map.defaultLat,
|
||||
longitude: config.map.defaultLng,
|
||||
zoom: config.map.defaultZoom
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new SettingsController();
|
||||
146
map/app/controllers/usersController.js
Normal file
146
map/app/controllers/usersController.js
Normal file
@ -0,0 +1,146 @@
|
||||
const nocodbService = require('../services/nocodb');
|
||||
const logger = require('../utils/logger');
|
||||
const config = require('../config');
|
||||
const { sanitizeUser, extractId } = require('../utils/helpers');
|
||||
|
||||
class UsersController {
|
||||
async getAll(req, res) {
|
||||
try {
|
||||
if (!config.nocodb.loginSheetId) {
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Login sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
const response = await nocodbService.getAll(config.nocodb.loginSheetId, {
|
||||
limit: 100,
|
||||
sort: '-created_at'
|
||||
});
|
||||
|
||||
const users = response.list || [];
|
||||
|
||||
// Remove password field from response for security
|
||||
const safeUsers = users.map(sanitizeUser);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
users: safeUsers
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error fetching users:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Failed to fetch users'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async create(req, res) {
|
||||
try {
|
||||
const { email, password, name, admin } = req.body;
|
||||
|
||||
if (!email || !password) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Email and password are required'
|
||||
});
|
||||
}
|
||||
|
||||
if (!config.nocodb.loginSheetId) {
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Login sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
// Check if user already exists
|
||||
const existingUser = await nocodbService.getUserByEmail(email);
|
||||
|
||||
if (existingUser) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'User with this email already exists'
|
||||
});
|
||||
}
|
||||
|
||||
// Create new user
|
||||
const userData = {
|
||||
Email: email,
|
||||
email: email,
|
||||
Password: password,
|
||||
password: password,
|
||||
Name: name || '',
|
||||
name: name || '',
|
||||
Admin: admin === true,
|
||||
admin: admin === true,
|
||||
'Created At': new Date().toISOString(),
|
||||
created_at: new Date().toISOString()
|
||||
};
|
||||
|
||||
const response = await nocodbService.create(
|
||||
config.nocodb.loginSheetId,
|
||||
userData
|
||||
);
|
||||
|
||||
res.status(201).json({
|
||||
success: true,
|
||||
message: 'User created successfully',
|
||||
user: {
|
||||
id: extractId(response),
|
||||
email: email,
|
||||
name: name,
|
||||
admin: admin
|
||||
}
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error creating user:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Failed to create user'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async delete(req, res) {
|
||||
try {
|
||||
const userId = req.params.id;
|
||||
|
||||
if (!config.nocodb.loginSheetId) {
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: 'Login sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
// Don't allow admins to delete themselves
|
||||
if (userId === req.session.userId) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Cannot delete your own account'
|
||||
});
|
||||
}
|
||||
|
||||
await nocodbService.delete(
|
||||
config.nocodb.loginSheetId,
|
||||
userId
|
||||
);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
message: 'User deleted successfully'
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error deleting user:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Failed to delete user'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new UsersController();
|
||||
34
map/app/middleware/auth.js
Normal file
34
map/app/middleware/auth.js
Normal file
@ -0,0 +1,34 @@
|
||||
const requireAuth = (req, res, next) => {
|
||||
if (req.session && req.session.authenticated) {
|
||||
next();
|
||||
} else {
|
||||
if (req.xhr || req.headers.accept?.indexOf('json') > -1) {
|
||||
res.status(401).json({
|
||||
success: false,
|
||||
error: 'Authentication required'
|
||||
});
|
||||
} else {
|
||||
res.redirect('/login.html');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const requireAdmin = (req, res, next) => {
|
||||
if (req.session && req.session.authenticated && req.session.isAdmin) {
|
||||
next();
|
||||
} else {
|
||||
if (req.xhr || req.headers.accept?.indexOf('json') > -1) {
|
||||
res.status(403).json({
|
||||
success: false,
|
||||
error: 'Admin access required'
|
||||
});
|
||||
} else {
|
||||
res.redirect('/login.html');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
requireAuth,
|
||||
requireAdmin
|
||||
};
|
||||
44
map/app/middleware/rateLimiter.js
Normal file
44
map/app/middleware/rateLimiter.js
Normal file
@ -0,0 +1,44 @@
|
||||
const rateLimit = require('express-rate-limit');
|
||||
const config = require('../config');
|
||||
|
||||
// Helper to extract real IP with Cloudflare support
|
||||
const keyGenerator = (req) => {
|
||||
return req.headers['cf-connecting-ip'] ||
|
||||
req.headers['x-forwarded-for']?.split(',')[0] ||
|
||||
req.ip;
|
||||
};
|
||||
|
||||
// General API rate limiter
|
||||
const apiLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000, // 15 minutes
|
||||
max: 100,
|
||||
keyGenerator,
|
||||
standardHeaders: true,
|
||||
legacyHeaders: false,
|
||||
message: 'Too many requests, please try again later.'
|
||||
});
|
||||
|
||||
// Strict limiter for write operations
|
||||
const strictLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: 20,
|
||||
keyGenerator,
|
||||
message: 'Too many write operations, please try again later.'
|
||||
});
|
||||
|
||||
// Auth-specific limiter
|
||||
const authLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: config.isProduction ? 10 : 50,
|
||||
keyGenerator,
|
||||
standardHeaders: true,
|
||||
legacyHeaders: false,
|
||||
message: 'Too many login attempts, please try again later.',
|
||||
skipSuccessfulRequests: true
|
||||
});
|
||||
|
||||
module.exports = {
|
||||
apiLimiter,
|
||||
strictLimiter,
|
||||
authLimiter
|
||||
};
|
||||
13
map/app/routes/admin.js
Normal file
13
map/app/routes/admin.js
Normal file
@ -0,0 +1,13 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const settingsController = require('../controllers/settingsController');
|
||||
|
||||
// Start location management
|
||||
router.get('/start-location', settingsController.getStartLocation);
|
||||
router.post('/start-location', settingsController.updateStartLocation);
|
||||
|
||||
// Walk sheet configuration
|
||||
router.get('/walk-sheet-config', settingsController.getWalkSheetConfig);
|
||||
router.post('/walk-sheet-config', settingsController.updateWalkSheetConfig);
|
||||
|
||||
module.exports = router;
|
||||
15
map/app/routes/auth.js
Normal file
15
map/app/routes/auth.js
Normal file
@ -0,0 +1,15 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const authController = require('../controllers/authController');
|
||||
const { authLimiter } = require('../middleware/rateLimiter');
|
||||
|
||||
// Login route with rate limiting
|
||||
router.post('/login', authLimiter, authController.login);
|
||||
|
||||
// Logout route
|
||||
router.post('/logout', authController.logout);
|
||||
|
||||
// Check authentication status
|
||||
router.get('/check', authController.check);
|
||||
|
||||
module.exports = router;
|
||||
225
map/app/routes/debug.js
Normal file
225
map/app/routes/debug.js
Normal file
@ -0,0 +1,225 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const nocodbService = require('../services/nocodb');
|
||||
const config = require('../config');
|
||||
const logger = require('../utils/logger');
|
||||
const { generateQRCode } = require('../services/qrcode');
|
||||
|
||||
// Debug session endpoint
|
||||
router.get('/session', (req, res) => {
|
||||
res.json({
|
||||
sessionID: req.sessionID,
|
||||
session: req.session,
|
||||
cookies: req.cookies,
|
||||
authenticated: req.session?.authenticated || false
|
||||
});
|
||||
});
|
||||
|
||||
// Check table structure
|
||||
router.get('/table-structure', async (req, res) => {
|
||||
try {
|
||||
const response = await nocodbService.getAll(config.nocodb.tableId, {
|
||||
limit: 1
|
||||
});
|
||||
|
||||
const sample = response.list?.[0] || {};
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
fields: Object.keys(sample),
|
||||
sampleRecord: sample,
|
||||
idField: sample.ID ? 'ID' : (sample.Id ? 'Id' : (sample.id ? 'id' : 'unknown'))
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error checking table structure:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Failed to check table structure'
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// QR code generation test
|
||||
router.get('/test-qr', async (req, res) => {
|
||||
try {
|
||||
const testUrl = req.query.url || 'https://example.com/test';
|
||||
const testSize = parseInt(req.query.size) || 200;
|
||||
|
||||
logger.info('Testing local QR code generation...');
|
||||
|
||||
const qrOptions = {
|
||||
type: 'png',
|
||||
width: testSize,
|
||||
margin: 1,
|
||||
color: {
|
||||
dark: '#000000',
|
||||
light: '#FFFFFF'
|
||||
},
|
||||
errorCorrectionLevel: 'M'
|
||||
};
|
||||
|
||||
const buffer = await generateQRCode(testUrl, qrOptions);
|
||||
|
||||
res.set({
|
||||
'Content-Type': 'image/png',
|
||||
'Content-Length': buffer.length
|
||||
});
|
||||
|
||||
res.send(buffer);
|
||||
|
||||
} catch (error) {
|
||||
logger.error('QR code test failed:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: error.message
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Walk sheet configuration debug
|
||||
router.get('/walk-sheet-config', async (req, res) => {
|
||||
try {
|
||||
const debugInfo = {
|
||||
settingsSheetId: config.nocodb.settingsSheetId,
|
||||
settingsSheetConfigured: process.env.NOCODB_SETTINGS_SHEET,
|
||||
hasSettingsSheet: !!config.nocodb.settingsSheetId,
|
||||
timestamp: new Date().toISOString()
|
||||
};
|
||||
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return res.json({
|
||||
success: true,
|
||||
debug: debugInfo,
|
||||
message: 'Settings sheet not configured'
|
||||
});
|
||||
}
|
||||
|
||||
// Test connection to settings sheet
|
||||
const response = await nocodbService.getAll(config.nocodb.settingsSheetId, {
|
||||
limit: 5,
|
||||
sort: '-created_at'
|
||||
});
|
||||
|
||||
const records = response.list || [];
|
||||
const sampleRecord = records[0] || {};
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
debug: {
|
||||
...debugInfo,
|
||||
connectionTest: 'success',
|
||||
recordCount: records.length,
|
||||
availableFields: Object.keys(sampleRecord),
|
||||
sampleRecord: sampleRecord,
|
||||
recentRecords: records.slice(0, 3).map(r => ({
|
||||
id: r.id || r.Id || r.ID,
|
||||
created_at: r.created_at,
|
||||
walk_sheet_title: r.walk_sheet_title,
|
||||
hasQrCodes: !!(r.qr_code_1_url || r.qr_code_2_url || r.qr_code_3_url)
|
||||
}))
|
||||
}
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Error debugging walk sheet config:', error);
|
||||
res.json({
|
||||
success: false,
|
||||
debug: {
|
||||
settingsSheetId: config.nocodb.settingsSheetId,
|
||||
settingsSheetConfigured: process.env.NOCODB_SETTINGS_SHEET,
|
||||
hasSettingsSheet: !!config.nocodb.settingsSheetId,
|
||||
timestamp: new Date().toISOString(),
|
||||
error: error.message,
|
||||
errorDetails: error.response?.data
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Test walk sheet save
|
||||
router.post('/test-walk-sheet-save', async (req, res) => {
|
||||
try {
|
||||
const testConfig = {
|
||||
walk_sheet_title: 'Test Walk Sheet',
|
||||
walk_sheet_subtitle: 'Test Subtitle',
|
||||
walk_sheet_footer: 'Test Footer',
|
||||
qr_code_1_url: 'https://example.com/test1',
|
||||
qr_code_1_label: 'Test QR 1',
|
||||
qr_code_2_url: 'https://example.com/test2',
|
||||
qr_code_2_label: 'Test QR 2',
|
||||
qr_code_3_url: 'https://example.com/test3',
|
||||
qr_code_3_label: 'Test QR 3'
|
||||
};
|
||||
|
||||
logger.info('Testing walk sheet configuration save...');
|
||||
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return res.json({
|
||||
success: false,
|
||||
test: 'failed',
|
||||
error: 'Settings sheet not configured',
|
||||
config: testConfig
|
||||
});
|
||||
}
|
||||
|
||||
const walkSheetData = {
|
||||
created_at: new Date().toISOString(),
|
||||
created_by: req.session.userEmail,
|
||||
...testConfig
|
||||
};
|
||||
|
||||
const response = await nocodbService.create(
|
||||
config.nocodb.settingsSheetId,
|
||||
walkSheetData
|
||||
);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
test: 'passed',
|
||||
message: 'Test walk sheet configuration saved successfully',
|
||||
testData: walkSheetData,
|
||||
saveResponse: response,
|
||||
settingsId: response.id || response.Id || response.ID
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
logger.error('Test walk sheet save failed:', error);
|
||||
res.json({
|
||||
success: false,
|
||||
test: 'failed',
|
||||
error: error.message,
|
||||
errorDetails: error.response?.data,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Raw walk sheet data
|
||||
router.get('/walk-sheet-raw', async (req, res) => {
|
||||
try {
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return res.json({ error: 'No settings sheet ID configured' });
|
||||
}
|
||||
|
||||
const response = await nocodbService.getAll(config.nocodb.settingsSheetId, {
|
||||
sort: '-created_at',
|
||||
limit: 5
|
||||
});
|
||||
|
||||
return res.json({
|
||||
success: true,
|
||||
tableId: config.nocodb.settingsSheetId,
|
||||
records: response.list || [],
|
||||
count: response.list?.length || 0
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error('Error fetching raw walk sheet data:', error);
|
||||
return res.status(500).json({
|
||||
success: false,
|
||||
error: error.message
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
102
map/app/routes/index.js
Normal file
102
map/app/routes/index.js
Normal file
@ -0,0 +1,102 @@
|
||||
const express = require('express');
|
||||
const path = require('path');
|
||||
const { requireAuth, requireAdmin } = require('../middleware/auth');
|
||||
|
||||
// Import route modules
|
||||
const authRoutes = require('./auth');
|
||||
const locationRoutes = require('./locations');
|
||||
const adminRoutes = require('./admin');
|
||||
const settingsRoutes = require('./settings');
|
||||
const userRoutes = require('./users');
|
||||
const qrRoutes = require('./qr');
|
||||
const debugRoutes = require('./debug');
|
||||
const geocodingRoutes = require('../routes/geocoding'); // Existing geocoding routes
|
||||
|
||||
module.exports = (app) => {
|
||||
// Health check (no auth)
|
||||
app.get('/health', (req, res) => {
|
||||
res.json({
|
||||
status: 'healthy',
|
||||
timestamp: new Date().toISOString(),
|
||||
version: process.env.npm_package_version || '1.0.0'
|
||||
});
|
||||
});
|
||||
|
||||
// Login page (no auth)
|
||||
app.get('/login.html', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../public', 'login.html'));
|
||||
});
|
||||
|
||||
// Auth routes (no auth required)
|
||||
app.use('/api/auth', authRoutes);
|
||||
|
||||
// Public config endpoint
|
||||
app.get('/api/config/start-location', require('../controllers/settingsController').getPublicStartLocation);
|
||||
|
||||
// QR code routes (authenticated)
|
||||
app.use('/api/qr', requireAuth, qrRoutes);
|
||||
|
||||
// Test QR page (no auth for testing)
|
||||
app.get('/test-qr', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../public', 'test-qr.html'));
|
||||
});
|
||||
|
||||
// Protected routes
|
||||
app.use('/api/locations', requireAuth, locationRoutes);
|
||||
app.use('/api/geocode', requireAuth, geocodingRoutes);
|
||||
app.use('/api/settings', requireAuth, settingsRoutes);
|
||||
|
||||
// Admin routes
|
||||
app.get('/admin.html', requireAdmin, (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../public', 'admin.html'));
|
||||
});
|
||||
app.use('/api/admin', requireAdmin, adminRoutes);
|
||||
app.use('/api/users', requireAdmin, userRoutes);
|
||||
|
||||
// Debug routes (admin only)
|
||||
app.use('/api/debug', requireAdmin, debugRoutes);
|
||||
|
||||
// Config check endpoint (authenticated)
|
||||
app.get('/api/config-check', requireAuth, (req, res) => {
|
||||
const config = require('../config');
|
||||
|
||||
const configStatus = {
|
||||
hasApiUrl: !!config.nocodb.apiUrl,
|
||||
hasApiToken: !!config.nocodb.apiToken,
|
||||
hasProjectId: !!config.nocodb.projectId,
|
||||
hasTableId: !!config.nocodb.tableId,
|
||||
hasLoginSheet: !!config.nocodb.loginSheetId,
|
||||
hasSettingsSheet: !!config.nocodb.settingsSheetId,
|
||||
projectId: config.nocodb.projectId,
|
||||
tableId: config.nocodb.tableId,
|
||||
loginSheet: config.nocodb.loginSheetId,
|
||||
settingsSheet: config.nocodb.settingsSheetId,
|
||||
nodeEnv: config.nodeEnv
|
||||
};
|
||||
|
||||
const isConfigured = configStatus.hasApiUrl &&
|
||||
configStatus.hasApiToken &&
|
||||
configStatus.hasProjectId &&
|
||||
configStatus.hasTableId;
|
||||
|
||||
res.json({
|
||||
configured: isConfigured,
|
||||
...configStatus
|
||||
});
|
||||
});
|
||||
|
||||
// Serve static files (protected)
|
||||
app.use(express.static(path.join(__dirname, '../public'), {
|
||||
index: false // Don't serve index.html automatically
|
||||
}));
|
||||
|
||||
// Main app route (protected)
|
||||
app.get('/', requireAuth, (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../public', 'index.html'));
|
||||
});
|
||||
|
||||
// Catch all - redirect to login
|
||||
app.get('*', (req, res) => {
|
||||
res.redirect('/login.html');
|
||||
});
|
||||
};
|
||||
21
map/app/routes/locations.js
Normal file
21
map/app/routes/locations.js
Normal file
@ -0,0 +1,21 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const locationsController = require('../controllers/locationsController');
|
||||
const { strictLimiter } = require('../middleware/rateLimiter');
|
||||
|
||||
// Get all locations
|
||||
router.get('/', locationsController.getAll);
|
||||
|
||||
// Get single location
|
||||
router.get('/:id', locationsController.getById);
|
||||
|
||||
// Create location (with rate limiting)
|
||||
router.post('/', strictLimiter, locationsController.create);
|
||||
|
||||
// Update location (with rate limiting)
|
||||
router.put('/:id', strictLimiter, locationsController.update);
|
||||
|
||||
// Delete location (with rate limiting)
|
||||
router.delete('/:id', strictLimiter, locationsController.delete);
|
||||
|
||||
module.exports = router;
|
||||
48
map/app/routes/qr.js
Normal file
48
map/app/routes/qr.js
Normal file
@ -0,0 +1,48 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const logger = require('../utils/logger');
|
||||
const { generateQRCode } = require('../services/qrcode');
|
||||
|
||||
// Generate QR code
|
||||
router.get('/', async (req, res) => {
|
||||
try {
|
||||
const { text, size = 200 } = req.query;
|
||||
|
||||
if (!text) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: 'Text parameter is required'
|
||||
});
|
||||
}
|
||||
|
||||
const qrOptions = {
|
||||
type: 'png',
|
||||
width: parseInt(size),
|
||||
margin: 1,
|
||||
color: {
|
||||
dark: '#000000',
|
||||
light: '#FFFFFF'
|
||||
},
|
||||
errorCorrectionLevel: 'M'
|
||||
};
|
||||
|
||||
const buffer = await generateQRCode(text, qrOptions);
|
||||
|
||||
res.set({
|
||||
'Content-Type': 'image/png',
|
||||
'Content-Length': buffer.length,
|
||||
'Cache-Control': 'public, max-age=3600' // Cache for 1 hour
|
||||
});
|
||||
|
||||
res.send(buffer);
|
||||
|
||||
} catch (error) {
|
||||
logger.error('QR code generation error:', error);
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: 'Failed to generate QR code'
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
13
map/app/routes/settings.js
Normal file
13
map/app/routes/settings.js
Normal file
@ -0,0 +1,13 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const settingsController = require('../controllers/settingsController');
|
||||
|
||||
// Get current settings
|
||||
router.get('/start-location', settingsController.getStartLocation);
|
||||
router.get('/walk-sheet', settingsController.getWalkSheetConfig);
|
||||
|
||||
// Update settings (POST routes)
|
||||
router.post('/start-location', settingsController.updateStartLocation);
|
||||
router.post('/walk-sheet', settingsController.updateWalkSheetConfig);
|
||||
|
||||
module.exports = router;
|
||||
14
map/app/routes/users.js
Normal file
14
map/app/routes/users.js
Normal file
@ -0,0 +1,14 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const usersController = require('../controllers/usersController');
|
||||
|
||||
// Get all users
|
||||
router.get('/', usersController.getAll);
|
||||
|
||||
// Create new user
|
||||
router.post('/', usersController.create);
|
||||
|
||||
// Delete user
|
||||
router.delete('/:id', usersController.delete);
|
||||
|
||||
module.exports = router;
|
||||
2051
map/app/server copy.js
Normal file
2051
map/app/server copy.js
Normal file
File diff suppressed because it is too large
Load Diff
2024
map/app/server.js
2024
map/app/server.js
File diff suppressed because it is too large
Load Diff
143
map/app/services/nocodb.js
Normal file
143
map/app/services/nocodb.js
Normal file
@ -0,0 +1,143 @@
|
||||
const axios = require('axios');
|
||||
const config = require('../config');
|
||||
const logger = require('../utils/logger');
|
||||
|
||||
class NocoDBService {
|
||||
constructor() {
|
||||
this.apiUrl = config.nocodb.apiUrl;
|
||||
this.apiToken = config.nocodb.apiToken;
|
||||
this.projectId = config.nocodb.projectId;
|
||||
this.timeout = 10000; // 10 seconds
|
||||
|
||||
// Create axios instance with defaults
|
||||
this.client = axios.create({
|
||||
baseURL: this.apiUrl,
|
||||
timeout: this.timeout,
|
||||
headers: {
|
||||
'xc-token': this.apiToken,
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
});
|
||||
|
||||
// Add response interceptor for error handling
|
||||
this.client.interceptors.response.use(
|
||||
response => response,
|
||||
error => {
|
||||
logger.error('NocoDB API Error:', {
|
||||
message: error.message,
|
||||
url: error.config?.url,
|
||||
method: error.config?.method,
|
||||
status: error.response?.status,
|
||||
data: error.response?.data
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Build table URL
|
||||
getTableUrl(tableId) {
|
||||
return `/db/data/v1/${this.projectId}/${tableId}`;
|
||||
}
|
||||
|
||||
// Get all records from a table
|
||||
async getAll(tableId, params = {}) {
|
||||
const url = this.getTableUrl(tableId);
|
||||
const response = await this.client.get(url, { params });
|
||||
return response.data;
|
||||
}
|
||||
|
||||
// Get single record
|
||||
async getById(tableId, recordId) {
|
||||
const url = `${this.getTableUrl(tableId)}/${recordId}`;
|
||||
const response = await this.client.get(url);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
// Create record
|
||||
async create(tableId, data) {
|
||||
const url = this.getTableUrl(tableId);
|
||||
const response = await this.client.post(url, data);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
// Update record
|
||||
async update(tableId, recordId, data) {
|
||||
const url = `${this.getTableUrl(tableId)}/${recordId}`;
|
||||
const response = await this.client.patch(url, data);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
// Delete record
|
||||
async delete(tableId, recordId) {
|
||||
const url = `${this.getTableUrl(tableId)}/${recordId}`;
|
||||
const response = await this.client.delete(url);
|
||||
return response.data;
|
||||
}
|
||||
|
||||
// Get locations with proper filtering
|
||||
async getLocations(params = {}) {
|
||||
const defaultParams = {
|
||||
limit: 1000,
|
||||
offset: 0,
|
||||
...params
|
||||
};
|
||||
|
||||
return this.getAll(config.nocodb.tableId, defaultParams);
|
||||
}
|
||||
|
||||
// Get user by email
|
||||
async getUserByEmail(email) {
|
||||
if (!config.nocodb.loginSheetId) {
|
||||
throw new Error('Login sheet not configured');
|
||||
}
|
||||
|
||||
const response = await this.getAll(config.nocodb.loginSheetId, {
|
||||
where: `(Email,eq,${email})`,
|
||||
limit: 1
|
||||
});
|
||||
|
||||
return response.list?.[0] || null;
|
||||
}
|
||||
|
||||
// Get latest settings
|
||||
async getLatestSettings() {
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const response = await this.getAll(config.nocodb.settingsSheetId, {
|
||||
sort: '-created_at',
|
||||
limit: 1
|
||||
});
|
||||
|
||||
return response.list?.[0] || null;
|
||||
}
|
||||
|
||||
// Get settings with walk sheet data
|
||||
async getWalkSheetSettings() {
|
||||
if (!config.nocodb.settingsSheetId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const response = await this.getAll(config.nocodb.settingsSheetId, {
|
||||
sort: '-created_at',
|
||||
limit: 20
|
||||
});
|
||||
|
||||
// Find first row with walk sheet data
|
||||
const settings = response.list?.find(row =>
|
||||
row.walk_sheet_title ||
|
||||
row.walk_sheet_subtitle ||
|
||||
row.walk_sheet_footer ||
|
||||
row.qr_code_1_url ||
|
||||
row.qr_code_2_url ||
|
||||
row.qr_code_3_url
|
||||
) || response.list?.[0];
|
||||
|
||||
return settings || null;
|
||||
}
|
||||
}
|
||||
|
||||
// Export singleton instance
|
||||
module.exports = new NocoDBService();
|
||||
184
map/app/utils/helpers.js
Normal file
184
map/app/utils/helpers.js
Normal file
@ -0,0 +1,184 @@
|
||||
// Sync geographic fields between different formats
|
||||
function syncGeoFields(data) {
|
||||
// If we have latitude and longitude but no Geo-Location, create it
|
||||
if (data.latitude && data.longitude && !data['Geo-Location']) {
|
||||
const lat = parseFloat(data.latitude);
|
||||
const lng = parseFloat(data.longitude);
|
||||
if (!isNaN(lat) && !isNaN(lng)) {
|
||||
data['Geo-Location'] = `${lat};${lng}`;
|
||||
data.geodata = `${lat};${lng}`;
|
||||
}
|
||||
}
|
||||
// If we have Geo-Location but no lat/lng, parse it
|
||||
else if (data['Geo-Location'] && (!data.latitude || !data.longitude)) {
|
||||
const geoLocation = data['Geo-Location'].toString();
|
||||
|
||||
// Try semicolon-separated first
|
||||
let parts = geoLocation.split(';');
|
||||
if (parts.length === 2) {
|
||||
const lat = parseFloat(parts[0].trim());
|
||||
const lng = parseFloat(parts[1].trim());
|
||||
if (!isNaN(lat) && !isNaN(lng)) {
|
||||
data.latitude = lat;
|
||||
data.longitude = lng;
|
||||
data.geodata = `${lat};${lng}`;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
// Try comma-separated
|
||||
parts = geoLocation.split(',');
|
||||
if (parts.length === 2) {
|
||||
const lat = parseFloat(parts[0].trim());
|
||||
const lng = parseFloat(parts[1].trim());
|
||||
if (!isNaN(lat) && !isNaN(lng)) {
|
||||
data.latitude = lat;
|
||||
data.longitude = lng;
|
||||
data.geodata = `${lat};${lng}`;
|
||||
// Normalize Geo-Location to semicolon format for NocoDB GeoData
|
||||
data['Geo-Location'] = `${lat};${lng}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
// Validate URL format
|
||||
function validateUrl(url) {
|
||||
if (!url || typeof url !== 'string') {
|
||||
return '';
|
||||
}
|
||||
|
||||
const trimmed = url.trim();
|
||||
if (!trimmed) {
|
||||
return '';
|
||||
}
|
||||
|
||||
// Basic URL validation
|
||||
try {
|
||||
new URL(trimmed);
|
||||
return trimmed;
|
||||
} catch (e) {
|
||||
// If not a valid URL, check if it's a relative path or missing protocol
|
||||
if (trimmed.startsWith('/') || !trimmed.includes('://')) {
|
||||
// For relative paths or missing protocol, return as-is
|
||||
return trimmed;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
// Get cookie configuration based on request
|
||||
function getCookieConfig(req) {
|
||||
const host = req?.get('host') || '';
|
||||
const isLocalhost = host.includes('localhost') ||
|
||||
host.includes('127.0.0.1') ||
|
||||
host.match(/^\d+\.\d+\.\d+\.\d+/);
|
||||
|
||||
const config = {
|
||||
httpOnly: true,
|
||||
maxAge: 24 * 60 * 60 * 1000, // 24 hours
|
||||
sameSite: 'lax',
|
||||
secure: false,
|
||||
domain: undefined
|
||||
};
|
||||
|
||||
// Only set domain and secure for production non-localhost access
|
||||
if (process.env.NODE_ENV === 'production' && !isLocalhost && process.env.COOKIE_DOMAIN) {
|
||||
const cookieDomain = process.env.COOKIE_DOMAIN.replace(/^\./, '');
|
||||
if (host.includes(cookieDomain)) {
|
||||
config.domain = process.env.COOKIE_DOMAIN;
|
||||
config.secure = true;
|
||||
}
|
||||
}
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
// Extract ID from NocoDB response
|
||||
function extractId(record) {
|
||||
return record.Id || record.id || record.ID || record._id;
|
||||
}
|
||||
|
||||
// Validate coordinates
|
||||
function validateCoordinates(lat, lng) {
|
||||
const latitude = parseFloat(lat);
|
||||
const longitude = parseFloat(lng);
|
||||
|
||||
if (isNaN(latitude) || isNaN(longitude)) {
|
||||
return { valid: false, error: 'Invalid coordinate values' };
|
||||
}
|
||||
|
||||
if (latitude < -90 || latitude > 90) {
|
||||
return { valid: false, error: 'Latitude must be between -90 and 90' };
|
||||
}
|
||||
|
||||
if (longitude < -180 || longitude > 180) {
|
||||
return { valid: false, error: 'Longitude must be between -180 and 180' };
|
||||
}
|
||||
|
||||
return { valid: true, latitude, longitude };
|
||||
}
|
||||
|
||||
// Check if coordinates are within bounds
|
||||
function checkBounds(lat, lng, bounds) {
|
||||
if (!bounds) return true;
|
||||
|
||||
return lat <= bounds.north &&
|
||||
lat >= bounds.south &&
|
||||
lng <= bounds.east &&
|
||||
lng >= bounds.west;
|
||||
}
|
||||
|
||||
// Sanitize user data for response
|
||||
function sanitizeUser(user) {
|
||||
const { Password, password, ...safeUser } = user;
|
||||
return safeUser;
|
||||
}
|
||||
|
||||
// Extract walk sheet configuration from NocoDB data, handling different field name formats
|
||||
function extractWalkSheetConfig(data, defaults = {}) {
|
||||
if (!data) return defaults;
|
||||
|
||||
return {
|
||||
walk_sheet_title: data.walk_sheet_title !== undefined ? data.walk_sheet_title :
|
||||
data['Walk Sheet Title'] !== undefined ? data['Walk Sheet Title'] :
|
||||
defaults.walk_sheet_title,
|
||||
walk_sheet_subtitle: data.walk_sheet_subtitle !== undefined ? data.walk_sheet_subtitle :
|
||||
data['Walk Sheet Subtitle'] !== undefined ? data['Walk Sheet Subtitle'] :
|
||||
defaults.walk_sheet_subtitle,
|
||||
walk_sheet_footer: data.walk_sheet_footer !== undefined ? data.walk_sheet_footer :
|
||||
data['Walk Sheet Footer'] !== undefined ? data['Walk Sheet Footer'] :
|
||||
defaults.walk_sheet_footer,
|
||||
qr_code_1_url: data.qr_code_1_url !== undefined ? data.qr_code_1_url :
|
||||
data['QR Code 1 URL'] !== undefined ? data['QR Code 1 URL'] :
|
||||
defaults.qr_code_1_url,
|
||||
qr_code_1_label: data.qr_code_1_label !== undefined ? data.qr_code_1_label :
|
||||
data['QR Code 1 Label'] !== undefined ? data['QR Code 1 Label'] :
|
||||
defaults.qr_code_1_label,
|
||||
qr_code_2_url: data.qr_code_2_url !== undefined ? data.qr_code_2_url :
|
||||
data['QR Code 2 URL'] !== undefined ? data['QR Code 2 URL'] :
|
||||
defaults.qr_code_2_url,
|
||||
qr_code_2_label: data.qr_code_2_label !== undefined ? data.qr_code_2_label :
|
||||
data['QR Code 2 Label'] !== undefined ? data['QR Code 2 Label'] :
|
||||
defaults.qr_code_2_label,
|
||||
qr_code_3_url: data.qr_code_3_url !== undefined ? data.qr_code_3_url :
|
||||
data['QR Code 3 URL'] !== undefined ? data['QR Code 3 URL'] :
|
||||
defaults.qr_code_3_url,
|
||||
qr_code_3_label: data.qr_code_3_label !== undefined ? data.qr_code_3_label :
|
||||
data['QR Code 3 Label'] !== undefined ? data['QR Code 3 Label'] :
|
||||
defaults.qr_code_3_label
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
syncGeoFields,
|
||||
validateUrl,
|
||||
getCookieConfig,
|
||||
extractId,
|
||||
validateCoordinates,
|
||||
checkBounds,
|
||||
sanitizeUser,
|
||||
extractWalkSheetConfig
|
||||
};
|
||||
33
map/app/utils/logger.js
Normal file
33
map/app/utils/logger.js
Normal file
@ -0,0 +1,33 @@
|
||||
const winston = require('winston');
|
||||
const config = require('../config');
|
||||
|
||||
const logger = winston.createLogger({
|
||||
level: config.isProduction ? 'info' : 'debug',
|
||||
format: winston.format.combine(
|
||||
winston.format.timestamp(),
|
||||
winston.format.errors({ stack: true }),
|
||||
winston.format.json()
|
||||
),
|
||||
defaultMeta: { service: 'bnkops-map' },
|
||||
transports: [
|
||||
new winston.transports.Console({
|
||||
format: winston.format.combine(
|
||||
winston.format.colorize(),
|
||||
winston.format.simple()
|
||||
)
|
||||
})
|
||||
]
|
||||
});
|
||||
|
||||
// Add file transport in production
|
||||
if (config.isProduction) {
|
||||
logger.add(new winston.transports.File({
|
||||
filename: 'error.log',
|
||||
level: 'error'
|
||||
}));
|
||||
logger.add(new winston.transports.File({
|
||||
filename: 'combined.log'
|
||||
}));
|
||||
}
|
||||
|
||||
module.exports = logger;
|
||||
Loading…
x
Reference in New Issue
Block a user