alma/Neah
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Page logic dang

Browse Source
This commit is contained in:
alma 2025-04-21 11:35:06 +02:00
parent 7bd0364c4d
commit df039ae99c
3 changed files with 51 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/auth/[...nextauth]/route.ts
View File

@ -35,7 +35,7 @@ declare module "next-auth" {
role: string[]; role: string[];
nextcloudInitialized?: boolean; nextcloudInitialized?: boolean;
}; };
accessToken: string; accessToken?: string;
} }
interface JWT { interface JWT {

63
app/api/nextcloud/files/content/route.ts
View File

@ -1,45 +1,9 @@
import { NextResponse } from 'next/server'; import { NextResponse } from 'next/server';
import { getServerSession } from 'next-auth'; import { getServerSession } from 'next-auth';
import { PrismaClient } from '@prisma/client';
import { authOptions } from '@/app/api/auth/[...nextauth]/route'; import { authOptions } from '@/app/api/auth/[...nextauth]/route';
import { prisma } from '@/lib/prisma';
import { createClient } from 'webdav'; import { createClient } from 'webdav';
// Use a single PrismaClient instance
declare global {
var prisma: PrismaClient | undefined;
}
const prisma = global.prisma || new PrismaClient();
if (process.env.NODE_ENV !== 'production') global.prisma = prisma;
// Helper function to create WebDAV client
const createWebDAVClient = async (userId: string) => {
const credentials = await prisma.webDAVCredentials.findUnique({
where: { userId },
});
if (!credentials) {
throw new Error('No WebDAV credentials found');
}
const baseURL = process.env.NEXTCLOUD_URL;
if (!baseURL) {
throw new Error('NEXTCLOUD_URL environment variable is not set');
}
const normalizedBaseURL = baseURL.endsWith('/') ? baseURL.slice(0, -1) : baseURL;
const webdavURL = `${normalizedBaseURL}/remote.php/dav`;
return {
client: createClient(webdavURL, {
username: credentials.username,
password: credentials.password,
authType: 'password',
}),
username: credentials.username
};
};
export async function GET(request: Request) { export async function GET(request: Request) {
try { try {
const { searchParams } = new URL(request.url); const { searchParams } = new URL(request.url);
@ -54,9 +18,6 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
} }
const nextcloudUrl = process.env.NEXTCLOUD_URL;
const username = `cube-${session.user.id}`;
// Get credentials without logging // Get credentials without logging
const credentials = await prisma.webDAVCredentials.findUnique({ const credentials = await prisma.webDAVCredentials.findUnique({
where: { userId: session.user.id } where: { userId: session.user.id }
@ -66,19 +27,14 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'Nextcloud credentials not found' }, { status: 404 }); return NextResponse.json({ error: 'Nextcloud credentials not found' }, { status: 404 });
} }
// Make request without logging sensitive information // Create WebDAV client
const response = await fetch(`${nextcloudUrl}/remote.php/dav${path}`, { const client = createClient(process.env.NEXTCLOUD_URL!, {
method: 'GET', username: credentials.username,
headers: { password: credentials.password,
'Authorization': `Basic ${Buffer.from(`${username}:${credentials.password}`).toString('base64')}`,
},
}); });
if (!response.ok) { try {
return NextResponse.json({ error: 'Failed to fetch file content' }, { status: response.status }); const content = await client.getFileContents(path, { format: 'text' });
}
const content = await response.text();
// For VCF files, don't log the content // For VCF files, don't log the content
if (path.endsWith('.vcf')) { if (path.endsWith('.vcf')) {
@ -89,6 +45,11 @@ export async function GET(request: Request) {
} catch (error) { } catch (error) {
// Log error without sensitive information // Log error without sensitive information
console.error('Error fetching file content:', error instanceof Error ? error.message : 'Unknown error'); console.error('Error fetching file content:', error instanceof Error ? error.message : 'Unknown error');
return NextResponse.json({ error: 'Failed to fetch file content' }, { status: 500 });
}
} catch (error) {
// Log error without sensitive information
console.error('Error in GET request:', error instanceof Error ? error.message : 'Unknown error');
return NextResponse.json({ error: 'Internal server error' }, { status: 500 }); return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
} }
} }

91
app/api/nextcloud/files/route.ts
View File

@ -3,18 +3,19 @@ import { getServerSession } from 'next-auth';
import { PrismaClient } from '@prisma/client'; import { PrismaClient } from '@prisma/client';
import { authOptions } from '@/app/api/auth/[...nextauth]/route'; import { authOptions } from '@/app/api/auth/[...nextauth]/route';
import { createClient } from 'webdav'; import { createClient } from 'webdav';
import { prisma } from '@/lib/prisma';
// Use a single PrismaClient instance // Use a single PrismaClient instance
declare global { declare global {
var prisma: PrismaClient | undefined; var prisma: PrismaClient | undefined;
} }
const prisma = global.prisma || new PrismaClient(); const prismaClient = global.prisma || new PrismaClient();
if (process.env.NODE_ENV !== 'production') global.prisma = prisma; if (process.env.NODE_ENV !== 'production') global.prisma = prismaClient;
// Helper function to create WebDAV client // Helper function to create WebDAV client
const createWebDAVClient = async (userId: string) => { const createWebDAVClient = async (userId: string) => {
const credentials = await prisma.webDAVCredentials.findUnique({ const credentials = await prismaClient.webDAVCredentials.findUnique({
where: { userId }, where: { userId },
}); });
@ -54,9 +55,6 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 }); return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
} }
const nextcloudUrl = process.env.NEXTCLOUD_URL;
const username = `cube-${session.user.id}`;
// Get credentials without logging // Get credentials without logging
const credentials = await prisma.webDAVCredentials.findUnique({ const credentials = await prisma.webDAVCredentials.findUnique({
where: { userId: session.user.id } where: { userId: session.user.id }
@ -66,61 +64,40 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'Nextcloud credentials not found' }, { status: 404 }); return NextResponse.json({ error: 'Nextcloud credentials not found' }, { status: 404 });
} }
const path = `/files/${username}/Private/${folder}`; // Create WebDAV client
const client = createClient(process.env.NEXTCLOUD_URL!, {
// Make request without logging sensitive information username: credentials.username,
const response = await fetch(`${nextcloudUrl}/remote.php/dav${path}`, { password: credentials.password,
method: 'PROPFIND',
headers: {
'Authorization': `Basic ${Buffer.from(`${username}:${credentials.password}`).toString('base64')}`,
'Depth': '1',
'Content-Type': 'application/xml',
},
body: '<?xml version="1.0" encoding="UTF-8"?><d:propfind xmlns:d="DAV:"><d:prop><d:resourcetype/><d:getlastmodified/><d:getcontentlength/><d:getcontenttype/><d:getetag/></d:prop></d:propfind>',
}); });
if (!response.ok) { try {
return NextResponse.json({ error: 'Failed to fetch files' }, { status: response.status }); const path = `/files/${credentials.username}/Private/${folder}`;
} const files = await client.getDirectoryContents(path);
const text = await response.text();
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(text, 'text/xml');
const files: any[] = [];
const responses = xmlDoc.getElementsByTagName('d:response');
for (let i = 0; i < responses.length; i++) {
const response = responses[i];
const href = response.getElementsByTagName('d:href')[0]?.textContent;
const propstat = response.getElementsByTagName('d:propstat')[0];
if (href && propstat) {
const prop = propstat.getElementsByTagName('d:prop')[0];
if (prop) {
const type = prop.getElementsByTagName('d:resourcetype')[0];
const lastmod = prop.getElementsByTagName('d:getlastmodified')[0]?.textContent;
const size = prop.getElementsByTagName('d:getcontentlength')[0]?.textContent;
const mime = prop.getElementsByTagName('d:getcontenttype')[0]?.textContent;
const etag = prop.getElementsByTagName('d:getetag')[0]?.textContent;
if (type && !type.getElementsByTagName('d:collection').length) {
const filename = href.split('/').pop() || '';
files.push({
filename: href,
basename: filename,
lastmod,
size,
type: 'file',
etag,
mime
});
}
}
}
}
// For Contacts folder, return all files
if (folder === 'Contacts') {
return NextResponse.json(files); return NextResponse.json(files);
}
// For other folders, filter markdown files
const markdownFiles = files
.filter((file: any) => file.basename.endsWith('.md'))
.map((file: any) => ({
id: file.filename,
title: file.basename.replace('.md', ''),
lastModified: new Date(file.lastmod).toISOString(),
size: file.size,
type: 'file',
mime: file.mime,
etag: file.etag
}));
return NextResponse.json(markdownFiles);
} catch (error) {
// Log error without sensitive information
console.error('Error listing directory contents:', error instanceof Error ? error.message : 'Unknown error');
return NextResponse.json({ error: 'Failed to list directory contents' }, { status: 500 });
}
} catch (error) { } catch (error) {
// Log error without sensitive information // Log error without sensitive information
console.error('Error fetching files:', error instanceof Error ? error.message : 'Unknown error'); console.error('Error fetching files:', error instanceof Error ? error.message : 'Unknown error');