diff --git a/apps/server/.gitignore b/apps/server/.gitignore index 9eb8e53..a21a4b9 100644 --- a/apps/server/.gitignore +++ b/apps/server/.gitignore @@ -3,3 +3,4 @@ node_modules dist/* uploads/* temp-chunks/* +prisma/*.db diff --git a/apps/server/src/modules/share/service.ts b/apps/server/src/modules/share/service.ts index 4d6d4f1..e25a822 100644 --- a/apps/server/src/modules/share/service.ts +++ b/apps/server/src/modules/share/service.ts @@ -45,7 +45,7 @@ export class ShareService { async createShare(data: CreateShareInput, userId: string) { const security = await prisma.shareSecurity.create({ data: { - password: data.password, + password: data.password ? await bcrypt.hash(data.password, 10) : null, maxViews: data.maxViews, }, }); diff --git a/apps/web/src/app/api/(proxy)/shares/alias/create/[shareId]/route.ts b/apps/web/src/app/api/(proxy)/shares/alias/create/[shareId]/route.ts index 19ef52b..1acd5ba 100644 --- a/apps/web/src/app/api/(proxy)/shares/alias/create/[shareId]/route.ts +++ b/apps/web/src/app/api/(proxy)/shares/alias/create/[shareId]/route.ts @@ -1,10 +1,11 @@ import { NextRequest, NextResponse } from "next/server"; -export async function POST(req: NextRequest, { params }: { params: { shareId: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ shareId: string }> }) { const body = await req.text(); const cookieHeader = req.headers.get("cookie"); + const { shareId } = await params; - const apiRes = await fetch(`${process.env.API_BASE_URL}/shares/${params.shareId}/alias`, { + const apiRes = await fetch(`${process.env.API_BASE_URL}/shares/${shareId}/alias`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/apps/web/src/app/api/(proxy)/shares/alias/get/[alias]/route.ts b/apps/web/src/app/api/(proxy)/shares/alias/get/[alias]/route.ts index 8cab281..4684460 100644 --- a/apps/web/src/app/api/(proxy)/shares/alias/get/[alias]/route.ts +++ b/apps/web/src/app/api/(proxy)/shares/alias/get/[alias]/route.ts @@ -1,10 +1,11 @@ import { NextRequest, NextResponse } from "next/server"; -export async function GET(req: NextRequest, { params }: { params: { alias: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ alias: string }> }) { const cookieHeader = req.headers.get("cookie"); const url = new URL(req.url); const queryParams = url.search; - const apiRes = await fetch(`${process.env.API_BASE_URL}/shares/alias/${params.alias}${queryParams}`, { + const { alias } = await params; + const apiRes = await fetch(`${process.env.API_BASE_URL}/shares/alias/${alias}${queryParams}`, { method: "GET", headers: { "Content-Type": "application/json", @@ -28,4 +29,4 @@ export async function GET(req: NextRequest, { params }: { params: { alias: strin } return res; -} \ No newline at end of file +} diff --git a/apps/web/src/app/api/(proxy)/shares/details/[shareId]/route.ts b/apps/web/src/app/api/(proxy)/shares/details/[shareId]/route.ts index 3b4a62b..e8ee9db 100644 --- a/apps/web/src/app/api/(proxy)/shares/details/[shareId]/route.ts +++ b/apps/web/src/app/api/(proxy)/shares/details/[shareId]/route.ts @@ -1,20 +1,18 @@ import { NextRequest, NextResponse } from "next/server"; -export async function GET(req: NextRequest, { params }: { params: { shareId: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ shareId: string }> }) { const cookieHeader = req.headers.get("cookie"); const url = new URL(req.url); const searchParams = url.searchParams.toString(); + const { shareId } = await params; - const apiRes = await fetch( - `${process.env.API_BASE_URL}/shares/${params.shareId}${searchParams ? `?${searchParams}` : ""}`, - { - method: "GET", - headers: { - cookie: cookieHeader || "", - }, - redirect: "manual", - } - ); + const apiRes = await fetch(`${process.env.API_BASE_URL}/shares/${shareId}${searchParams ? `?${searchParams}` : ""}`, { + method: "GET", + headers: { + cookie: cookieHeader || "", + }, + redirect: "manual", + }); const resBody = await apiRes.text();