diff --git a/packages/backend/src/routes/user/update.ts b/packages/backend/src/routes/user/update.ts index dabe7d7..91f889f 100644 --- a/packages/backend/src/routes/user/update.ts +++ b/packages/backend/src/routes/user/update.ts @@ -1,8 +1,9 @@ import type { UserRecord } from "@issue/shared"; import type { AuthedRequest } from "../../auth/middleware"; +import { hashPassword } from "../../auth/utils"; import { getUserById } from "../../db/queries"; -// /user/update?id=1&name=NewName&passwordHash=NewHash&serverURL=NewURL +// /user/update?id=1&name=NewName&password=NewPassword export default async function update(req: AuthedRequest) { const url = new URL(req.url); const id = url.searchParams.get("id"); @@ -16,11 +17,14 @@ export default async function update(req: AuthedRequest) { } const name = url.searchParams.get("name") || undefined; - const passwordHash = url.searchParams.get("passwordHash") || undefined; - const serverURL = url.searchParams.get("serverURL") || undefined; + const password = url.searchParams.get("password") || undefined; + let passwordHash: string | undefined; + if (password !== undefined) { + passwordHash = await hashPassword(password); + } const { updateById } = await import("../../db/queries/users"); - const updatedUser = await updateById(user.id, { name, passwordHash, serverURL }); + const updatedUser = await updateById(user.id, { name, passwordHash }); if (!updatedUser) { return new Response("failed to update user", { status: 500 }); diff --git a/packages/frontend/src/lib/server/index.ts b/packages/frontend/src/lib/server/index.ts index 3b9cd85..cf92030 100644 --- a/packages/frontend/src/lib/server/index.ts +++ b/packages/frontend/src/lib/server/index.ts @@ -1,6 +1,7 @@ export * as issue from "./issue"; export * as organisation from "./organisation"; export * as project from "./project"; +export * as user from "./user"; export type ServerQueryInput = { onSuccess?: (data: any, res: Response) => void; diff --git a/packages/frontend/src/lib/server/user/update.ts b/packages/frontend/src/lib/server/user/update.ts index 3078d7c..457925f 100644 --- a/packages/frontend/src/lib/server/user/update.ts +++ b/packages/frontend/src/lib/server/user/update.ts @@ -5,20 +5,17 @@ export async function update({ id, name, password, - serverURL, onSuccess, onError, }: { id: number; name: string; password: string; - serverURL: string; } & ServerQueryInput) { const url = new URL(`${getServerURL()}/user/update`); url.searchParams.set("id", `${id}`); url.searchParams.set("name", name.trim()); url.searchParams.set("password", password.trim()); - url.searchParams.set("serverURL", serverURL.trim()); const res = await fetch(url.toString(), { headers: getAuthHeaders(),