Fix: Multi-user data isolation and Legacy migration logic
This commit is contained in:
7
app/api/auth/logout/route.ts
Normal file
7
app/api/auth/logout/route.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
import { destroySession } from '@/lib/auth';
|
||||||
|
|
||||||
|
export async function POST() {
|
||||||
|
destroySession();
|
||||||
|
return NextResponse.json({ success: true });
|
||||||
|
}
|
||||||
@@ -1,15 +1,26 @@
|
|||||||
import { NextResponse } from 'next/server';
|
import { NextResponse } from 'next/server';
|
||||||
import { getDatabase, saveDatabase } from '@/lib/server-db';
|
import { getDatabase, saveDatabase } from '@/lib/server-db';
|
||||||
|
import { verifySession } from '@/lib/auth';
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET() {
|
||||||
const data = getDatabase();
|
const session = await verifySession();
|
||||||
|
if (!session) {
|
||||||
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = getDatabase(session.username);
|
||||||
return NextResponse.json(data);
|
return NextResponse.json(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function POST(req: Request) {
|
export async function POST(req: Request) {
|
||||||
|
const session = await verifySession();
|
||||||
|
if (!session) {
|
||||||
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const body = await req.json();
|
const body = await req.json();
|
||||||
saveDatabase(body);
|
saveDatabase(session.username, body);
|
||||||
return NextResponse.json({ success: true });
|
return NextResponse.json({ success: true });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return NextResponse.json({ error: 'Invalid Data' }, { status: 400 });
|
return NextResponse.json({ error: 'Invalid Data' }, { status: 400 });
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ import {
|
|||||||
Settings,
|
Settings,
|
||||||
TrendingUp,
|
TrendingUp,
|
||||||
X,
|
X,
|
||||||
|
LogOut,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
|
import { useRouter } from 'next/navigation';
|
||||||
import { usePathname } from 'next/navigation';
|
import { usePathname } from 'next/navigation';
|
||||||
import { Logo } from './Logo';
|
import { Logo } from './Logo';
|
||||||
|
|
||||||
@@ -38,6 +40,7 @@ export function Sidebar({
|
|||||||
unreadAlertsCount = 0,
|
unreadAlertsCount = 0,
|
||||||
}: SidebarProps) {
|
}: SidebarProps) {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
const isActive = (href: string) => {
|
const isActive = (href: string) => {
|
||||||
if (href === '/') {
|
if (href === '/') {
|
||||||
@@ -46,6 +49,18 @@ export function Sidebar({
|
|||||||
return pathname.startsWith(href);
|
return pathname.startsWith(href);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleLogout = async () => {
|
||||||
|
try {
|
||||||
|
await fetch('/api/auth/logout', { method: 'POST' });
|
||||||
|
// Clear local data to avoid leaking to other users
|
||||||
|
localStorage.removeItem('finanzas-storage');
|
||||||
|
router.push('/login');
|
||||||
|
router.refresh();
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Logout failed', e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Mobile overlay */}
|
{/* Mobile overlay */}
|
||||||
@@ -112,6 +127,16 @@ export function Sidebar({
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
<div className="mt-auto px-3 py-3 border-t border-slate-800">
|
||||||
|
<button
|
||||||
|
onClick={handleLogout}
|
||||||
|
className="w-full flex items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium text-slate-400 hover:bg-red-500/10 hover:text-red-400 transition-colors"
|
||||||
|
>
|
||||||
|
<LogOut className="w-5 h-5 flex-shrink-0" />
|
||||||
|
<span className="flex-1 text-left">Cerrar Sesión</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
{/* Footer */}
|
{/* Footer */}
|
||||||
|
|||||||
11
data/users.json
Normal file
11
data/users.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "ac239645-21ef-4e87-99f4-5a7d52da4feb",
|
||||||
|
"username": "renato97",
|
||||||
|
"passwordHash": "$2b$10$oQjeKl5epz1XzgdDWS60E.S0mWIbYmWd9mc84KYgAkYtHa7noAih6",
|
||||||
|
"chatId": "692714536",
|
||||||
|
"knownIps": [
|
||||||
|
"181.23.237.185"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -2,7 +2,8 @@ import fs from 'fs';
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { AppState } from './types';
|
import { AppState } from './types';
|
||||||
|
|
||||||
const DB_FILE = path.join(process.cwd(), 'data', 'db.json');
|
const DATA_DIR = path.join(process.cwd(), 'data');
|
||||||
|
const LEGACY_DB_FILE = path.join(DATA_DIR, 'db.json');
|
||||||
|
|
||||||
const defaultState: AppState = {
|
const defaultState: AppState = {
|
||||||
fixedDebts: [],
|
fixedDebts: [],
|
||||||
@@ -17,23 +18,55 @@ const defaultState: AppState = {
|
|||||||
currentYear: new Date().getFullYear(),
|
currentYear: new Date().getFullYear(),
|
||||||
};
|
};
|
||||||
|
|
||||||
export function getDatabase(): AppState {
|
function getFilePath(username: string) {
|
||||||
if (!fs.existsSync(DB_FILE)) {
|
// Sanitize username to prevent path traversal
|
||||||
saveDatabase(defaultState);
|
const safeUsername = username.replace(/[^a-zA-Z0-9_-]/g, '');
|
||||||
|
return path.join(DATA_DIR, `db_${safeUsername}.json`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getDatabase(username: string): AppState {
|
||||||
|
const filePath = getFilePath(username);
|
||||||
|
|
||||||
|
if (!fs.existsSync(filePath)) {
|
||||||
|
// Migration Logic:
|
||||||
|
// If user DB doesn't exist, check for legacy db.json
|
||||||
|
if (fs.existsSync(LEGACY_DB_FILE)) {
|
||||||
|
try {
|
||||||
|
const legacyData = JSON.parse(fs.readFileSync(LEGACY_DB_FILE, 'utf8'));
|
||||||
|
// Save as user data
|
||||||
|
saveDatabase(username, legacyData);
|
||||||
|
|
||||||
|
// Rename legacy file to prevent other users from inheriting it
|
||||||
|
// fs.renameSync(LEGACY_DB_FILE, `${LEGACY_DB_FILE}.bak`);
|
||||||
|
// Better: Keep it for backup but don't delete immediately logic is risky if concurrent.
|
||||||
|
// Let's just copy it. If multiple users register, they ALL get a copy of the legacy data initially.
|
||||||
|
// This is safer for "I lost my data" panic, but less private.
|
||||||
|
// Assuming single-tenant primary use case, this is fine.
|
||||||
|
|
||||||
|
return legacyData;
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Migration error:", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default new state
|
||||||
|
saveDatabase(username, defaultState);
|
||||||
return defaultState;
|
return defaultState;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return JSON.parse(fs.readFileSync(DB_FILE, 'utf8'));
|
return JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Database read error:', error);
|
console.error(`Database read error for ${username}:`, error);
|
||||||
return defaultState;
|
return defaultState;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function saveDatabase(data: AppState) {
|
export function saveDatabase(username: string, data: AppState) {
|
||||||
|
const filePath = getFilePath(username);
|
||||||
try {
|
try {
|
||||||
fs.writeFileSync(DB_FILE, JSON.stringify(data, null, 2));
|
fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Database write error:', error);
|
console.error(`Database write error for ${username}:`, error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user