🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix user creation
Bill Yang17bbe2dd4ecf
diff --git a/client/src/app/settings/users/AddUser.tsx b/client/src/app/settings/users/AddUser.tsxindex ef45fb552..ed2f32846 100644--- a/client/src/app/settings/users/AddUser.tsx+++ b/client/src/app/settings/users/AddUser.tsx@@ -18,10 +18,12 @@ import { AlertCircle } from "lucide-react";import { Label } from "../../../components/ui/label";import { Input } from "../../../components/ui/input";import { Switch } from "../../../components/ui/switch";+import { authedFetch } from "../../../hooks/utils";+import { BACKEND_URL } from "../../../lib/const";export function AddUser({ refetch }: { refetch: () => void }) {const [open, setOpen] = useState(false);- const [name, setName] = useState("");+ const [username, setUsername] = useState("");const [email, setEmail] = useState("");const [password, setPassword] = useState("");const [confirmPassword, setConfirmPassword] = useState("");@@ -39,15 +41,24 @@ export function AddUser({ refetch }: { refetch: () => void }) {return;}try {- const response = await authClient.admin.createUser({- password,- email,- name,- role: isAdmin ? "admin" : "user",+ const response = await authedFetch(`${BACKEND_URL}/create-account`, {+ method: "POST",+ body: JSON.stringify({+ email,+ username,+ name: username,+ password,+ isAdmin,+ }),+ headers: {+ "Content-Type": "application/json",+ },});- if (response.error) {- setError(String(response.error.message));+ if (response.status !== 201) {+ const data = await response.json();+ console.info(data);+ setError(data.error);return;}@@ -66,7 +77,7 @@ export function AddUser({ refetch }: { refetch: () => void }) {setOpen(isOpen);setPassword("");setConfirmPassword("");- setName("");+ setUsername("");setEmail("");setError("");setIsAdmin(false);@@ -80,12 +91,12 @@ export function AddUser({ refetch }: { refetch: () => void }) {<DialogTitle>Add User</DialogTitle></DialogHeader><div className="grid w-full items-center gap-1.5">- <Label htmlFor="name">Name</Label>+ <Label htmlFor="name">Username</Label><Input- id="name"- value={name}- onChange={(e) => setName(e.target.value)}- placeholder="Name"+ id="username"+ value={username}+ onChange={(e) => setUsername(e.target.value)}+ placeholder="Username"/></div><div className="grid w-full items-center gap-1.5">@@ -142,7 +153,7 @@ export function AddUser({ refetch }: { refetch: () => void }) {type="submit"onClick={handleSubmit}disabled={- !password || !confirmPassword || !passwordsMatch || !name+ !password || !confirmPassword || !passwordsMatch || !username}>Creatediff --git a/server/src/api/createAccount.ts b/server/src/api/createAccount.tsnew file mode 100644index 000000000..6cd0c4570--- /dev/null+++ b/server/src/api/createAccount.ts@@ -0,0 +1,70 @@+import { FastifyReply, FastifyRequest } from "fastify";+import { auth } from "../lib/auth.js";++interface CreateAccountRequest {+ Body: {+ email: string;+ username: string;+ name: string;+ password: string;+ isAdmin: boolean;+ };+}++export async function createAccount(+ request: FastifyRequest<CreateAccountRequest>,+ reply: FastifyReply+) {+ try {+ const { email, name, username, password, isAdmin } = request.body;++ // Validate input+ if (!email || !username || !password) {+ return reply.status(400).send({+ error:+ "Missing required fields: email, name, and password are required",+ });+ }++ // Check password strength+ if (password.length < 8) {+ return reply.status(400).send({+ error: "Password must be at least 8 characters long",+ });+ }++ // Create the account using auth.api.signUpEmail+ const result = await auth!.api.signUpEmail({+ body: {+ email,+ name,+ username,+ password,+ role: isAdmin ? "admin" : "user",+ },+ });++ return reply.status(201).send({+ message: "Account created successfully",+ user: {+ id: result.user.id,+ email: result.user.email,+ name: result.user.name,+ },+ });+ } catch (error: any) {+ console.error("Error creating account:", error);++ // Handle specific errors+ if (error.message?.includes("unique constraint")) {+ if (error.message.includes("username")) {+ return reply.status(409).send({ error: "Username already exists" });+ }+ if (error.message.includes("email")) {+ return reply.status(409).send({ error: "Email already exists" });+ }+ }++ return reply.status(500).send({ error: "Failed to create account" });+ }+}diff --git a/server/src/index.ts b/server/src/index.tsindex 31fc62939..447b93aa5 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -22,6 +22,7 @@ import { allowList, loadAllowedDomains } from "./lib/allowedDomains.js";import { auth } from "./lib/auth.js";import { mapHeaders } from "./lib/betterAuth.js";import { trackPageView } from "./tracker/trackPageView.js";+import { createAccount } from "./api/createAccount.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);@@ -125,6 +126,7 @@ server.post("/add-site", addSite);server.post("/delete-site/:id", deleteSite);server.get("/get-sites", getSites);server.get("/list-users", listUsers);+server.post("/create-account", createAccount);// Track pageview endpointserver.post("/track/pageview", trackPageView);