Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions apps/backend/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ export const EnvSchema = z.object({
JWT_SECRET: z.string().min(1, 'JWT_SECRET is required'),
PORT: z.coerce.number().int('PORT must be an integer').positive('PORT must be positive'),
TOKEN_TRANSFER_CONTRACT_ID: z.string().min(1, 'TOKEN_TRANSFER_CONTRACT_ID is required'),
S3_ENDPOINT: z.string().optional(),
S3_REGION: z.string().optional(),
S3_ACCESS_KEY_ID: z.string().optional(),
S3_SECRET_ACCESS_KEY: z.string().optional(),
S3_BUCKET: z.string().optional(),
S3_FORCE_PATH_STYLE: z
.preprocess((val) => {
if (val === 'true' || val === true) return true;
if (val === 'false' || val === false) return false;
return undefined;
}, z.boolean())
.optional(),
OBJECT_STORE_ENDPOINT: z.string().min(1, 'OBJECT_STORE_ENDPOINT is required'),
OBJECT_STORE_BUCKET: z.string().min(1, 'OBJECT_STORE_BUCKET is required'),
OBJECT_STORE_ACCESS_KEY: z.string().min(1, 'OBJECT_STORE_ACCESS_KEY is required'),
Expand Down
3 changes: 2 additions & 1 deletion apps/backend/src/routes/files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { eq, and } from 'drizzle-orm';
import { db } from '../db/index.js';
import { messages, conversationMembers, files } from '../db/schema.js';
import { requireAuth, type AuthRequest } from '../middleware/auth.js';
import { objectStore } from '../lib/objectStore.js';
import { S3Client, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
import { randomUUID } from 'node:crypto';
Expand Down Expand Up @@ -148,7 +149,7 @@ filesRouter.get('/:fileId', async (req: AuthRequest, res) => {
Key: fileRecord.storageKey,
});
// Short-lived URL: 5 minutes
const presignedUrl = await getSignedUrl(s3, command, { expiresIn: 300 });
const presignedUrl = await objectStore.getDownloadUrl(fileId, 300);
res.json({ url: presignedUrl });
} catch {
res.status(500).json({ error: 'Failed to generate download URL' });
Expand Down