⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
delete user functionality
daniel31x1308c2ff278fec
diff --git a/components/ModalContent/DeleteUserModal.tsx b/components/ModalContent/DeleteUserModal.tsxnew file mode 100644index 00000000..97c1cffb--- /dev/null+++ b/components/ModalContent/DeleteUserModal.tsx@@ -0,0 +1,51 @@+import toast from "react-hot-toast";+import Modal from "../Modal";+import useUserStore from "@/store/admin/users";++type Props = {+ onClose: Function;+ userId: number;+};++export default function DeleteUserModal({ onClose, userId }: Props) {+ const { removeUser } = useUserStore();++ const deleteUser = async () => {+ const load = toast.loading("Deleting...");++ const response = await removeUser(userId);++ toast.dismiss(load);++ response.ok && toast.success(`User Deleted.`);++ onClose();+ };++ return (+ <Modal toggleModal={onClose}>+ <p className="text-xl font-thin text-red-500">Delete User</p>++ <div className="divider mb-3 mt-1"></div>++ <div className="flex flex-col gap-3">+ <p>Are you sure you want to remove this user?</p>++ <div role="alert" className="alert alert-warning">+ <i className="bi-exclamation-triangle text-xl" />+ <span>+ <b>Warning:</b> This action is irreversible!+ </span>+ </div>++ <button+ className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer`}+ onClick={deleteUser}+ >+ <i className="bi-trash text-xl" />+ Delete, I know what I'm doing+ </button>+ </div>+ </Modal>+ );+}diff --git a/lib/api/controllers/users/userId/deleteUserById.ts b/lib/api/controllers/users/userId/deleteUserById.tsindex 976bd715..7e333445 100644--- a/lib/api/controllers/users/userId/deleteUserById.ts+++ b/lib/api/controllers/users/userId/deleteUserById.ts@@ -10,7 +10,8 @@ const authentikEnabled = process.env.AUTHENTIK_CLIENT_SECRET;export default async function deleteUserById(userId: number,- body: DeleteUserBody+ body: DeleteUserBody,+ isServerAdmin: boolean) {// First, we retrieve the user from the databaseconst user = await prisma.user.findUnique({@@ -25,13 +26,13 @@ export default async function deleteUserById(}// Then, we check if the provided password matches the one stored in the database (disabled in Keycloak integration)- if (!keycloakEnabled && !authentikEnabled) {+ if (!keycloakEnabled && !authentikEnabled && !isServerAdmin) {const isPasswordValid = bcrypt.compareSync(body.password,user.password as string);- if (!isPasswordValid) {+ if (!isPasswordValid && !isServerAdmin) {return {response: "Invalid credentials.",status: 401, // Unauthorized@@ -43,6 +44,11 @@ export default async function deleteUserById(await prisma.$transaction(async (prisma) => {+ // Delete Access Tokens+ await prisma.accessToken.deleteMany({+ where: { userId },+ });+// Delete whitelisted usersawait prisma.whitelistedUser.deleteMany({where: { userId },diff --git a/pages/admin.tsx b/pages/admin.tsxindex be634f82..3d5a0a31 100644--- a/pages/admin.tsx+++ b/pages/admin.tsx@@ -1,6 +1,8 @@+import DeleteUserModal from "@/components/ModalContent/DeleteUserModal";+import useUserStore from "@/store/admin/users";import { User as U } from "@prisma/client";import Link from "next/link";-import { useEffect, useState } from "react";+import { Fragment, useEffect, useState } from "react";interface User extends U {subscriptions: {@@ -8,12 +10,22 @@ interface User extends U {};}+type UserModal = {+ isOpen: boolean;+ userId: number | null;+};+export default function Admin() {- const [users, setUsers] = useState<User[]>();+ const { users, setUsers } = useUserStore();const [searchQuery, setSearchQuery] = useState("");const [filteredUsers, setFilteredUsers] = useState<User[]>();+ const [deleteUserModal, setDeleteUserModal] = useState<UserModal>({+ isOpen: false,+ userId: null,+ });+useEffect(() => {// fetch usersfetch("/api/v1/users")@@ -31,7 +43,7 @@ export default function Admin() {><i className="bi-chevron-left text-xl"></i></Link>- <p className="capitalize sm:text-3xl text-2xl font-thin inline">+ <p className="capitalize text-3xl font-thin inline">User Administration</p></div>@@ -76,11 +88,11 @@ export default function Admin() {<div className="divider my-3"></div>{filteredUsers && filteredUsers.length > 0 && searchQuery !== "" ? (- UserLising(filteredUsers)+ UserListing(filteredUsers, deleteUserModal, setDeleteUserModal)) : searchQuery !== "" ? (<p>No users found with the given search query.</p>) : users && users.length > 0 ? (- UserLising(users)+ UserListing(users, deleteUserModal, setDeleteUserModal)) : (<p>No users found.</p>)}@@ -88,7 +100,11 @@ export default function Admin() {);}-const UserLising = (users: User[]) => {+const UserListing = (+ users: User[],+ deleteUserModal: UserModal,+ setDeleteUserModal: Function+) => {return (<div className="overflow-x-auto whitespace-nowrap w-full"><table className="table table-zebra w-full">@@ -106,7 +122,7 @@ const UserLising = (users: User[]) => {</thead><tbody>{users.map((user, index) => (- <tr key={user.id}>+ <tr key={index}><td className="rounded-tl">{index + 1}</td><td>{user.username}</td>{process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" && (@@ -117,7 +133,12 @@ const UserLising = (users: User[]) => {)}<td>{new Date(user.createdAt).toLocaleString()}</td><td>- <button className="btn btn-sm btn-ghost">+ <button+ className="btn btn-sm btn-ghost"+ onClick={() =>+ setDeleteUserModal({ isOpen: true, userId: user.id })+ }+ ><i className="bi bi-trash"></i></button></td>@@ -125,6 +146,13 @@ const UserLising = (users: User[]) => {))}</tbody></table>++ {deleteUserModal.isOpen && deleteUserModal.userId ? (+ <DeleteUserModal+ onClose={() => setDeleteUserModal({ isOpen: false, userId: null })}+ userId={deleteUserModal.userId}+ />+ ) : null}</div>);};diff --git a/pages/api/v1/users/[id].ts b/pages/api/v1/users/[id].tsindex cf75e162..128b4262 100644--- a/pages/api/v1/users/[id].ts+++ b/pages/api/v1/users/[id].ts@@ -16,9 +16,17 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {return null;}- const userId = token?.id;+ const user = await prisma.user.findUnique({+ where: {+ id: token?.id,+ },+ });- if (userId !== Number(req.query.id))+ const isServerAdmin = process.env.ADMINISTRATOR === user?.username;++ const userId = isServerAdmin ? Number(req.query.id) : token.id;++ if (userId !== Number(req.query.id) && !isServerAdmin)return res.status(401).json({ response: "Permission denied." });if (req.method === "GET") {@@ -53,7 +61,7 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {const updated = await updateUserById(userId, req.body);return res.status(updated.status).json({ response: updated.response });} else if (req.method === "DELETE") {- const updated = await deleteUserById(userId, req.body);+ const updated = await deleteUserById(userId, req.body, isServerAdmin);return res.status(updated.status).json({ response: updated.response });}}diff --git a/store/admin/users.ts b/store/admin/users.tsnew file mode 100644index 00000000..c5cb5af1--- /dev/null+++ b/store/admin/users.ts@@ -0,0 +1,61 @@+import { User as U } from "@prisma/client";+import { create } from "zustand";++interface User extends U {+ subscriptions: {+ active: boolean;+ };+}++type ResponseObject = {+ ok: boolean;+ data: object | string;+};++type UserStore = {+ users: User[];+ setUsers: (users: User[]) => void;+ addUser: () => Promise<ResponseObject>;+ removeUser: (userId: number) => Promise<ResponseObject>;+};++const useUserStore = create<UserStore>((set) => ({+ users: [],+ setUsers: async () => {+ const response = await fetch("/api/v1/users");++ const data = await response.json();++ if (response.ok) set({ users: data.response });+ },+ addUser: async () => {+ const response = await fetch("/api/v1/users", {+ method: "POST",+ });++ const data = await response.json();++ if (response.ok)+ set((state) => ({+ users: [...state.users, data.response],+ }));++ return { ok: response.ok, data: data.response };+ },+ removeUser: async (userId) => {+ const response = await fetch(`/api/v1/users/${userId}`, {+ method: "DELETE",+ });++ const data = await response.json();++ if (response.ok)+ set((state) => ({+ users: state.users.filter((user) => user.id !== userId),+ }));++ return { ok: response.ok, data: data.response };+ },+}));++export default useUserStore;