aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/web/components/dashboard/admin/AddUserDialog.tsx213
-rw-r--r--apps/web/components/dashboard/admin/ChangeRoleDialog.tsx154
-rw-r--r--apps/web/components/dashboard/admin/ResetPasswordDialog.tsx145
-rw-r--r--apps/web/components/dashboard/admin/UserList.tsx49
-rw-r--r--apps/workers/inference.ts2
-rw-r--r--packages/shared/types/admin.ts25
-rw-r--r--packages/shared/types/users.ts2
-rw-r--r--packages/trpc/routers/admin.ts64
-rw-r--r--packages/trpc/routers/users.ts109
9 files changed, 711 insertions, 52 deletions
diff --git a/apps/web/components/dashboard/admin/AddUserDialog.tsx b/apps/web/components/dashboard/admin/AddUserDialog.tsx
new file mode 100644
index 00000000..a13c6b88
--- /dev/null
+++ b/apps/web/components/dashboard/admin/AddUserDialog.tsx
@@ -0,0 +1,213 @@
+import { useEffect, useState } from "react";
+import { ActionButton } from "@/components/ui/action-button";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { toast } from "@/components/ui/use-toast";
+import { api } from "@/lib/trpc";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { TRPCClientError } from "@trpc/client";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { zAdminCreateUserSchema } from "@hoarder/shared/types/admin";
+
+type AdminCreateUserSchema = z.infer<typeof zAdminCreateUserSchema>;
+
+export default function AddUserDialog({
+ children,
+}: {
+ children?: React.ReactNode;
+}) {
+ const apiUtils = api.useUtils();
+ const [isOpen, onOpenChange] = useState(false);
+ const form = useForm<AdminCreateUserSchema>({
+ resolver: zodResolver(zAdminCreateUserSchema),
+ defaultValues: {
+ name: "",
+ email: "",
+ password: "",
+ confirmPassword: "",
+ role: "user",
+ },
+ });
+ const { mutate, isPending } = api.admin.createUser.useMutation({
+ onSuccess: () => {
+ toast({
+ description: "User created successfully",
+ });
+ onOpenChange(false);
+ apiUtils.users.list.invalidate();
+ apiUtils.admin.userStats.invalidate();
+ },
+ onError: (error) => {
+ if (error instanceof TRPCClientError) {
+ toast({
+ variant: "destructive",
+ description: error.message,
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ description: "Failed to create user",
+ });
+ }
+ },
+ });
+
+ useEffect(() => {
+ if (!isOpen) {
+ form.reset();
+ }
+ }, [isOpen, form]);
+
+ return (
+ <Dialog open={isOpen} onOpenChange={onOpenChange}>
+ <DialogTrigger asChild>{children}</DialogTrigger>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Add User</DialogTitle>
+ </DialogHeader>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit((val) => mutate(val))}>
+ <div className="flex w-full flex-col space-y-2">
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Name</FormLabel>
+ <FormControl>
+ <Input
+ type="text"
+ placeholder="Name"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Email</FormLabel>
+ <FormControl>
+ <Input
+ type="email"
+ placeholder="Email"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="password"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Password</FormLabel>
+ <FormControl>
+ <Input
+ type="password"
+ placeholder="Password"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="confirmPassword"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Confirm Password</FormLabel>
+ <FormControl>
+ <Input
+ type="password"
+ placeholder="Confirm Password"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="role"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Role</FormLabel>
+ <FormControl>
+ <Select
+ value={field.value}
+ onValueChange={field.onChange}
+ >
+ <SelectTrigger className="w-full">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="user">User</SelectItem>
+ <SelectItem value="admin">Admin</SelectItem>
+ </SelectContent>
+ </Select>
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <DialogFooter className="sm:justify-end">
+ <DialogClose asChild>
+ <Button type="button" variant="secondary">
+ Close
+ </Button>
+ </DialogClose>
+ <ActionButton
+ type="submit"
+ loading={isPending}
+ disabled={isPending}
+ >
+ Create
+ </ActionButton>
+ </DialogFooter>
+ </div>
+ </form>
+ </Form>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx b/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
new file mode 100644
index 00000000..26ad5dce
--- /dev/null
+++ b/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
@@ -0,0 +1,154 @@
+import { useEffect, useState } from "react";
+import { ActionButton } from "@/components/ui/action-button";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { toast } from "@/components/ui/use-toast";
+import { api } from "@/lib/trpc";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { TRPCClientError } from "@trpc/client";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { changeRoleSchema } from "@hoarder/shared/types/admin";
+
+type ChangeRoleSchema = z.infer<typeof changeRoleSchema>;
+
+interface ChangeRoleDialogProps {
+ userId: string;
+ currentRole: "user" | "admin";
+ children?: React.ReactNode;
+}
+
+export default function ChangeRoleDialog({
+ userId,
+ currentRole,
+ children,
+}: ChangeRoleDialogProps) {
+ const apiUtils = api.useUtils();
+ const [isOpen, onOpenChange] = useState(false);
+ const form = useForm<ChangeRoleSchema>({
+ resolver: zodResolver(changeRoleSchema),
+ defaultValues: {
+ userId,
+ role: currentRole,
+ },
+ });
+ const { mutate, isPending } = api.admin.changeRole.useMutation({
+ onSuccess: () => {
+ toast({
+ description: "Role changed successfully",
+ });
+ apiUtils.users.list.invalidate();
+ onOpenChange(false);
+ },
+ onError: (error) => {
+ if (error instanceof TRPCClientError) {
+ toast({
+ variant: "destructive",
+ description: error.message,
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ description: "Failed to change role",
+ });
+ }
+ },
+ });
+
+ useEffect(() => {
+ if (isOpen) {
+ form.reset();
+ }
+ }, [isOpen, form]);
+
+ return (
+ <Dialog open={isOpen} onOpenChange={onOpenChange}>
+ <DialogTrigger asChild>{children}</DialogTrigger>
+ <DialogContent>
+ <DialogTrigger asChild></DialogTrigger>
+ <DialogHeader>
+ <DialogTitle>Change Role</DialogTitle>
+ </DialogHeader>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit((val) => mutate(val))}>
+ <div className="flex w-full flex-col space-y-2">
+ <FormField
+ control={form.control}
+ name="role"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Role</FormLabel>
+ <FormControl>
+ <Select
+ onValueChange={field.onChange}
+ defaultValue={field.value}
+ >
+ <SelectTrigger className="w-full">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="user">User</SelectItem>
+ <SelectItem value="admin">Admin</SelectItem>
+ </SelectContent>
+ </Select>
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="userId"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <input type="hidden" {...field} />
+ </FormControl>
+ </FormItem>
+ )}
+ />
+ <DialogFooter className="sm:justify-end">
+ <DialogClose asChild>
+ <Button type="button" variant="secondary">
+ Close
+ </Button>
+ </DialogClose>
+ <ActionButton
+ type="submit"
+ loading={isPending}
+ disabled={isPending}
+ >
+ Change
+ </ActionButton>
+ </DialogFooter>
+ </div>
+ </form>
+ </Form>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx b/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx
new file mode 100644
index 00000000..32183d1a
--- /dev/null
+++ b/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx
@@ -0,0 +1,145 @@
+import { useEffect, useState } from "react";
+import { ActionButton } from "@/components/ui/action-button";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { toast } from "@/components/ui/use-toast";
+import { api } from "@/lib/trpc"; // Adjust the import path as needed
+import { zodResolver } from "@hookform/resolvers/zod";
+import { TRPCClientError } from "@trpc/client";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { resetPasswordSchema } from "@hoarder/shared/types/admin";
+
+interface ResetPasswordDialogProps {
+ userId: string;
+ children?: React.ReactNode;
+}
+
+type ResetPasswordSchema = z.infer<typeof resetPasswordSchema>;
+
+export default function ResetPasswordDialog({
+ children,
+ userId,
+}: ResetPasswordDialogProps) {
+ const [isOpen, onOpenChange] = useState(false);
+ const form = useForm<ResetPasswordSchema>({
+ resolver: zodResolver(resetPasswordSchema),
+ defaultValues: {
+ userId,
+ newPassword: "",
+ newPasswordConfirm: "",
+ },
+ });
+ const { mutate, isPending } = api.admin.resetPassword.useMutation({
+ onSuccess: () => {
+ toast({
+ description: "Password reset successfully",
+ });
+ onOpenChange(false);
+ },
+ onError: (error) => {
+ if (error instanceof TRPCClientError) {
+ toast({
+ variant: "destructive",
+ description: error.message,
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ description: "Failed to reset password",
+ });
+ }
+ },
+ });
+
+ useEffect(() => {
+ if (isOpen) {
+ form.reset();
+ }
+ }, [isOpen, form]);
+
+ return (
+ <Dialog open={isOpen} onOpenChange={onOpenChange}>
+ <DialogTrigger asChild>{children}</DialogTrigger>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Reset Password</DialogTitle>
+ </DialogHeader>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit((val) => mutate(val))}>
+ <div className="flex w-full flex-col space-y-2">
+ <FormField
+ control={form.control}
+ name="newPassword"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>New Password</FormLabel>
+ <FormControl>
+ <Input
+ type="password"
+ placeholder="New Password"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="newPasswordConfirm"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Confirm New Password</FormLabel>
+ <FormControl>
+ <Input
+ type="password"
+ placeholder="Confirm New Password"
+ {...field}
+ className="w-full rounded border p-2"
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <DialogFooter className="sm:justify-end">
+ <DialogClose asChild>
+ <Button type="button" variant="secondary">
+ Close
+ </Button>
+ </DialogClose>
+ <ActionButton
+ type="submit"
+ loading={isPending}
+ disabled={isPending}
+ >
+ Reset
+ </ActionButton>
+ </DialogFooter>
+ </div>
+ </form>
+ </Form>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/apps/web/components/dashboard/admin/UserList.tsx b/apps/web/components/dashboard/admin/UserList.tsx
index 65bf4068..2937df28 100644
--- a/apps/web/components/dashboard/admin/UserList.tsx
+++ b/apps/web/components/dashboard/admin/UserList.tsx
@@ -1,6 +1,7 @@
"use client";
-import { ActionButton } from "@/components/ui/action-button";
+import { ActionButtonWithTooltip } from "@/components/ui/action-button";
+import { ButtonWithTooltip } from "@/components/ui/button";
import LoadingSpinner from "@/components/ui/spinner";
import {
Table,
@@ -12,9 +13,13 @@ import {
} from "@/components/ui/table";
import { toast } from "@/components/ui/use-toast";
import { api } from "@/lib/trpc";
-import { Trash } from "lucide-react";
+import { Check, KeyRound, Pencil, Trash, UserPlus, X } from "lucide-react";
import { useSession } from "next-auth/react";
+import AddUserDialog from "./AddUserDialog";
+import ChangeRoleDialog from "./ChangeRoleDialog";
+import ResetPasswordDialog from "./ResetPasswordDialog";
+
function toHumanReadableSize(size: number) {
const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
if (size === 0) return "0 Bytes";
@@ -49,7 +54,14 @@ export default function UsersSection() {
return (
<>
- <div className="mb-2 text-xl font-medium">Users List</div>
+ <div className="mb-2 flex items-center justify-between text-xl font-medium">
+ <span>Users List</span>
+ <AddUserDialog>
+ <ButtonWithTooltip tooltip="Create User" variant="outline">
+ <UserPlus size={16} />
+ </ButtonWithTooltip>
+ </AddUserDialog>
+ </div>
<Table>
<TableHeader className="bg-gray-200">
@@ -58,7 +70,8 @@ export default function UsersSection() {
<TableHead>Num Bookmarks</TableHead>
<TableHead>Asset Sizes</TableHead>
<TableHead>Role</TableHead>
- <TableHead>Action</TableHead>
+ <TableHead>Local User</TableHead>
+ <TableHead>Actions</TableHead>
</TableHeader>
<TableBody>
{users.users.map((u) => (
@@ -72,15 +85,37 @@ export default function UsersSection() {
{toHumanReadableSize(userStats[u.id].assetSizes)}
</TableCell>
<TableCell className="py-1 capitalize">{u.role}</TableCell>
- <TableCell className="py-1">
- <ActionButton
+ <TableCell className="py-1 capitalize">
+ {u.localUser ? <Check /> : <X />}
+ </TableCell>
+ <TableCell className="flex gap-1 py-1">
+ <ActionButtonWithTooltip
+ tooltip="Delete user"
variant="outline"
onClick={() => deleteUser({ userId: u.id })}
loading={isDeletionPending}
disabled={session!.user.id == u.id}
>
<Trash size={16} color="red" />
- </ActionButton>
+ </ActionButtonWithTooltip>
+ <ResetPasswordDialog userId={u.id}>
+ <ButtonWithTooltip
+ tooltip="Reset password"
+ variant="outline"
+ disabled={session!.user.id == u.id || !u.localUser}
+ >
+ <KeyRound size={16} color="red" />
+ </ButtonWithTooltip>
+ </ResetPasswordDialog>
+ <ChangeRoleDialog userId={u.id} currentRole={u.role!}>
+ <ButtonWithTooltip
+ tooltip="Change role"
+ variant="outline"
+ disabled={session!.user.id == u.id}
+ >
+ <Pencil size={16} color="red" />
+ </ButtonWithTooltip>
+ </ChangeRoleDialog>
</TableCell>
</TableRow>
))}
diff --git a/apps/workers/inference.ts b/apps/workers/inference.ts
index 41ceffd6..fed9478f 100644
--- a/apps/workers/inference.ts
+++ b/apps/workers/inference.ts
@@ -43,7 +43,7 @@ class OpenAIInferenceClient implements InferenceClient {
async inferFromText(prompt: string): Promise<InferenceResponse> {
const chatCompletion = await this.openAI.chat.completions.create({
- messages: [{ role: "system", content: prompt }],
+ messages: [{ role: "user", content: prompt }],
model: serverConfig.inference.textModel,
response_format: { type: "json_object" },
});
diff --git a/packages/shared/types/admin.ts b/packages/shared/types/admin.ts
new file mode 100644
index 00000000..8b16dfd0
--- /dev/null
+++ b/packages/shared/types/admin.ts
@@ -0,0 +1,25 @@
+import { z } from "zod";
+
+import { PASSWORD_MAX_LENGTH, zSignUpSchema } from "./users";
+
+export const zRoleSchema = z.object({
+ role: z.enum(["user", "admin"]),
+});
+
+export const zAdminCreateUserSchema = zSignUpSchema.and(zRoleSchema);
+
+export const changeRoleSchema = z.object({
+ userId: z.string(),
+ role: z.enum(["user", "admin"]),
+});
+
+export const resetPasswordSchema = z
+ .object({
+ userId: z.string(),
+ newPassword: z.string().min(8).max(PASSWORD_MAX_LENGTH),
+ newPasswordConfirm: z.string(),
+ })
+ .refine((data) => data.newPassword === data.newPasswordConfirm, {
+ message: "Passwords don't match",
+ path: ["newPasswordConfirm"],
+ });
diff --git a/packages/shared/types/users.ts b/packages/shared/types/users.ts
index 3026337a..7d97a6d9 100644
--- a/packages/shared/types/users.ts
+++ b/packages/shared/types/users.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-const PASSWORD_MAX_LENGTH = 100;
+export const PASSWORD_MAX_LENGTH = 100;
export const zSignUpSchema = z
.object({
diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts
index d8ffe9d3..38aa0031 100644
--- a/packages/trpc/routers/admin.ts
+++ b/packages/trpc/routers/admin.ts
@@ -1,3 +1,4 @@
+import { TRPCError } from "@trpc/server";
import { count, eq, sum } from "drizzle-orm";
import { z } from "zod";
@@ -9,8 +10,15 @@ import {
TidyAssetsQueue,
triggerSearchReindex,
} from "@hoarder/shared/queues";
+import {
+ changeRoleSchema,
+ resetPasswordSchema,
+ zAdminCreateUserSchema,
+} from "@hoarder/shared/types/admin";
+import { hashPassword } from "../auth";
import { adminProcedure, router } from "../index";
+import { createUser } from "./users";
export const adminAppRouter = router({
stats: adminProcedure
@@ -213,4 +221,60 @@ export const adminAppRouter = router({
return results;
}),
+ createUser: adminProcedure
+ .input(zAdminCreateUserSchema)
+ .output(
+ z.object({
+ id: z.string(),
+ name: z.string(),
+ email: z.string(),
+ role: z.enum(["user", "admin"]).nullable(),
+ }),
+ )
+ .mutation(async ({ input, ctx }) => {
+ return createUser(input, ctx, input.role);
+ }),
+ changeRole: adminProcedure
+ .input(changeRoleSchema)
+ .mutation(async ({ input, ctx }) => {
+ if (ctx.user.id == input.userId) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "Cannot change own role",
+ });
+ }
+ const result = await ctx.db
+ .update(users)
+ .set({ role: input.role })
+ .where(eq(users.id, input.userId));
+
+ if (!result.changes) {
+ throw new TRPCError({
+ code: "NOT_FOUND",
+ message: "User not found",
+ });
+ }
+ }),
+ resetPassword: adminProcedure
+ .input(resetPasswordSchema)
+ .mutation(async ({ input, ctx }) => {
+ if (ctx.user.id == input.userId) {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "Cannot reset own password",
+ });
+ }
+ const hashedPassword = await hashPassword(input.newPassword);
+ const result = await ctx.db
+ .update(users)
+ .set({ password: hashedPassword })
+ .where(eq(users.id, input.userId));
+
+ if (result.changes == 0) {
+ throw new TRPCError({
+ code: "NOT_FOUND",
+ message: "User not found",
+ });
+ }
+ }),
});
diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts
index 87d0fa2d..ca46d9f7 100644
--- a/packages/trpc/routers/users.ts
+++ b/packages/trpc/routers/users.ts
@@ -13,10 +13,58 @@ import { hashPassword, validatePassword } from "../auth";
import {
adminProcedure,
authedProcedure,
+ Context,
publicProcedure,
router,
} from "../index";
+export async function createUser(
+ input: z.infer<typeof zSignUpSchema>,
+ ctx: Context,
+ role?: "user" | "admin",
+) {
+ return ctx.db.transaction(async (trx) => {
+ let userRole = role;
+ if (!userRole) {
+ const [{ count: userCount }] = await trx
+ .select({ count: count() })
+ .from(users);
+ userRole = userCount == 0 ? "admin" : "user";
+ }
+
+ try {
+ const result = await trx
+ .insert(users)
+ .values({
+ name: input.name,
+ email: input.email,
+ password: await hashPassword(input.password),
+ role: userRole,
+ })
+ .returning({
+ id: users.id,
+ name: users.name,
+ email: users.email,
+ role: users.role,
+ });
+ return result[0];
+ } catch (e) {
+ if (e instanceof SqliteError) {
+ if (e.code == "SQLITE_CONSTRAINT_UNIQUE") {
+ throw new TRPCError({
+ code: "BAD_REQUEST",
+ message: "Email is already taken",
+ });
+ }
+ }
+ throw new TRPCError({
+ code: "INTERNAL_SERVER_ERROR",
+ message: "Something went wrong",
+ });
+ }
+ });
+}
+
export const usersAppRouter = router({
create: publicProcedure
.input(zSignUpSchema)
@@ -41,40 +89,7 @@ export const usersAppRouter = router({
message: errorMessage,
});
}
- // TODO: This is racy, but that's probably fine.
- const [{ count: userCount }] = await ctx.db
- .select({ count: count() })
- .from(users);
- try {
- const result = await ctx.db
- .insert(users)
- .values({
- name: input.name,
- email: input.email,
- password: await hashPassword(input.password),
- role: userCount == 0 ? "admin" : "user",
- })
- .returning({
- id: users.id,
- name: users.name,
- email: users.email,
- role: users.role,
- });
- return result[0];
- } catch (e) {
- if (e instanceof SqliteError) {
- if (e.code == "SQLITE_CONSTRAINT_UNIQUE") {
- throw new TRPCError({
- code: "BAD_REQUEST",
- message: "Email is already taken",
- });
- }
- }
- throw new TRPCError({
- code: "INTERNAL_SERVER_ERROR",
- message: "Something went wrong",
- });
- }
+ return createUser(input, ctx);
}),
list: adminProcedure
.output(
@@ -85,20 +100,28 @@ export const usersAppRouter = router({
name: z.string(),
email: z.string(),
role: z.enum(["user", "admin"]).nullable(),
+ localUser: z.boolean(),
}),
),
}),
)
.query(async ({ ctx }) => {
- const users = await ctx.db.query.users.findMany({
- columns: {
- id: true,
- name: true,
- email: true,
- role: true,
- },
- });
- return { users };
+ const dbUsers = await ctx.db
+ .select({
+ id: users.id,
+ name: users.name,
+ email: users.email,
+ role: users.role,
+ password: users.password,
+ })
+ .from(users);
+
+ return {
+ users: dbUsers.map(({ password, ...user }) => ({
+ ...user,
+ localUser: password !== null,
+ })),
+ };
}),
changePassword: authedProcedure
.input(
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-30 07:55:54 +0000