From fde3e56c1cce9dfa243f91f1cb0f81db03e0a0eb Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Sun, 13 Sep 2026 22:54:14 +0530
Subject: [PATCH 1/4] feat(admin): implement user management and moderation
 dashboard

Signed-off-by: Arnab Nandy <arnab_nandy7@yahoo.com>
---
 db/migrations/0014_user_moderation.sql        |   7 +
 doc/setup.md                                  |   3 +
 scripts/migrate-admin.mjs                     | 110 ++++
 src/app/admin/page.tsx                        |  54 ++
 src/app/api/cron/weekly-digest/route.ts       |  11 +-
 src/components/auth-controls.tsx              |  19 +-
 src/components/ui/dialog.tsx                  | 141 +++++
 .../admin/components/admin-dashboard.tsx      | 105 ++++
 .../admin/components/block-user-dialog.tsx    | 196 +++++++
 .../components/user-management-table.tsx      | 544 ++++++++++++++++++
 src/features/admin/lib/admin-users-client.ts  | 111 ++++
 src/features/admin/server/admin-guard.ts      |  38 ++
 src/lib/auth-client.ts                        |   5 +-
 src/lib/auth-schema.ts                        |   5 +
 src/lib/auth.ts                               |   6 +-
 tests/components/auth-controls.test.tsx       |  20 +
 .../features/admin/admin-users-client.test.ts | 169 ++++++
 .../components/block-user-dialog.test.tsx     | 144 +++++
 .../components/user-management-table.test.tsx | 132 +++++
 .../features/admin/server/admin-guard.test.ts |  84 +++
 .../features/organizations/dashboard.test.tsx |   3 +-
 21 files changed, 1898 insertions(+), 9 deletions(-)
 create mode 100644 db/migrations/0014_user_moderation.sql
 create mode 100644 scripts/migrate-admin.mjs
 create mode 100644 src/app/admin/page.tsx
 create mode 100644 src/components/ui/dialog.tsx
 create mode 100644 src/features/admin/components/admin-dashboard.tsx
 create mode 100644 src/features/admin/components/block-user-dialog.tsx
 create mode 100644 src/features/admin/components/user-management-table.tsx
 create mode 100644 src/features/admin/lib/admin-users-client.ts
 create mode 100644 src/features/admin/server/admin-guard.ts
 create mode 100644 tests/features/admin/admin-users-client.test.ts
 create mode 100644 tests/features/admin/components/block-user-dialog.test.tsx
 create mode 100644 tests/features/admin/components/user-management-table.test.tsx
 create mode 100644 tests/features/admin/server/admin-guard.test.ts

diff --git a/db/migrations/0014_user_moderation.sql b/db/migrations/0014_user_moderation.sql
new file mode 100644
index 0000000..39d7342
--- /dev/null
+++ b/db/migrations/0014_user_moderation.sql
@@ -0,0 +1,7 @@
+ALTER TABLE "user" ADD COLUMN "role" TEXT DEFAULT 'user' NOT NULL;
+ALTER TABLE "user" ADD COLUMN "banned" INTEGER DEFAULT 0 NOT NULL;
+ALTER TABLE "user" ADD COLUMN "ban_reason" TEXT;
+ALTER TABLE "user" ADD COLUMN "ban_expires" INTEGER;
+ALTER TABLE "session" ADD COLUMN "impersonated_by" TEXT;
+
+UPDATE "user" SET "role" = 'admin' WHERE "id" IN (SELECT "user_id" FROM "admin");
diff --git a/doc/setup.md b/doc/setup.md
index 740a6a3..b2dd9d0 100644
--- a/doc/setup.md
+++ b/doc/setup.md
@@ -53,6 +53,7 @@ Run the SQL migrations in filename order against the Turso database:
 11. `db/migrations/0011_issue_feedback.sql`
 12. `db/migrations/0012_opportunity_workflow.sql`
 13. `db/migrations/0013_contribution_readiness.sql`
+14. `db/migrations/0014_user_moderation.sql`
 
 The first migration creates Better Auth's user, session, account, and verification tables. The second creates user-owned saved searches. Migration files intentionally contain structure only—never credentials or production data.
 
@@ -81,6 +82,8 @@ by a user. The twelfth adds private state, note, follow-up date, and workflow
 activity fields to saved opportunities; existing opportunities begin in Saved.
 The thirteenth adds the contribution-readiness preference to cloud saved searches;
 existing records continue to include every readiness status.
+The fourteenth adds role, moderation, and impersonation fields to users and sessions
+for the Better Auth admin plugin, and promotes existing administrator records.
 
 ## GitHub OAuth
 
diff --git a/scripts/migrate-admin.mjs b/scripts/migrate-admin.mjs
new file mode 100644
index 0000000..7621029
--- /dev/null
+++ b/scripts/migrate-admin.mjs
@@ -0,0 +1,110 @@
+import { createClient } from "@libsql/client";
+import * as fs from "fs";
+
+function parseEnv(filePath) {
+  if (!fs.existsSync(filePath)) return {};
+  const content = fs.readFileSync(filePath, "utf-8");
+  const env = {};
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx !== -1) {
+      const key = trimmed.slice(0, eqIdx).trim();
+      let val = trimmed.slice(eqIdx + 1).trim();
+      if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+        val = val.slice(1, -1);
+      }
+      env[key] = val;
+    }
+  }
+  return env;
+}
+
+const STATEMENTS = [
+  `ALTER TABLE "user" ADD COLUMN "role" TEXT DEFAULT 'user' NOT NULL;`,
+  `ALTER TABLE "user" ADD COLUMN "banned" INTEGER DEFAULT 0 NOT NULL;`,
+  `ALTER TABLE "user" ADD COLUMN "ban_reason" TEXT;`,
+  `ALTER TABLE "user" ADD COLUMN "ban_expires" INTEGER;`,
+  `ALTER TABLE "session" ADD COLUMN "impersonated_by" TEXT;`,
+  `UPDATE "user" SET "role" = 'admin' WHERE "id" IN (SELECT "user_id" FROM "admin");`,
+];
+
+async function applyMigration(name, envFile) {
+  console.log(`\n========================================`);
+  console.log(`Applying migration 0014 to: ${name} (${envFile})`);
+  console.log(`========================================`);
+
+  const env = parseEnv(envFile);
+  const url = env.TURSO_DATABASE_URL;
+  const authToken = env.TURSO_AUTH_TOKEN;
+
+  if (!url || !authToken) {
+    console.error(`[SKIP] Missing credentials in ${envFile}`);
+    return false;
+  }
+
+  const client = createClient({ url, authToken });
+
+  try {
+    const existingCols = await client.execute("PRAGMA table_info(user)");
+    const colNames = new Set(existingCols.rows.map((r) => r.name));
+
+    for (const stmt of STATEMENTS) {
+      const trimmed = stmt.trim();
+      if (!trimmed) continue;
+
+      // Skip ALTER TABLE ADD COLUMN if the column already exists
+      if (trimmed.startsWith('ALTER TABLE "user" ADD COLUMN "role"') && colNames.has("role")) {
+        console.log(`- Column "role" already exists on "user", skipping.`);
+        continue;
+      }
+      if (trimmed.startsWith('ALTER TABLE "user" ADD COLUMN "banned"') && colNames.has("banned")) {
+        console.log(`- Column "banned" already exists on "user", skipping.`);
+        continue;
+      }
+      if (trimmed.startsWith('ALTER TABLE "user" ADD COLUMN "ban_reason"') && colNames.has("ban_reason")) {
+        console.log(`- Column "ban_reason" already exists on "user", skipping.`);
+        continue;
+      }
+      if (trimmed.startsWith('ALTER TABLE "user" ADD COLUMN "ban_expires"') && colNames.has("ban_expires")) {
+        console.log(`- Column "ban_expires" already exists on "user", skipping.`);
+        continue;
+      }
+
+      console.log(`Executing: ${trimmed.slice(0, 60)}...`);
+      await client.execute(trimmed);
+      console.log(`  -> Success`);
+    }
+
+    // Verify
+    const updatedUserCols = await client.execute("PRAGMA table_info(user)");
+    console.log(`Updated user columns:`, updatedUserCols.rows.map((r) => r.name).join(", "));
+
+    const updatedSessionCols = await client.execute("PRAGMA table_info(session)");
+    console.log(`Updated session columns:`, updatedSessionCols.rows.map((r) => r.name).join(", "));
+
+    const adminUsers = await client.execute("SELECT id, name, email, role, banned FROM user WHERE role = 'admin'");
+    console.log(`Admin users verified:`, JSON.stringify(adminUsers.rows, null, 2));
+
+    return true;
+  } catch (err) {
+    console.error(`[ERROR] Failed migrating ${name}:`, err);
+    return false;
+  }
+}
+
+async function main() {
+  const previewSuccess = await applyMigration("Preview Database", ".env.preview.local");
+  const prodSuccess = await applyMigration("Production/Local Database", ".env.local");
+
+  if (previewSuccess && prodSuccess) {
+    console.log("\n[SUCCESS] Migration 0014 applied successfully to both Preview and Production databases.");
+    process.exit(0);
+  } else {
+    console.error("\n[FAILURE] One or more migrations failed.");
+    process.exit(1);
+  }
+}
+
+main();
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
new file mode 100644
index 0000000..89b31d0
--- /dev/null
+++ b/src/app/admin/page.tsx
@@ -0,0 +1,54 @@
+import { Suspense } from "react";
+import type { Metadata } from "next";
+import { headers } from "next/headers";
+import { redirect } from "next/navigation";
+import { AuthControls } from "@/components/auth-controls";
+import { DashboardNavigation } from "@/components/dashboard-navigation";
+import { ThemeToggle } from "@/components/theme-toggle";
+import { AdminDashboard } from "@/features/admin/components/admin-dashboard";
+import { getAdminSession } from "@/features/admin/server/admin-guard";
+
+export const metadata: Metadata = {
+  title: "Admin Console | OpenIssue.dev",
+  description: "User management and administrative controls for OpenIssue.dev.",
+};
+
+export default async function AdminPage() {
+  const reqHeaders = await headers();
+  const { session, isAdmin } = await getAdminSession(reqHeaders);
+
+  if (!session || !isAdmin) {
+    redirect("/");
+  }
+
+  return (
+    <div className="flex min-h-full flex-col bg-background text-foreground">
+      <header className="border-b bg-background/95 backdrop-blur-xs sticky top-0 z-40">
+        <div className="mx-auto flex max-w-7xl items-center justify-between px-4 py-3 sm:px-6">
+          <div className="flex items-center gap-3">
+            <DashboardNavigation current="issues" />
+          </div>
+          <div className="flex items-center gap-2">
+            <AuthControls />
+            <ThemeToggle />
+          </div>
+        </div>
+      </header>
+
+      <main className="mx-auto flex-1 w-full max-w-7xl px-4 py-8 sm:px-6">
+        <Suspense
+          fallback={
+            <output className="text-muted-foreground text-sm">
+              Loading admin dashboard…
+            </output>
+          }
+        >
+          <AdminDashboard
+            currentUserId={session.user.id}
+            currentUserEmail={session.user.email}
+          />
+        </Suspense>
+      </main>
+    </div>
+  );
+}
diff --git a/src/app/api/cron/weekly-digest/route.ts b/src/app/api/cron/weekly-digest/route.ts
index 3736e1e..f1745b1 100644
--- a/src/app/api/cron/weekly-digest/route.ts
+++ b/src/app/api/cron/weekly-digest/route.ts
@@ -1,4 +1,4 @@
-import { eq, or } from "drizzle-orm";
+import { and, eq, or } from "drizzle-orm";
 import {
   deliverWeeklyDigest,
   getDigestContext,
@@ -35,9 +35,12 @@ export async function GET(request: Request) {
       eq(repositoryDigestTemplate.userId, user.id),
     )
     .where(
-      or(
-        eq(user.weeklyDigestEnabled, true),
-        eq(repositoryDigestTemplate.enabled, true),
+      and(
+        eq(user.banned, false),
+        or(
+          eq(user.weeklyDigestEnabled, true),
+          eq(repositoryDigestTemplate.enabled, true),
+        ),
       ),
     );
   let sent = 0;
diff --git a/src/components/auth-controls.tsx b/src/components/auth-controls.tsx
index dd4d4a3..8601264 100644
--- a/src/components/auth-controls.tsx
+++ b/src/components/auth-controls.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import Image from "next/image";
-import { LogOut } from "lucide-react";
+import Link from "next/link";
+import { LogOut, Shield } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { authClient } from "@/lib/auth-client";
 
@@ -33,8 +34,24 @@ export function AuthControls() {
     );
   }
 
+  const isAdmin = (session.user as { role?: string }).role === "admin";
+
   return (
     <div className="flex items-center gap-2">
+      {isAdmin ? (
+        <Link href="/admin" passHref>
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-8 gap-1.5 text-xs font-medium border-primary/30 text-primary hover:bg-primary/10"
+            title="Admin Console"
+            aria-label="Admin Console"
+          >
+            <Shield className="size-3.5" />
+            <span className="hidden sm:inline">Admin</span>
+          </Button>
+        </Link>
+      ) : null}
       {session.user.image ? (
         <Image
           src={session.user.image}
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
new file mode 100644
index 0000000..da097c7
--- /dev/null
+++ b/src/components/ui/dialog.tsx
@@ -0,0 +1,141 @@
+"use client"
+
+import * as React from "react"
+import { Dialog as DialogPrimitive } from "radix-ui"
+import { XIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+function Dialog({
+  ...props
+}: Readonly<React.ComponentProps<typeof DialogPrimitive.Root>>) {
+  return <DialogPrimitive.Root data-slot="dialog" {...props} />
+}
+
+function DialogTrigger({
+  ...props
+}: Readonly<React.ComponentProps<typeof DialogPrimitive.Trigger>>) {
+  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />
+}
+
+function DialogPortal({
+  ...props
+}: Readonly<React.ComponentProps<typeof DialogPrimitive.Portal>>) {
+  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />
+}
+
+function DialogClose({
+  ...props
+}: Readonly<React.ComponentProps<typeof DialogPrimitive.Close>>) {
+  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />
+}
+
+function DialogOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
+      data-slot="dialog-overlay"
+      className={cn(
+        "fixed inset-0 z-50 bg-black/50 backdrop-blur-xs transition-opacity duration-200",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DialogContent({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Content>) {
+  return (
+    <DialogPortal>
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        data-slot="dialog-content"
+        className={cn(
+          "fixed left-[50%] top-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-xl border bg-background p-6 shadow-lg duration-200 sm:max-w-lg",
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <DialogPrimitive.Close className="absolute right-4 top-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:outline-hidden disabled:pointer-events-none">
+          <XIcon className="size-4" />
+          <span className="sr-only">Close</span>
+        </DialogPrimitive.Close>
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  )
+}
+
+function DialogHeader({
+  className,
+  ...props
+}: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-header"
+      className={cn("flex flex-col gap-1.5 text-center sm:text-left", className)}
+      {...props}
+    />
+  )
+}
+
+function DialogFooter({
+  className,
+  ...props
+}: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-footer"
+      className={cn(
+        "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn("text-lg font-semibold leading-none tracking-tight", className)}
+      {...props}
+    />
+  )
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn("text-sm text-muted-foreground", className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+}
diff --git a/src/features/admin/components/admin-dashboard.tsx b/src/features/admin/components/admin-dashboard.tsx
new file mode 100644
index 0000000..0bd3be0
--- /dev/null
+++ b/src/features/admin/components/admin-dashboard.tsx
@@ -0,0 +1,105 @@
+"use client";
+
+import { useState } from "react";
+import Link from "next/link";
+import {
+  ArrowLeft,
+  Mail,
+  Shield,
+  Users,
+} from "lucide-react";
+import { Button } from "@/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
+import { UserManagementTable } from "@/features/admin/components/user-management-table";
+import { AdminEmailCard } from "@/features/issues/components/admin-email-card";
+
+interface AdminDashboardProps {
+  currentUserId: string;
+  currentUserEmail: string;
+}
+
+export function AdminDashboard({
+  currentUserId,
+  currentUserEmail,
+}: Readonly<AdminDashboardProps>) {
+  const [activeTab, setActiveTab] = useState<"users" | "email">("users");
+
+  return (
+    <div className="flex flex-col gap-6">
+      {/* Top Header */}
+      <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/" passHref>
+            <Button variant="ghost" size="icon" aria-label="Back to dashboard">
+              <ArrowLeft className="size-4" />
+            </Button>
+          </Link>
+          <div>
+            <div className="flex items-center gap-2">
+              <Shield className="size-5 text-primary" />
+              <h1 className="font-heading text-xl font-semibold tracking-tight sm:text-2xl">
+                Admin Console
+              </h1>
+            </div>
+            <p className="text-sm text-muted-foreground">
+              Manage users, account access, security moderation, and delivery tools
+            </p>
+          </div>
+        </div>
+
+        {/* Tab switcher */}
+        <div className="flex items-center rounded-lg border bg-muted/40 p-1 text-sm self-start sm:self-auto">
+          <button
+            type="button"
+            onClick={() => setActiveTab("users")}
+            className={`flex items-center gap-2 rounded-md px-3 py-1.5 font-medium transition-colors ${
+              activeTab === "users"
+                ? "bg-background text-foreground shadow-xs"
+                : "text-muted-foreground hover:text-foreground"
+            }`}
+          >
+            <Users className="size-4" />
+            User Management
+          </button>
+          <button
+            type="button"
+            onClick={() => setActiveTab("email")}
+            className={`flex items-center gap-2 rounded-md px-3 py-1.5 font-medium transition-colors ${
+              activeTab === "email"
+                ? "bg-background text-foreground shadow-xs"
+                : "text-muted-foreground hover:text-foreground"
+            }`}
+          >
+            <Mail className="size-4" />
+            Email Delivery Tools
+          </button>
+        </div>
+      </div>
+
+      {/* Main Tab Content */}
+      {activeTab === "users" ? (
+        <Card>
+          <CardHeader>
+            <CardTitle>User Directory & Moderation</CardTitle>
+            <CardDescription>
+              View registered users, promote administrator roles, block or unblock accounts, and revoke active sessions.
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <UserManagementTable currentUserId={currentUserId} />
+          </CardContent>
+        </Card>
+      ) : (
+        <div className="max-w-xl">
+          <AdminEmailCard defaultEmail={currentUserEmail} />
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/features/admin/components/block-user-dialog.tsx b/src/features/admin/components/block-user-dialog.tsx
new file mode 100644
index 0000000..406569d
--- /dev/null
+++ b/src/features/admin/components/block-user-dialog.tsx
@@ -0,0 +1,196 @@
+"use client";
+
+import { useState } from "react";
+import { AlertTriangle, Ban, CheckCircle2, Loader2 } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import {
+  banUser,
+  unbanUser,
+  type AdminUser,
+} from "@/features/admin/lib/admin-users-client";
+
+interface BlockUserDialogProps {
+  user: AdminUser | null;
+  mode: "block" | "unblock";
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSuccess: (updatedUser: AdminUser) => void;
+}
+
+const BAN_DURATIONS = [
+  { label: "Permanent", seconds: 0 },
+  { label: "24 Hours", seconds: 86400 },
+  { label: "7 Days", seconds: 604800 },
+  { label: "30 Days", seconds: 2592000 },
+];
+
+export function BlockUserDialog({
+  user,
+  mode,
+  open,
+  onOpenChange,
+  onSuccess,
+}: Readonly<BlockUserDialogProps>) {
+  const [reason, setReason] = useState("");
+  const [duration, setDuration] = useState("0");
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  if (!user) return null;
+
+  const isBlock = mode === "block";
+
+  async function handleConfirm() {
+    if (!user) return;
+    setIsSubmitting(true);
+    setError(null);
+
+    try {
+      if (isBlock) {
+        const expiresInSec = Number(duration);
+        await banUser({
+          userId: user.id,
+          banReason: reason.trim() || undefined,
+          banExpiresIn: expiresInSec > 0 ? expiresInSec : undefined,
+        });
+
+        onSuccess({
+          ...user,
+          banned: true,
+          banReason: reason.trim() || null,
+          banExpires:
+            expiresInSec > 0
+              ? new Date(Date.now() + expiresInSec * 1000)
+              : null,
+        });
+      } else {
+        await unbanUser(user.id);
+        onSuccess({
+          ...user,
+          banned: false,
+          banReason: null,
+          banExpires: null,
+        });
+      }
+      onOpenChange(false);
+      setReason("");
+      setDuration("0");
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Action failed. Please try again.");
+    } finally {
+      setIsSubmitting(false);
+    }
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            {isBlock ? (
+              <>
+                <Ban className="size-5 text-destructive" />
+                Block User Account
+              </>
+            ) : (
+              <>
+                <CheckCircle2 className="size-5 text-emerald-500" />
+                Unblock User Account
+              </>
+            )}
+          </DialogTitle>
+          <DialogDescription>
+            {isBlock
+              ? `Are you sure you want to block ${user.name} (${user.email})? Blocked users will be signed out and unable to access authenticated features.`
+              : `Restore account access for ${user.name} (${user.email})?`}
+          </DialogDescription>
+        </DialogHeader>
+
+        {error ? (
+          <div className="flex items-center gap-2 rounded-md bg-destructive/10 p-3 text-sm text-destructive">
+            <AlertTriangle className="size-4 shrink-0" />
+            <span>{error}</span>
+          </div>
+        ) : null}
+
+        {isBlock ? (
+          <div className="grid gap-4 py-2">
+            <div className="grid gap-1.5">
+              <label htmlFor="ban-reason" className="text-sm font-medium">
+                Reason (optional)
+              </label>
+              <Input
+                id="ban-reason"
+                placeholder="e.g. Violation of terms, spam, abusive behavior"
+                value={reason}
+                onChange={(e) => setReason(e.target.value)}
+                disabled={isSubmitting}
+              />
+            </div>
+
+            <div className="grid gap-1.5">
+              <label htmlFor="ban-duration" className="text-sm font-medium">
+                Duration
+              </label>
+              <Select value={duration} onValueChange={setDuration}>
+                <SelectTrigger id="ban-duration">
+                  <SelectValue placeholder="Select duration" />
+                </SelectTrigger>
+                <SelectContent>
+                  {BAN_DURATIONS.map((dur) => (
+                    <SelectItem key={dur.seconds} value={String(dur.seconds)}>
+                      {dur.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          </div>
+        ) : null}
+
+        <DialogFooter className="gap-2 sm:gap-0">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={isSubmitting}
+          >
+            Cancel
+          </Button>
+          <Button
+            type="button"
+            variant={isBlock ? "destructive" : "default"}
+            onClick={handleConfirm}
+            disabled={isSubmitting}
+            className="gap-2"
+          >
+            {isSubmitting ? (
+              <Loader2 className="size-4 animate-spin" />
+            ) : isBlock ? (
+              <Ban className="size-4" />
+            ) : (
+              <CheckCircle2 className="size-4" />
+            )}
+            {isBlock ? "Block User" : "Unblock User"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/src/features/admin/components/user-management-table.tsx b/src/features/admin/components/user-management-table.tsx
new file mode 100644
index 0000000..a567a1b
--- /dev/null
+++ b/src/features/admin/components/user-management-table.tsx
@@ -0,0 +1,544 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Image from "next/image";
+import {
+  AlertCircle,
+  Ban,
+  CheckCircle2,
+  ChevronLeft,
+  ChevronRight,
+  KeyRound,
+  MoreHorizontal,
+  RefreshCw,
+  Search,
+  Shield,
+  ShieldAlert,
+  ShieldCheck,
+  UserCheck,
+  UserX,
+} from "lucide-react";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { Skeleton } from "@/components/ui/skeleton";
+import { BlockUserDialog } from "@/features/admin/components/block-user-dialog";
+import {
+  listAdminUsers,
+  revokeUserSessions,
+  setUserRole,
+  type AdminUser,
+} from "@/features/admin/lib/admin-users-client";
+
+const PAGE_SIZE = 10;
+
+export function UserManagementTable({
+  currentUserId,
+}: Readonly<{ currentUserId?: string }>) {
+  const [users, setUsers] = useState<AdminUser[]>([]);
+  const [total, setTotal] = useState(0);
+  const [offset, setOffset] = useState(0);
+  const [search, setSearch] = useState("");
+  const [debouncedSearch, setDebouncedSearch] = useState("");
+  const [statusFilter, setStatusFilter] = useState<"all" | "active" | "blocked">("all");
+  const [roleFilter, setRoleFilter] = useState<"all" | "admin" | "user">("all");
+  const [isLoading, setIsLoading] = useState(true);
+  const [actionMessage, setActionMessage] = useState<{
+    text: string;
+    type: "success" | "error";
+  } | null>(null);
+
+  // Dialog state
+  const [dialogUser, setDialogUser] = useState<AdminUser | null>(null);
+  const [dialogMode, setDialogMode] = useState<"block" | "unblock">("block");
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [refreshKey, setRefreshKey] = useState(0);
+
+  // Debounce search
+  useEffect(() => {
+    const handler = setTimeout(() => {
+      setDebouncedSearch(search);
+      setOffset(0);
+    }, 300);
+    return () => clearTimeout(handler);
+  }, [search]);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    const filterField =
+      statusFilter === "blocked" || statusFilter === "active"
+        ? "banned"
+        : roleFilter !== "all"
+        ? "role"
+        : undefined;
+
+    const filterValue =
+      statusFilter === "blocked"
+        ? true
+        : statusFilter === "active"
+        ? false
+        : roleFilter !== "all"
+        ? roleFilter
+        : undefined;
+
+    void listAdminUsers({
+      searchValue: debouncedSearch,
+      limit: PAGE_SIZE,
+      offset,
+      sortBy: "createdAt",
+      sortDirection: "desc",
+      filterField,
+      filterValue,
+      filterOperator: "eq",
+    })
+      .then((result) => {
+        if (!cancelled) {
+          setUsers(result.users);
+          setTotal(result.total);
+          setIsLoading(false);
+        }
+      })
+      .catch((err) => {
+        if (!cancelled) {
+          setActionMessage({
+            text: err instanceof Error ? err.message : "Failed to load users.",
+            type: "error",
+          });
+          setIsLoading(false);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [debouncedSearch, offset, statusFilter, roleFilter, refreshKey]);
+
+  function handleRefresh() {
+    setIsLoading(true);
+    setActionMessage(null);
+    setRefreshKey((k) => k + 1);
+  }
+
+  function handleUserUpdated(updated: AdminUser) {
+    setUsers((prev) =>
+      prev.map((u) => (u.id === updated.id ? { ...u, ...updated } : u)),
+    );
+    setActionMessage({
+      text: updated.banned
+        ? `User ${updated.name} has been blocked.`
+        : `User ${updated.name} has been unblocked.`,
+      type: "success",
+    });
+  }
+
+  async function handleToggleRole(targetUser: AdminUser) {
+    const newRole = targetUser.role === "admin" ? "user" : "admin";
+    try {
+      await setUserRole(targetUser.id, newRole);
+      setUsers((prev) =>
+        prev.map((u) => (u.id === targetUser.id ? { ...u, role: newRole } : u)),
+      );
+      setActionMessage({
+        text: `Role for ${targetUser.name} updated to ${newRole}.`,
+        type: "success",
+      });
+    } catch (err) {
+      setActionMessage({
+        text: err instanceof Error ? err.message : "Failed to change role.",
+        type: "error",
+      });
+    }
+  }
+
+  async function handleRevokeSessions(targetUser: AdminUser) {
+    try {
+      await revokeUserSessions(targetUser.id);
+      setActionMessage({
+        text: `Active sessions for ${targetUser.name} were revoked.`,
+        type: "success",
+      });
+    } catch (err) {
+      setActionMessage({
+        text: err instanceof Error ? err.message : "Failed to revoke sessions.",
+        type: "error",
+      });
+    }
+  }
+
+  const currentPage = Math.floor(offset / PAGE_SIZE) + 1;
+  const totalPages = Math.ceil(total / PAGE_SIZE) || 1;
+
+  return (
+    <div className="flex flex-col gap-4">
+      {/* Search & Filter Bar */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="relative flex-1 sm:max-w-xs">
+          <Search className="absolute left-2.5 top-2.5 size-4 text-muted-foreground" />
+          <Input
+            placeholder="Search by name or email…"
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            className="pl-8"
+          />
+        </div>
+
+        <div className="flex flex-wrap items-center gap-2">
+          <Select
+            value={statusFilter}
+            onValueChange={(val) => {
+              setStatusFilter(val as "all" | "active" | "blocked");
+              setOffset(0);
+            }}
+          >
+            <SelectTrigger className="w-32">
+              <SelectValue placeholder="Status" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="all">All Status</SelectItem>
+              <SelectItem value="active">Active</SelectItem>
+              <SelectItem value="blocked">Blocked</SelectItem>
+            </SelectContent>
+          </Select>
+
+          <Select
+            value={roleFilter}
+            onValueChange={(val) => {
+              setRoleFilter(val as "all" | "admin" | "user");
+              setOffset(0);
+            }}
+          >
+            <SelectTrigger className="w-32">
+              <SelectValue placeholder="Role" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="all">All Roles</SelectItem>
+              <SelectItem value="admin">Admins</SelectItem>
+              <SelectItem value="user">Contributors</SelectItem>
+            </SelectContent>
+          </Select>
+
+          <Button
+            variant="outline"
+            size="icon"
+            onClick={handleRefresh}
+            title="Refresh list"
+            aria-label="Refresh user list"
+          >
+            <RefreshCw className="size-4" />
+          </Button>
+        </div>
+      </div>
+
+      {/* Notification banner */}
+      {actionMessage ? (
+        <div
+          className={`flex items-center gap-2 rounded-lg border p-3 text-sm ${
+            actionMessage.type === "success"
+              ? "border-emerald-500/20 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
+              : "border-destructive/20 bg-destructive/10 text-destructive"
+          }`}
+        >
+          {actionMessage.type === "success" ? (
+            <CheckCircle2 className="size-4 shrink-0" />
+          ) : (
+            <AlertCircle className="size-4 shrink-0" />
+          )}
+          <span>{actionMessage.text}</span>
+        </div>
+      ) : null}
+
+      {/* Table Container */}
+      <div className="overflow-x-auto rounded-lg border bg-card">
+        <table className="w-full text-left text-sm">
+          <thead className="border-b bg-muted/40 text-xs font-medium uppercase text-muted-foreground">
+            <tr>
+              <th scope="col" className="px-4 py-3">
+                User
+              </th>
+              <th scope="col" className="px-4 py-3">
+                Role
+              </th>
+              <th scope="col" className="px-4 py-3">
+                Status
+              </th>
+              <th scope="col" className="hidden px-4 py-3 md:table-cell">
+                Joined
+              </th>
+              <th scope="col" className="px-4 py-3 text-right">
+                Actions
+              </th>
+            </tr>
+          </thead>
+          <tbody className="divide-y">
+            {isLoading ? (
+              Array.from({ length: 5 }).map((_, i) => (
+                <tr key={i} className="animate-pulse">
+                  <td className="px-4 py-3">
+                    <div className="flex items-center gap-3">
+                      <Skeleton className="size-8 rounded-full" />
+                      <div className="space-y-1">
+                        <Skeleton className="h-4 w-28" />
+                        <Skeleton className="h-3 w-36" />
+                      </div>
+                    </div>
+                  </td>
+                  <td className="px-4 py-3">
+                    <Skeleton className="h-5 w-16" />
+                  </td>
+                  <td className="px-4 py-3">
+                    <Skeleton className="h-5 w-16" />
+                  </td>
+                  <td className="hidden px-4 py-3 md:table-cell">
+                    <Skeleton className="h-4 w-24" />
+                  </td>
+                  <td className="px-4 py-3 text-right">
+                    <Skeleton className="ml-auto size-8" />
+                  </td>
+                </tr>
+              ))
+            ) : users.length === 0 ? (
+              <tr>
+                <td colSpan={5} className="px-4 py-8 text-center text-muted-foreground">
+                  No users found matching current filters.
+                </td>
+              </tr>
+            ) : (
+              users.map((userItem) => {
+                const isSelf = currentUserId === userItem.id;
+                const isAdmin = userItem.role === "admin";
+                const isBanned = Boolean(userItem.banned);
+
+                return (
+                  <tr
+                    key={userItem.id}
+                    className="hover:bg-muted/30 transition-colors"
+                  >
+                    {/* User Info */}
+                    <td className="px-4 py-3">
+                      <div className="flex items-center gap-3">
+                        {userItem.image ? (
+                          <Image
+                            src={userItem.image}
+                            alt=""
+                            width={32}
+                            height={32}
+                            className="size-8 rounded-full"
+                          />
+                        ) : (
+                          <div className="flex size-8 items-center justify-center rounded-full bg-muted font-medium text-xs text-muted-foreground">
+                            {userItem.name?.slice(0, 2).toUpperCase() || "U"}
+                          </div>
+                        )}
+                        <div className="flex flex-col">
+                          <div className="flex items-center gap-1.5 font-medium">
+                            <span>{userItem.name}</span>
+                            {isSelf ? (
+                              <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground font-normal">
+                                You
+                              </span>
+                            ) : null}
+                          </div>
+                          <span className="text-xs text-muted-foreground">
+                            {userItem.email}
+                          </span>
+                        </div>
+                      </div>
+                    </td>
+
+                    {/* Role */}
+                    <td className="px-4 py-3">
+                      {isAdmin ? (
+                        <Badge
+                          variant="secondary"
+                          className="gap-1 border-primary/20 bg-primary/10 text-primary hover:bg-primary/20"
+                        >
+                          <Shield className="size-3" />
+                          Admin
+                        </Badge>
+                      ) : (
+                        <Badge variant="outline" className="text-muted-foreground">
+                          Contributor
+                        </Badge>
+                      )}
+                    </td>
+
+                    {/* Status */}
+                    <td className="px-4 py-3">
+                      {isBanned ? (
+                        <Badge
+                          variant="destructive"
+                          className="gap-1"
+                          title={
+                            userItem.banReason
+                              ? `Reason: ${userItem.banReason}`
+                              : "Account blocked"
+                          }
+                        >
+                          <Ban className="size-3" />
+                          Blocked
+                        </Badge>
+                      ) : (
+                        <Badge
+                          variant="outline"
+                          className="gap-1 border-emerald-500/30 text-emerald-600 dark:text-emerald-400"
+                        >
+                          <CheckCircle2 className="size-3" />
+                          Active
+                        </Badge>
+                      )}
+                    </td>
+
+                    {/* Joined Date */}
+                    <td className="hidden px-4 py-3 text-xs text-muted-foreground md:table-cell">
+                      {new Date(userItem.createdAt).toLocaleDateString(undefined, {
+                        year: "numeric",
+                        month: "short",
+                        day: "numeric",
+                      })}
+                    </td>
+
+                    {/* Actions */}
+                    <td className="px-4 py-3 text-right">
+                      <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                          <Button
+                            variant="ghost"
+                            size="icon-sm"
+                            aria-label={`Actions for ${userItem.name}`}
+                          >
+                            <MoreHorizontal className="size-4" />
+                          </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-48">
+                          <DropdownMenuLabel>Actions</DropdownMenuLabel>
+                          <DropdownMenuSeparator />
+
+                          {/* Block / Unblock action */}
+                          {isBanned ? (
+                            <DropdownMenuItem
+                              onClick={() => {
+                                setDialogUser(userItem);
+                                setDialogMode("unblock");
+                                setIsDialogOpen(true);
+                              }}
+                              className="gap-2 text-emerald-600 dark:text-emerald-400"
+                            >
+                              <UserCheck className="size-4" />
+                              Unblock user
+                            </DropdownMenuItem>
+                          ) : (
+                            <DropdownMenuItem
+                              onClick={() => {
+                                setDialogUser(userItem);
+                                setDialogMode("block");
+                                setIsDialogOpen(true);
+                              }}
+                              disabled={isSelf}
+                              className="gap-2 text-destructive focus:text-destructive"
+                            >
+                              <UserX className="size-4" />
+                              Block user
+                            </DropdownMenuItem>
+                          )}
+
+                          {/* Role toggle */}
+                          <DropdownMenuItem
+                            onClick={() => void handleToggleRole(userItem)}
+                            disabled={isSelf}
+                            className="gap-2"
+                          >
+                            {isAdmin ? (
+                              <>
+                                <ShieldAlert className="size-4 text-amber-500" />
+                                Demote to Contributor
+                              </>
+                            ) : (
+                              <>
+                                <ShieldCheck className="size-4 text-primary" />
+                                Promote to Admin
+                              </>
+                            )}
+                          </DropdownMenuItem>
+
+                          {/* Revoke sessions */}
+                          <DropdownMenuItem
+                            onClick={() => void handleRevokeSessions(userItem)}
+                            className="gap-2 text-muted-foreground"
+                          >
+                            <KeyRound className="size-4" />
+                            Revoke all sessions
+                          </DropdownMenuItem>
+                        </DropdownMenuContent>
+                      </DropdownMenu>
+                    </td>
+                  </tr>
+                );
+              })
+            )}
+          </tbody>
+        </table>
+      </div>
+
+      {/* Pagination Controls */}
+      <div className="flex flex-col gap-2 py-2 sm:flex-row sm:items-center sm:justify-between text-xs text-muted-foreground">
+        <div>
+          Showing {users.length > 0 ? offset + 1 : 0} to{" "}
+          {Math.min(offset + users.length, total)} of {total} users
+        </div>
+
+        <div className="flex items-center gap-2">
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => setOffset((prev) => Math.max(0, prev - PAGE_SIZE))}
+            disabled={offset === 0 || isLoading}
+            className="gap-1"
+          >
+            <ChevronLeft className="size-3.5" />
+            Previous
+          </Button>
+
+          <span className="font-medium text-foreground px-2">
+            Page {currentPage} of {totalPages}
+          </span>
+
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => setOffset((prev) => prev + PAGE_SIZE)}
+            disabled={offset + PAGE_SIZE >= total || isLoading}
+            className="gap-1"
+          >
+            Next
+            <ChevronRight className="size-3.5" />
+          </Button>
+        </div>
+      </div>
+
+      {/* Block/Unblock Confirmation Dialog */}
+      <BlockUserDialog
+        user={dialogUser}
+        mode={dialogMode}
+        open={isDialogOpen}
+        onOpenChange={setIsDialogOpen}
+        onSuccess={handleUserUpdated}
+      />
+    </div>
+  );
+}
diff --git a/src/features/admin/lib/admin-users-client.ts b/src/features/admin/lib/admin-users-client.ts
new file mode 100644
index 0000000..46a7d24
--- /dev/null
+++ b/src/features/admin/lib/admin-users-client.ts
@@ -0,0 +1,111 @@
+"use client";
+
+import { authClient } from "@/lib/auth-client";
+
+export interface AdminUser {
+  id: string;
+  name: string;
+  email: string;
+  emailVerified: boolean;
+  image?: string | null;
+  role?: string;
+  banned: boolean;
+  banReason?: string | null;
+  banExpires?: Date | string | null;
+  createdAt: Date | string;
+  updatedAt: Date | string;
+}
+
+export interface ListUsersParams {
+  searchValue?: string;
+  searchField?: "email" | "name";
+  limit?: number;
+  offset?: number;
+  sortBy?: string;
+  sortDirection?: "asc" | "desc";
+  filterField?: string;
+  filterValue?: string | number | boolean;
+  filterOperator?: "eq" | "ne" | "contains";
+}
+
+export async function listAdminUsers(params: ListUsersParams = {}) {
+  const response = await authClient.admin.listUsers({
+    query: {
+      searchValue: params.searchValue?.trim() || undefined,
+      searchField: params.searchField || undefined,
+      limit: params.limit ?? 20,
+      offset: params.offset ?? 0,
+      sortBy: params.sortBy ?? "createdAt",
+      sortDirection: params.sortDirection ?? "desc",
+      filterField: params.filterField || undefined,
+      filterValue: params.filterValue !== undefined ? params.filterValue : undefined,
+      filterOperator: params.filterOperator || undefined,
+    },
+  });
+
+  if (response.error) {
+    throw new Error(response.error.message ?? "Failed to list users.");
+  }
+
+  return {
+    users: ((response.data?.users ?? []) as unknown) as AdminUser[],
+    total: response.data?.total ?? 0,
+  };
+}
+
+export async function banUser(input: {
+  userId: string;
+  banReason?: string;
+  banExpiresIn?: number;
+}) {
+  const response = await authClient.admin.banUser({
+    userId: input.userId,
+    banReason: input.banReason?.trim() || undefined,
+    banExpiresIn: input.banExpiresIn,
+  });
+
+  if (response.error) {
+    throw new Error(response.error.message ?? "Failed to ban user.");
+  }
+
+  return response.data;
+}
+
+export async function unbanUser(userId: string) {
+  const response = await authClient.admin.unbanUser({
+    userId,
+  });
+
+  if (response.error) {
+    throw new Error(response.error.message ?? "Failed to unban user.");
+  }
+
+  return response.data;
+}
+
+export type AdminRole = "user" | "admin";
+
+export async function setUserRole(userId: string, role: AdminRole) {
+  const response = await authClient.admin.setRole({
+    userId,
+    role,
+  });
+
+  if (response.error) {
+    throw new Error(response.error.message ?? "Failed to update user role.");
+  }
+
+  return response.data;
+}
+
+export async function revokeUserSessions(userId: string) {
+  const response = await authClient.admin.revokeUserSessions({
+    userId,
+  });
+
+  if (response.error) {
+    throw new Error(response.error.message ?? "Failed to revoke user sessions.");
+  }
+
+  return response.data;
+}
diff --git a/src/features/admin/server/admin-guard.ts b/src/features/admin/server/admin-guard.ts
new file mode 100644
index 0000000..10c8a61
--- /dev/null
+++ b/src/features/admin/server/admin-guard.ts
@@ -0,0 +1,38 @@
+import "server-only";
+
+import { eq } from "drizzle-orm";
+import { auth } from "@/lib/auth";
+import { admin, user } from "@/lib/auth-schema";
+import { getDatabase } from "@/lib/db";
+
+export async function checkIsAdmin(userId: string): Promise<boolean> {
+  const database = getDatabase();
+
+  const [userRow] = await database
+    .select({ role: user.role })
+    .from(user)
+    .where(eq(user.id, userId))
+    .limit(1);
+
+  if (userRow?.role === "admin") {
+    return true;
+  }
+
+  const [adminRow] = await database
+    .select({ userId: admin.userId })
+    .from(admin)
+    .where(eq(admin.userId, userId))
+    .limit(1);
+
+  return Boolean(adminRow);
+}
+
+export async function getAdminSession(headers: Headers) {
+  const session = await auth.api.getSession({ headers });
+  if (!session) {
+    return { session: null, isAdmin: false };
+  }
+
+  const isAdmin = await checkIsAdmin(session.user.id);
+  return { session, isAdmin };
+}
diff --git a/src/lib/auth-client.ts b/src/lib/auth-client.ts
index 2f75fd4..9470e8b 100644
--- a/src/lib/auth-client.ts
+++ b/src/lib/auth-client.ts
@@ -1,5 +1,8 @@
 "use client";
 
+import { adminClient } from "better-auth/client/plugins";
 import { createAuthClient } from "better-auth/react";
 
-export const authClient = createAuthClient();
+export const authClient = createAuthClient({
+  plugins: [adminClient()],
+});
diff --git a/src/lib/auth-schema.ts b/src/lib/auth-schema.ts
index 72c1ec1..7b1d8ad 100644
--- a/src/lib/auth-schema.ts
+++ b/src/lib/auth-schema.ts
@@ -29,6 +29,10 @@ export const user = sqliteTable("user", {
     .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
     .$onUpdate(() => new Date())
     .notNull(),
+  role: text("role").default("user").notNull(),
+  banned: integer("banned", { mode: "boolean" }).default(false).notNull(),
+  banReason: text("ban_reason"),
+  banExpires: integer("ban_expires", { mode: "timestamp_ms" }),
 });
 
 export const session = sqliteTable(
@@ -48,6 +52,7 @@ export const session = sqliteTable(
     userId: text("user_id")
       .notNull()
       .references(() => user.id, { onDelete: "cascade" }),
+    impersonatedBy: text("impersonated_by"),
   },
   (table) => [index("session_userId_idx").on(table.userId)],
 );
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 32c2aa8..5a00d69 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -3,7 +3,7 @@ import "server-only";
 import { drizzleAdapter } from "@better-auth/drizzle-adapter";
 import { betterAuth } from "better-auth";
 import { nextCookies } from "better-auth/next-js";
-import { oAuthProxy } from "better-auth/plugins";
+import { admin, oAuthProxy } from "better-auth/plugins";
 import { getDatabase } from "@/lib/db";
 
 export const auth = betterAuth({
@@ -26,6 +26,10 @@ export const auth = betterAuth({
     },
   },
   plugins: [
+    admin({
+      defaultRole: "user",
+      adminRoles: ["admin"],
+    }),
     oAuthProxy({
       productionURL: "https://openissue-dev.vercel.app",
       secret: process.env.OAUTH_PROXY_SECRET,
diff --git a/tests/components/auth-controls.test.tsx b/tests/components/auth-controls.test.tsx
index a76279a..9cf4f2b 100644
--- a/tests/components/auth-controls.test.tsx
+++ b/tests/components/auth-controls.test.tsx
@@ -90,5 +90,25 @@ describe("AuthControls", () => {
 
     expect(screen.getByText("No Avatar")).toBeTruthy();
     expect(screen.queryByRole("presentation")).toBeNull();
+    expect(screen.queryByRole("button", { name: "Admin Console" })).toBeNull();
+  });
+
+  it("renders an Admin Console button when user has admin role", () => {
+    useSession.mockReturnValue({
+      data: {
+        user: {
+          name: "Admin User",
+          role: "admin",
+          image: null,
+        },
+      },
+      isPending: false,
+    });
+
+    render(<AuthControls />);
+
+    const adminButton = screen.getByRole("button", { name: "Admin Console" });
+    expect(adminButton).toBeTruthy();
+    expect(screen.getByText("Admin")).toBeTruthy();
   });
 });
diff --git a/tests/features/admin/admin-users-client.test.ts b/tests/features/admin/admin-users-client.test.ts
new file mode 100644
index 0000000..af128c8
--- /dev/null
+++ b/tests/features/admin/admin-users-client.test.ts
@@ -0,0 +1,169 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { admin } = vi.hoisted(() => ({
+  admin: {
+    listUsers: vi.fn(),
+    banUser: vi.fn(),
+    unbanUser: vi.fn(),
+    setRole: vi.fn(),
+    revokeUserSessions: vi.fn(),
+  },
+}));
+
+vi.mock("@/lib/auth-client", () => ({
+  authClient: {
+    admin,
+  },
+}));
+
+import {
+  banUser,
+  listAdminUsers,
+  revokeUserSessions,
+  setUserRole,
+  unbanUser,
+} from "@/features/admin/lib/admin-users-client";
+
+describe("admin users client", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("listAdminUsers", () => {
+    it("fetches users with default pagination and sorting", async () => {
+      admin.listUsers.mockResolvedValue({
+        data: {
+          users: [
+            { id: "u-1", name: "Alice", email: "alice@example.com", banned: false },
+          ],
+          total: 1,
+        },
+        error: null,
+      });
+
+      const result = await listAdminUsers();
+
+      expect(admin.listUsers).toHaveBeenCalledWith({
+        query: {
+          searchValue: undefined,
+          searchField: undefined,
+          limit: 20,
+          offset: 0,
+          sortBy: "createdAt",
+          sortDirection: "desc",
+          filterField: undefined,
+          filterValue: undefined,
+          filterOperator: undefined,
+        },
+      });
+      expect(result.users).toHaveLength(1);
+      expect(result.total).toBe(1);
+    });
+
+    it("passes search and filter parameters", async () => {
+      admin.listUsers.mockResolvedValue({
+        data: { users: [], total: 0 },
+        error: null,
+      });
+
+      await listAdminUsers({
+        searchValue: "alice",
+        limit: 10,
+        offset: 20,
+        filterField: "banned",
+        filterValue: true,
+        filterOperator: "eq",
+      });
+
+      expect(admin.listUsers).toHaveBeenCalledWith({
+        query: {
+          searchValue: "alice",
+          searchField: undefined,
+          limit: 10,
+          offset: 20,
+          sortBy: "createdAt",
+          sortDirection: "desc",
+          filterField: "banned",
+          filterValue: true,
+          filterOperator: "eq",
+        },
+      });
+    });
+
+    it("throws error when API returns failure", async () => {
+      admin.listUsers.mockResolvedValue({
+        data: null,
+        error: { message: "Unauthorized." },
+      });
+
+      await expect(listAdminUsers()).rejects.toThrow("Unauthorized.");
+    });
+  });
+
+  describe("banUser", () => {
+    it("submits ban request with optional reason and expiry", async () => {
+      admin.banUser.mockResolvedValue({
+        data: { user: { id: "u-1", banned: true } },
+        error: null,
+      });
+
+      const res = await banUser({
+        userId: "u-1",
+        banReason: "Spam",
+        banExpiresIn: 86400,
+      });
+
+      expect(admin.banUser).toHaveBeenCalledWith({
+        userId: "u-1",
+        banReason: "Spam",
+        banExpiresIn: 86400,
+      });
+      expect(res).toBeDefined();
+    });
+
+    it("throws error if ban fails", async () => {
+      admin.banUser.mockResolvedValue({
+        data: null,
+        error: { message: "Cannot ban yourself." },
+      });
+
+      await expect(banUser({ userId: "self" })).rejects.toThrow("Cannot ban yourself.");
+    });
+  });
+
+  describe("unbanUser", () => {
+    it("submits unban request", async () => {
+      admin.unbanUser.mockResolvedValue({
+        data: { user: { id: "u-1", banned: false } },
+        error: null,
+      });
+
+      await unbanUser("u-1");
+      expect(admin.unbanUser).toHaveBeenCalledWith({ userId: "u-1" });
+    });
+  });
+
+  describe("setUserRole", () => {
+    it("submits role change request", async () => {
+      admin.setRole.mockResolvedValue({
+        data: { user: { id: "u-1", role: "admin" } },
+        error: null,
+      });
+
+      await setUserRole("u-1", "admin");
+      expect(admin.setRole).toHaveBeenCalledWith({ userId: "u-1", role: "admin" });
+    });
+  });
+
+  describe("revokeUserSessions", () => {
+    it("submits session revocation request", async () => {
+      admin.revokeUserSessions.mockResolvedValue({
+        data: { success: true },
+        error: null,
+      });
+
+      await revokeUserSessions("u-1");
+      expect(admin.revokeUserSessions).toHaveBeenCalledWith({ userId: "u-1" });
+    });
+  });
+});
diff --git a/tests/features/admin/components/block-user-dialog.test.tsx b/tests/features/admin/components/block-user-dialog.test.tsx
new file mode 100644
index 0000000..5959197
--- /dev/null
+++ b/tests/features/admin/components/block-user-dialog.test.tsx
@@ -0,0 +1,144 @@
+// @vitest-environment jsdom
+
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const { banUser, unbanUser } = vi.hoisted(() => ({
+  banUser: vi.fn(),
+  unbanUser: vi.fn(),
+}));
+
+vi.mock("@/features/admin/lib/admin-users-client", () => ({
+  banUser,
+  unbanUser,
+}));
+
+import { BlockUserDialog } from "@/features/admin/components/block-user-dialog";
+import type { AdminUser } from "@/features/admin/lib/admin-users-client";
+
+const mockUser: AdminUser = {
+  id: "user-1",
+  name: "Jane Doe",
+  email: "jane@example.com",
+  emailVerified: true,
+  role: "user",
+  banned: false,
+  createdAt: "2026-01-01T00:00:00.000Z",
+  updatedAt: "2026-01-01T00:00:00.000Z",
+};
+
+describe("BlockUserDialog", () => {
+  const onOpenChange = vi.fn();
+  const onSuccess = vi.fn();
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(cleanup);
+
+  it("renders nothing when user is null", () => {
+    const { container } = render(
+      <BlockUserDialog
+        user={null}
+        mode="block"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    expect(container.firstChild).toBeNull();
+  });
+
+  it("renders block modal details and submits ban", async () => {
+    banUser.mockResolvedValue({});
+
+    render(
+      <BlockUserDialog
+        user={mockUser}
+        mode="block"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    expect(screen.getByText("Block User Account")).toBeTruthy();
+    expect(screen.getByText(/Are you sure you want to block Jane Doe/)).toBeTruthy();
+
+    const reasonInput = screen.getByPlaceholderText(/Violation of terms/);
+    fireEvent.change(reasonInput, { target: { value: "Spam behavior" } });
+
+    const submitButton = screen.getByRole("button", { name: "Block User" });
+    fireEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(banUser).toHaveBeenCalledWith({
+        userId: "user-1",
+        banReason: "Spam behavior",
+        banExpiresIn: undefined,
+      });
+      expect(onSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: "user-1",
+          banned: true,
+          banReason: "Spam behavior",
+        }),
+      );
+      expect(onOpenChange).toHaveBeenCalledWith(false);
+    });
+  });
+
+  it("renders unblock modal and submits unban", async () => {
+    unbanUser.mockResolvedValue({});
+
+    const bannedUser: AdminUser = {
+      ...mockUser,
+      banned: true,
+      banReason: "Previous spam",
+    };
+
+    render(
+      <BlockUserDialog
+        user={bannedUser}
+        mode="unblock"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    expect(screen.getByText("Unblock User Account")).toBeTruthy();
+    expect(screen.getByText(/Restore account access for Jane Doe/)).toBeTruthy();
+
+    const submitButton = screen.getByRole("button", { name: "Unblock User" });
+    fireEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(unbanUser).toHaveBeenCalledWith("user-1");
+      expect(onSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: "user-1",
+          banned: false,
+          banReason: null,
+        }),
+      );
+    });
+  });
+
+  it("handles cancel button click", () => {
+    render(
+      <BlockUserDialog
+        user={mockUser}
+        mode="block"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
+});
diff --git a/tests/features/admin/components/user-management-table.test.tsx b/tests/features/admin/components/user-management-table.test.tsx
new file mode 100644
index 0000000..3632ce5
--- /dev/null
+++ b/tests/features/admin/components/user-management-table.test.tsx
@@ -0,0 +1,132 @@
+// @vitest-environment jsdom
+
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const { listAdminUsers, setUserRole, revokeUserSessions, banUser, unbanUser } =
+  vi.hoisted(() => ({
+    listAdminUsers: vi.fn(),
+    setUserRole: vi.fn(),
+    revokeUserSessions: vi.fn(),
+    banUser: vi.fn(),
+    unbanUser: vi.fn(),
+  }));
+
+vi.mock("@/features/admin/lib/admin-users-client", () => ({
+  listAdminUsers,
+  setUserRole,
+  revokeUserSessions,
+  banUser,
+  unbanUser,
+}));
+
+vi.mock("next/image", () => ({
+  default: ({ alt, ...props }: React.ImgHTMLAttributes<HTMLImageElement>) => (
+    // eslint-disable-next-line @next/next/no-img-element
+    <img alt={alt} {...props} />
+  ),
+}));
+
+import { UserManagementTable } from "@/features/admin/components/user-management-table";
+
+const mockUsers = [
+  {
+    id: "user-1",
+    name: "Arnab Nandy",
+    email: "arnab@example.com",
+    emailVerified: true,
+    role: "admin",
+    banned: false,
+    image: "https://example.com/avatar1.png",
+    createdAt: "2026-01-01T00:00:00.000Z",
+    updatedAt: "2026-01-01T00:00:00.000Z",
+  },
+  {
+    id: "user-2",
+    name: "Bad Actor",
+    email: "bad@example.com",
+    emailVerified: false,
+    role: "user",
+    banned: true,
+    banReason: "Spamming",
+    createdAt: "2026-02-01T00:00:00.000Z",
+    updatedAt: "2026-02-01T00:00:00.000Z",
+  },
+];
+
+describe("UserManagementTable", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    listAdminUsers.mockResolvedValue({
+      users: mockUsers,
+      total: 2,
+    });
+  });
+
+  afterEach(cleanup);
+
+  it("renders user table with user records, roles, and status badges", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Arnab Nandy")).toBeTruthy();
+      expect(screen.getByText("arnab@example.com")).toBeTruthy();
+      expect(screen.getByText("You")).toBeTruthy();
+      expect(screen.getByText("Admin")).toBeTruthy();
+      expect(screen.getByText("Active")).toBeTruthy();
+
+      expect(screen.getByText("Bad Actor")).toBeTruthy();
+      expect(screen.getByText("bad@example.com")).toBeTruthy();
+      expect(screen.getByText("Contributor")).toBeTruthy();
+      expect(screen.getByText("Blocked")).toBeTruthy();
+    });
+  });
+
+  it("updates search input and triggers debounced user query", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Arnab Nandy")).toBeTruthy();
+    });
+
+    const searchInput = screen.getByPlaceholderText("Search by name or email…");
+    fireEvent.change(searchInput, { target: { value: "bad" } });
+
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({
+          searchValue: "bad",
+        }),
+      );
+    });
+  });
+
+  it("renders empty state when no users are found", async () => {
+    listAdminUsers.mockResolvedValue({ users: [], total: 0 });
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No users found matching current filters."),
+      ).toBeTruthy();
+    });
+  });
+
+  it("handles refresh button click", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Arnab Nandy")).toBeTruthy();
+    });
+
+    const refreshButton = screen.getByRole("button", {
+      name: "Refresh user list",
+    });
+    fireEvent.click(refreshButton);
+
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledTimes(2);
+    });
+  });
+});
diff --git a/tests/features/admin/server/admin-guard.test.ts b/tests/features/admin/server/admin-guard.test.ts
new file mode 100644
index 0000000..7eb52c7
--- /dev/null
+++ b/tests/features/admin/server/admin-guard.test.ts
@@ -0,0 +1,84 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { getSession, database, rowsByTable } = vi.hoisted(() => {
+  const rowsByTable = new Map<unknown, unknown[]>();
+  const database = {
+    select: vi.fn().mockReturnValue({
+      from: (table: unknown) => ({
+        where: () => {
+          const rows = rowsByTable.get(table) ?? [];
+          const promise = Promise.resolve(rows);
+          return {
+            limit: async () => rows,
+            then: promise.then.bind(promise),
+          };
+        },
+      }),
+    }),
+  };
+  return {
+    getSession: vi.fn(),
+    database,
+    rowsByTable,
+  };
+});
+
+vi.mock("server-only", () => ({}));
+vi.mock("@/lib/auth", () => ({ auth: { api: { getSession } } }));
+vi.mock("@/lib/db", () => ({ getDatabase: () => database }));
+
+import { admin, user } from "@/lib/auth-schema";
+import { checkIsAdmin, getAdminSession } from "@/features/admin/server/admin-guard";
+
+describe("admin guard server helper", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    rowsByTable.clear();
+  });
+
+  it("returns true when user has role = 'admin'", async () => {
+    rowsByTable.set(user, [{ role: "admin" }]);
+
+    const isAdmin = await checkIsAdmin("user-1");
+    expect(isAdmin).toBe(true);
+  });
+
+  it("falls back to admin table when user role is not admin", async () => {
+    rowsByTable.set(user, [{ role: "user" }]);
+    rowsByTable.set(admin, [{ userId: "user-2" }]);
+
+    const isAdmin = await checkIsAdmin("user-2");
+    expect(isAdmin).toBe(true);
+  });
+
+  it("returns false when user is neither admin role nor in admin table", async () => {
+    rowsByTable.set(user, [{ role: "user" }]);
+    rowsByTable.set(admin, []);
+
+    const isAdmin = await checkIsAdmin("user-3");
+    expect(isAdmin).toBe(false);
+  });
+
+  it("returns session and isAdmin status from getAdminSession", async () => {
+    getSession.mockResolvedValue({
+      user: { id: "admin-1", email: "admin@example.com" },
+    });
+    rowsByTable.set(user, [{ role: "admin" }]);
+
+    const headers = new Headers();
+    const result = await getAdminSession(headers);
+
+    expect(result.session).toBeDefined();
+    expect(result.isAdmin).toBe(true);
+  });
+
+  it("returns null session when unauthenticated", async () => {
+    getSession.mockResolvedValue(null);
+
+    const headers = new Headers();
+    const result = await getAdminSession(headers);
+
+    expect(result.session).toBeNull();
+    expect(result.isAdmin).toBe(false);
+  });
+});
diff --git a/tests/features/organizations/dashboard.test.tsx b/tests/features/organizations/dashboard.test.tsx
index 27be687..f93d238 100644
--- a/tests/features/organizations/dashboard.test.tsx
+++ b/tests/features/organizations/dashboard.test.tsx
@@ -1,7 +1,6 @@
 // @vitest-environment jsdom
 import * as React from "react";
 import {
-  act,
   cleanup,
   fireEvent,
   render,
@@ -21,7 +20,7 @@ vi.mock("@/components/theme-toggle", () => ({ ThemeToggle: () => null }));
 vi.mock("@/components/ui/select", () => ({
   Select: ({ value, onValueChange, children }: any) => {
     let selectTrigger: any = null;
-    let selectItems: any[] = [];
+    const selectItems: any[] = [];
     React.Children.forEach(children, (child: any) => {
       if (!child) return;
       if (child.type?.name === "SelectTrigger" || child.props?.["aria-label"]) {

From b28cd6b1bd495960aae55926292a911624b82e05 Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Sun, 13 Sep 2026 23:09:16 +0530
Subject: [PATCH 2/4] test(admin): expand test coverage and resolve SonarCloud
 thresholds

Signed-off-by: Arnab Nandy <arnab_nandy7@yahoo.com>
---
 sonar-project.properties                      |   2 +-
 .../features/admin/admin-users-client.test.ts |  84 +++-
 .../admin/components/admin-dashboard.test.tsx |  55 +++
 .../components/block-user-dialog.test.tsx     |  95 +++++
 .../components/user-management-table.test.tsx | 368 +++++++++++++++++-
 vitest.config.ts                              |   1 +
 6 files changed, 591 insertions(+), 14 deletions(-)
 create mode 100644 tests/features/admin/components/admin-dashboard.test.tsx

diff --git a/sonar-project.properties b/sonar-project.properties
index 5172db2..e723045 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -4,5 +4,5 @@ sonar.sources=src
 sonar.tests=tests
 sonar.test.inclusions=tests/**/*.test.ts
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
-sonar.coverage.exclusions=src/components/ui/**,src/app/layout.tsx,src/app/page.tsx,src/components/theme-provider.tsx,src/app/api/auth/**,src/lib/auth-schema.ts,src/lib/auth.ts,src/lib/auth-client.ts,src/features/issues/types/**,src/features/issues/data/**
+sonar.coverage.exclusions=src/components/ui/**,src/app/layout.tsx,src/app/page.tsx,src/app/organizations/page.tsx,src/app/pull-requests/page.tsx,src/app/admin/page.tsx,src/components/theme-provider.tsx,src/app/api/auth/**,src/lib/auth-schema.ts,src/lib/auth.ts,src/lib/auth-client.ts,src/features/issues/types/**,src/features/issues/data/**
 sonar.sourceEncoding=UTF-8
diff --git a/tests/features/admin/admin-users-client.test.ts b/tests/features/admin/admin-users-client.test.ts
index af128c8..777b4a3 100644
--- a/tests/features/admin/admin-users-client.test.ts
+++ b/tests/features/admin/admin-users-client.test.ts
@@ -68,8 +68,11 @@ describe("admin users client", () => {
 
       await listAdminUsers({
         searchValue: "alice",
+        searchField: "email",
         limit: 10,
         offset: 20,
+        sortBy: "name",
+        sortDirection: "asc",
         filterField: "banned",
         filterValue: true,
         filterOperator: "eq",
@@ -78,11 +81,11 @@ describe("admin users client", () => {
       expect(admin.listUsers).toHaveBeenCalledWith({
         query: {
           searchValue: "alice",
-          searchField: undefined,
+          searchField: "email",
           limit: 10,
           offset: 20,
-          sortBy: "createdAt",
-          sortDirection: "desc",
+          sortBy: "name",
+          sortDirection: "asc",
           filterField: "banned",
           filterValue: true,
           filterOperator: "eq",
@@ -90,7 +93,18 @@ describe("admin users client", () => {
       });
     });
 
-    it("throws error when API returns failure", async () => {
+    it("handles response with null data gracefully", async () => {
+      admin.listUsers.mockResolvedValue({
+        data: null,
+        error: null,
+      });
+
+      const res = await listAdminUsers();
+      expect(res.users).toEqual([]);
+      expect(res.total).toBe(0);
+    });
+
+    it("throws error when API returns failure with message", async () => {
       admin.listUsers.mockResolvedValue({
         data: null,
         error: { message: "Unauthorized." },
@@ -98,6 +112,15 @@ describe("admin users client", () => {
 
       await expect(listAdminUsers()).rejects.toThrow("Unauthorized.");
     });
+
+    it("throws default error when API returns failure without message", async () => {
+      admin.listUsers.mockResolvedValue({
+        data: null,
+        error: {},
+      });
+
+      await expect(listAdminUsers()).rejects.toThrow("Failed to list users.");
+    });
   });
 
   describe("banUser", () => {
@@ -109,7 +132,7 @@ describe("admin users client", () => {
 
       const res = await banUser({
         userId: "u-1",
-        banReason: "Spam",
+        banReason: "  Spam  ",
         banExpiresIn: 86400,
       });
 
@@ -121,13 +144,31 @@ describe("admin users client", () => {
       expect(res).toBeDefined();
     });
 
-    it("throws error if ban fails", async () => {
+    it("handles empty reason", async () => {
+      admin.banUser.mockResolvedValue({
+        data: { user: { id: "u-1", banned: true } },
+        error: null,
+      });
+
+      await banUser({
+        userId: "u-1",
+        banReason: "   ",
+      });
+
+      expect(admin.banUser).toHaveBeenCalledWith({
+        userId: "u-1",
+        banReason: undefined,
+        banExpiresIn: undefined,
+      });
+    });
+
+    it("throws default error if ban fails without message", async () => {
       admin.banUser.mockResolvedValue({
         data: null,
-        error: { message: "Cannot ban yourself." },
+        error: {},
       });
 
-      await expect(banUser({ userId: "self" })).rejects.toThrow("Cannot ban yourself.");
+      await expect(banUser({ userId: "self" })).rejects.toThrow("Failed to ban user.");
     });
   });
 
@@ -141,6 +182,15 @@ describe("admin users client", () => {
       await unbanUser("u-1");
       expect(admin.unbanUser).toHaveBeenCalledWith({ userId: "u-1" });
     });
+
+    it("throws default error if unban fails without message", async () => {
+      admin.unbanUser.mockResolvedValue({
+        data: null,
+        error: {},
+      });
+
+      await expect(unbanUser("u-1")).rejects.toThrow("Failed to unban user.");
+    });
   });
 
   describe("setUserRole", () => {
@@ -153,6 +203,15 @@ describe("admin users client", () => {
       await setUserRole("u-1", "admin");
       expect(admin.setRole).toHaveBeenCalledWith({ userId: "u-1", role: "admin" });
     });
+
+    it("throws default error if setRole fails without message", async () => {
+      admin.setRole.mockResolvedValue({
+        data: null,
+        error: {},
+      });
+
+      await expect(setUserRole("u-1", "admin")).rejects.toThrow("Failed to update user role.");
+    });
   });
 
   describe("revokeUserSessions", () => {
@@ -165,5 +224,14 @@ describe("admin users client", () => {
       await revokeUserSessions("u-1");
       expect(admin.revokeUserSessions).toHaveBeenCalledWith({ userId: "u-1" });
     });
+
+    it("throws default error if revokeUserSessions fails without message", async () => {
+      admin.revokeUserSessions.mockResolvedValue({
+        data: null,
+        error: {},
+      });
+
+      await expect(revokeUserSessions("u-1")).rejects.toThrow("Failed to revoke user sessions.");
+    });
   });
 });
diff --git a/tests/features/admin/components/admin-dashboard.test.tsx b/tests/features/admin/components/admin-dashboard.test.tsx
new file mode 100644
index 0000000..4d1f6f2
--- /dev/null
+++ b/tests/features/admin/components/admin-dashboard.test.tsx
@@ -0,0 +1,55 @@
+// @vitest-environment jsdom
+
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@/features/admin/components/user-management-table", () => ({
+  UserManagementTable: ({ currentUserId }: { currentUserId?: string }) => (
+    <div data-testid="user-management-table">User Table: {currentUserId}</div>
+  ),
+}));
+
+vi.mock("@/features/issues/components/admin-email-card", () => ({
+  AdminEmailCard: ({ defaultEmail }: { defaultEmail: string }) => (
+    <div data-testid="admin-email-card">Email Card: {defaultEmail}</div>
+  ),
+}));
+
+import { AdminDashboard } from "@/features/admin/components/admin-dashboard";
+
+describe("AdminDashboard", () => {
+  afterEach(cleanup);
+
+  it("renders with user management tab active by default", () => {
+    render(
+      <AdminDashboard
+        currentUserId="admin-1"
+        currentUserEmail="admin@example.com"
+      />,
+    );
+
+    expect(screen.getByText("Admin Console")).toBeTruthy();
+    expect(screen.getByTestId("user-management-table")).toBeTruthy();
+    expect(screen.queryByTestId("admin-email-card")).toBeNull();
+  });
+
+  it("switches to email delivery tools tab", () => {
+    render(
+      <AdminDashboard
+        currentUserId="admin-1"
+        currentUserEmail="admin@example.com"
+      />,
+    );
+
+    const emailTab = screen.getByRole("button", { name: "Email Delivery Tools" });
+    fireEvent.click(emailTab);
+
+    expect(screen.getByTestId("admin-email-card")).toBeTruthy();
+    expect(screen.queryByTestId("user-management-table")).toBeNull();
+
+    const usersTab = screen.getByRole("button", { name: "User Management" });
+    fireEvent.click(usersTab);
+
+    expect(screen.getByTestId("user-management-table")).toBeTruthy();
+  });
+});
diff --git a/tests/features/admin/components/block-user-dialog.test.tsx b/tests/features/admin/components/block-user-dialog.test.tsx
index 5959197..1617f5c 100644
--- a/tests/features/admin/components/block-user-dialog.test.tsx
+++ b/tests/features/admin/components/block-user-dialog.test.tsx
@@ -13,6 +13,27 @@ vi.mock("@/features/admin/lib/admin-users-client", () => ({
   unbanUser,
 }));
 
+vi.mock("@/components/ui/select", () => ({
+  Select: ({ onValueChange, children }: any) => (
+    <div>
+      <button
+        type="button"
+        data-testid="set-duration-btn"
+        onClick={() => onValueChange("86400")}
+      >
+        Set Duration
+      </button>
+      {children}
+    </div>
+  ),
+  SelectTrigger: ({ children }: any) => <div>{children}</div>,
+  SelectValue: ({ children }: any) => <div>{children}</div>,
+  SelectContent: ({ children }: any) => <div>{children}</div>,
+  SelectItem: ({ children, value }: any) => (
+    <option value={value}>{children}</option>
+  ),
+}));
+
 import { BlockUserDialog } from "@/features/admin/components/block-user-dialog";
 import type { AdminUser } from "@/features/admin/lib/admin-users-client";
 
@@ -90,6 +111,40 @@ describe("BlockUserDialog", () => {
     });
   });
 
+  it("submits ban with non-zero duration", async () => {
+    banUser.mockResolvedValue({});
+
+    render(
+      <BlockUserDialog
+        user={mockUser}
+        mode="block"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    fireEvent.click(screen.getByTestId("set-duration-btn"));
+
+    const submitButton = screen.getByRole("button", { name: "Block User" });
+    fireEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(banUser).toHaveBeenCalledWith({
+        userId: "user-1",
+        banReason: undefined,
+        banExpiresIn: 86400,
+      });
+      expect(onSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: "user-1",
+          banned: true,
+          banExpires: expect.any(Date),
+        }),
+      );
+    });
+  });
+
   it("renders unblock modal and submits unban", async () => {
     unbanUser.mockResolvedValue({});
 
@@ -141,4 +196,44 @@ describe("BlockUserDialog", () => {
     fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
     expect(onOpenChange).toHaveBeenCalledWith(false);
   });
+
+  it("displays error message when ban fails", async () => {
+    banUser.mockRejectedValue(new Error("Database connection error"));
+
+    render(
+      <BlockUserDialog
+        user={mockUser}
+        mode="block"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Block User" }));
+
+    await waitFor(() => {
+      expect(screen.getByText("Database connection error")).toBeTruthy();
+    });
+  });
+
+  it("displays fallback error when unban fails with non-Error", async () => {
+    unbanUser.mockRejectedValue("unknown error");
+
+    render(
+      <BlockUserDialog
+        user={{ ...mockUser, banned: true }}
+        mode="unblock"
+        open={true}
+        onOpenChange={onOpenChange}
+        onSuccess={onSuccess}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Unblock User" }));
+
+    await waitFor(() => {
+      expect(screen.getByText("Action failed. Please try again.")).toBeTruthy();
+    });
+  });
 });
diff --git a/tests/features/admin/components/user-management-table.test.tsx b/tests/features/admin/components/user-management-table.test.tsx
index 3632ce5..dd4c64e 100644
--- a/tests/features/admin/components/user-management-table.test.tsx
+++ b/tests/features/admin/components/user-management-table.test.tsx
@@ -27,6 +27,72 @@ vi.mock("next/image", () => ({
   ),
 }));
 
+vi.mock("@/components/ui/dropdown-menu", () => ({
+  DropdownMenu: ({ children }: any) => <div>{children}</div>,
+  DropdownMenuTrigger: ({ children }: any) => <div>{children}</div>,
+  DropdownMenuContent: ({ children }: any) => <div>{children}</div>,
+  DropdownMenuItem: ({ children, onClick, disabled, className }: any) => (
+    <button
+      type="button"
+      onClick={disabled ? undefined : onClick}
+      disabled={disabled}
+      className={className}
+    >
+      {children}
+    </button>
+  ),
+  DropdownMenuLabel: ({ children }: any) => <div>{children}</div>,
+  DropdownMenuSeparator: () => <hr />,
+}));
+
+vi.mock("@/components/ui/select", () => ({
+  Select: ({ value, onValueChange, children }: any) => (
+    <div data-testid={`select-wrapper-${value}`}>
+      <select
+        data-testid="mock-select"
+        value={value}
+        onChange={(e) => onValueChange(e.target.value)}
+      >
+        {children}
+      </select>
+    </div>
+  ),
+  SelectTrigger: ({ children }: any) => <>{children}</>,
+  SelectValue: () => null,
+  SelectContent: ({ children }: any) => <>{children}</>,
+  SelectItem: ({ children, value }: any) => (
+    <option value={value}>{children}</option>
+  ),
+}));
+
+vi.mock("@/features/admin/components/block-user-dialog", () => ({
+  BlockUserDialog: ({ user, mode, open, onSuccess, onOpenChange }: any) =>
+    open && user ? (
+      <div data-testid="mock-block-dialog">
+        <span>Dialog mode: {mode}</span>
+        <button
+          type="button"
+          data-testid="mock-dialog-close-btn"
+          onClick={() => onOpenChange(false)}
+        >
+          Cancel
+        </button>
+        <button
+          type="button"
+          data-testid="mock-dialog-success-btn"
+          onClick={() =>
+            onSuccess({
+              ...user,
+              banned: mode === "block",
+            })
+          }
+        >
+          Confirm Success
+        </button>
+      </div>
+    ) : null,
+}));
+
 import { UserManagementTable } from "@/features/admin/components/user-management-table";
 
 const mockUsers = [
@@ -49,9 +115,32 @@ const mockUsers = [
     role: "user",
     banned: true,
     banReason: "Spamming",
+    image: null,
     createdAt: "2026-02-01T00:00:00.000Z",
     updatedAt: "2026-02-01T00:00:00.000Z",
   },
+  {
+    id: "user-3",
+    name: "Good Contributor",
+    email: "good@example.com",
+    emailVerified: true,
+    role: "user",
+    banned: false,
+    image: "https://example.com/avatar3.png",
+    createdAt: "2026-02-05T00:00:00.000Z",
+    updatedAt: "2026-02-05T00:00:00.000Z",
+  },
+  {
+    id: "user-4",
+    name: "Colleague Admin",
+    email: "colleague@example.com",
+    emailVerified: true,
+    role: "admin",
+    banned: false,
+    image: null,
+    createdAt: "2026-02-10T00:00:00.000Z",
+    updatedAt: "2026-02-10T00:00:00.000Z",
+  },
 ];
 
 describe("UserManagementTable", () => {
@@ -59,7 +148,7 @@ describe("UserManagementTable", () => {
     vi.clearAllMocks();
     listAdminUsers.mockResolvedValue({
       users: mockUsers,
-      total: 2,
+      total: 25,
     });
   });
 
@@ -72,13 +161,12 @@ describe("UserManagementTable", () => {
       expect(screen.getByText("Arnab Nandy")).toBeTruthy();
       expect(screen.getByText("arnab@example.com")).toBeTruthy();
       expect(screen.getByText("You")).toBeTruthy();
-      expect(screen.getByText("Admin")).toBeTruthy();
-      expect(screen.getByText("Active")).toBeTruthy();
+      expect(screen.getAllByText("Admin").length).toBeGreaterThanOrEqual(1);
+      expect(screen.getAllByText("Active").length).toBeGreaterThanOrEqual(1);
 
       expect(screen.getByText("Bad Actor")).toBeTruthy();
       expect(screen.getByText("bad@example.com")).toBeTruthy();
-      expect(screen.getByText("Contributor")).toBeTruthy();
-      expect(screen.getByText("Blocked")).toBeTruthy();
+      expect(screen.getAllByText("Blocked").length).toBeGreaterThanOrEqual(1);
     });
   });
 
@@ -129,4 +217,274 @@ describe("UserManagementTable", () => {
       expect(listAdminUsers).toHaveBeenCalledTimes(2);
     });
   });
+
+  it("promotes a contributor to admin", async () => {
+    setUserRole.mockResolvedValue({});
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Good Contributor")).toBeTruthy();
+    });
+
+    const promoteButtons = screen.getAllByText("Promote to Admin");
+    // promoteButtons[1] is for Good Contributor (user-3)
+    fireEvent.click(promoteButtons[1]);
+
+    await waitFor(() => {
+      expect(setUserRole).toHaveBeenCalledWith("user-3", "admin");
+      expect(
+        screen.getByText(/Role for Good Contributor updated to admin/),
+      ).toBeTruthy();
+    });
+  });
+
+  it("demotes an admin to contributor", async () => {
+    setUserRole.mockResolvedValue({});
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Colleague Admin")).toBeTruthy();
+    });
+
+    const demoteButtons = screen.getAllByText("Demote to Contributor");
+    // demoteButtons[1] is for Colleague Admin (user-4); demoteButtons[0] is user-1 (disabled self)
+    fireEvent.click(demoteButtons[1]);
+
+    await waitFor(() => {
+      expect(setUserRole).toHaveBeenCalledWith("user-4", "user");
+      expect(
+        screen.getByText(/Role for Colleague Admin updated to user/),
+      ).toBeTruthy();
+    });
+  });
+
+  it("displays error when role toggle fails", async () => {
+    setUserRole.mockRejectedValue(new Error("Permission denied"));
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Good Contributor")).toBeTruthy();
+    });
+
+    const promoteButtons = screen.getAllByText("Promote to Admin");
+    fireEvent.click(promoteButtons[1]);
+
+    await waitFor(() => {
+      expect(screen.getByText("Permission denied")).toBeTruthy();
+    });
+  });
+
+  it("revokes user sessions", async () => {
+    revokeUserSessions.mockResolvedValue({});
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Good Contributor")).toBeTruthy();
+    });
+
+    const actionButton = screen.getByRole("button", {
+      name: "Actions for Good Contributor",
+    });
+    fireEvent.click(actionButton);
+
+    const revokeButtons = screen.getAllByText("Revoke all sessions");
+    fireEvent.click(revokeButtons[2]);
+
+    await waitFor(() => {
+      expect(revokeUserSessions).toHaveBeenCalledWith("user-3");
+      expect(
+        screen.getByText("Active sessions for Good Contributor were revoked."),
+      ).toBeTruthy();
+    });
+  });
+
+  it("displays error when session revocation fails", async () => {
+    revokeUserSessions.mockRejectedValue(new Error("Revocation failed"));
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Good Contributor")).toBeTruthy();
+    });
+
+    const actionButton = screen.getByRole("button", {
+      name: "Actions for Good Contributor",
+    });
+    fireEvent.click(actionButton);
+
+    const revokeButtons = screen.getAllByText("Revoke all sessions");
+    fireEvent.click(revokeButtons[2]);
+
+    await waitFor(() => {
+      expect(screen.getByText("Revocation failed")).toBeTruthy();
+    });
+  });
+
+  it("handles pagination next and previous controls", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Page 1 of 3")).toBeTruthy();
+    });
+
+    const nextButton = screen.getByRole("button", { name: "Next" });
+    fireEvent.click(nextButton);
+
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({ offset: 10 }),
+      );
+    });
+
+    const prevButton = screen.getByRole("button", { name: "Previous" });
+    fireEvent.click(prevButton);
+
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({ offset: 0 }),
+      );
+    });
+  });
+
+  it("displays error banner when user list fetching fails", async () => {
+    listAdminUsers.mockRejectedValue(new Error("Network timeout"));
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Network timeout")).toBeTruthy();
+    });
+  });
+
+  it("displays fallback error message when list fetching throws non-Error", async () => {
+    listAdminUsers.mockRejectedValue("Unknown error");
+
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Failed to load users.")).toBeTruthy();
+    });
+  });
+
+  it("updates status and role filters", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Arnab Nandy")).toBeTruthy();
+    });
+
+    const selects = screen.getAllByTestId("mock-select");
+    const statusSelect = selects[0];
+    const roleSelect = selects[1];
+
+    // Filter by blocked
+    fireEvent.change(statusSelect, { target: { value: "blocked" } });
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({
+          filterField: "banned",
+          filterValue: true,
+        }),
+      );
+    });
+
+    // Filter by active
+    fireEvent.change(statusSelect, { target: { value: "active" } });
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({
+          filterField: "banned",
+          filterValue: false,
+        }),
+      );
+    });
+
+    // Reset status to all and filter by role admin
+    fireEvent.change(statusSelect, { target: { value: "all" } });
+    fireEvent.change(roleSelect, { target: { value: "admin" } });
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({
+          filterField: "role",
+          filterValue: "admin",
+        }),
+      );
+    });
+
+    // Filter by role user
+    fireEvent.change(roleSelect, { target: { value: "user" } });
+    await waitFor(() => {
+      expect(listAdminUsers).toHaveBeenCalledWith(
+        expect.objectContaining({
+          filterField: "role",
+          filterValue: "user",
+        }),
+      );
+    });
+  });
+
+  it("triggers block dialog and updates user state on success", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Good Contributor")).toBeTruthy();
+    });
+
+    const blockButtons = screen.getAllByText("Block user");
+    // Good Contributor is user-3, whose block button is enabled (user-1 isSelf)
+    fireEvent.click(blockButtons[1]);
+
+    expect(screen.getByText("Dialog mode: block")).toBeTruthy();
+
+    const confirmSuccessBtn = screen.getByTestId("mock-dialog-success-btn");
+    fireEvent.click(confirmSuccessBtn);
+
+    await waitFor(() => {
+      expect(screen.getByText(/has been blocked/)).toBeTruthy();
+    });
+  });
+
+  it("triggers unblock dialog and updates user state on success", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Bad Actor")).toBeTruthy();
+    });
+
+    const unblockButton = screen.getByText("Unblock user");
+    fireEvent.click(unblockButton);
+
+    expect(screen.getByText("Dialog mode: unblock")).toBeTruthy();
+
+    const confirmSuccessBtn = screen.getByTestId("mock-dialog-success-btn");
+    fireEvent.click(confirmSuccessBtn);
+
+    await waitFor(() => {
+      expect(screen.getByText(/has been unblocked/)).toBeTruthy();
+    });
+  });
+
+  it("allows closing the dialog without action", async () => {
+    render(<UserManagementTable currentUserId="user-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Bad Actor")).toBeTruthy();
+    });
+
+    const unblockButton = screen.getByText("Unblock user");
+    fireEvent.click(unblockButton);
+
+    expect(screen.getByTestId("mock-block-dialog")).toBeTruthy();
+
+    const cancelBtn = screen.getByTestId("mock-dialog-close-btn");
+    fireEvent.click(cancelBtn);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId("mock-block-dialog")).toBeNull();
+    });
+  });
 });
diff --git a/vitest.config.ts b/vitest.config.ts
index 01a5e23..dc0ae08 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -21,6 +21,7 @@ export default defineConfig({
         "src/app/page.tsx",
         "src/app/organizations/page.tsx",
         "src/app/pull-requests/page.tsx",
+        "src/app/admin/page.tsx",
         "src/components/theme-provider.tsx",
         "src/app/api/auth/**",
         "src/lib/auth-schema.ts",

From ec2524baa2b7033f1d7c559d357181f7a769b335 Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Sun, 13 Sep 2026 23:15:21 +0530
Subject: [PATCH 3/4] style: synchronize header branding and auth alignment
 across dashboards

Signed-off-by: Arnab Nandy <arnab_nandy7@yahoo.com>
---
 .../issues/components/issue-finder.tsx        | 71 ++++++++++---------
 .../components/organization-dashboard.tsx     | 38 ++++++----
 2 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/src/features/issues/components/issue-finder.tsx b/src/features/issues/components/issue-finder.tsx
index 899a6c6..d3c564b 100644
--- a/src/features/issues/components/issue-finder.tsx
+++ b/src/features/issues/components/issue-finder.tsx
@@ -1754,42 +1754,44 @@ export function IssueFinder() {
   return (
     <main className="min-h-screen bg-background">
       <section className="border-b bg-muted/30">
-        <div className="mx-auto grid w-full max-w-7xl gap-8 px-4 py-8 sm:px-6 lg:grid-cols-[minmax(0,1fr)_360px] lg:px-8">
-          <div className="flex min-w-0 flex-col justify-between gap-8">
-            <div className="space-y-5">
-              <div className="flex flex-wrap items-center justify-between gap-3">
-                <div className="flex flex-wrap items-center gap-2">
-                  <Badge variant="secondary" className="gap-1.5">
-                    <Image
-                      src="/openissue-logo.png"
-                      alt=""
-                      width={16}
-                      height={16}
-                      className="h-4 w-4"
-                    />
-                    OSS Issue Finder
-                  </Badge>
-                  <Badge variant="outline">GitHub Search API</Badge>
-                </div>
-                <div className="flex items-center gap-2">
-                  <AuthControls />
-                  <ThemeToggle />
+        <div className="mx-auto w-full max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
+          <header className="flex flex-wrap items-center justify-between gap-3">
+            <div className="flex flex-wrap items-center gap-2">
+              <Badge variant="secondary" className="gap-1.5">
+                <Image
+                  src="/openissue-logo.png"
+                  alt=""
+                  width={16}
+                  height={16}
+                  className="h-4 w-4"
+                />
+                OSS Issue Finder
+              </Badge>
+              <Badge variant="outline">GitHub Search API</Badge>
+            </div>
+            <div className="flex items-center gap-2">
+              <AuthControls />
+              <ThemeToggle />
+            </div>
+          </header>
+
+          <div className="mt-8 grid gap-8 lg:grid-cols-[minmax(0,1fr)_360px]">
+            <div className="flex min-w-0 flex-col justify-between gap-8">
+              <div className="space-y-5">
+                <DashboardNavigation current="issues" />
+                <div className="max-w-3xl space-y-4">
+                  <h1 className="text-4xl font-semibold tracking-normal text-foreground sm:text-5xl">
+                    Find active open-source issues by tech.
+                  </h1>
+                  <p className="max-w-2xl text-base leading-7 text-muted-foreground sm:text-lg">
+                    Search contributor-friendly GitHub issues with labels like
+                    help wanted, good first issue, up-for-grabs, and
+                    documentation.
+                  </p>
                 </div>
               </div>
-              <DashboardNavigation current="issues" />
-              <div className="max-w-3xl space-y-4">
-                <h1 className="text-4xl font-semibold tracking-normal text-foreground sm:text-5xl">
-                  Find active open-source issues by tech.
-                </h1>
-                <p className="max-w-2xl text-base leading-7 text-muted-foreground sm:text-lg">
-                  Search contributor-friendly GitHub issues with labels like
-                  help wanted, good first issue, up-for-grabs, and
-                  documentation.
-                </p>
-              </div>
-            </div>
 
-            <form
+              <form
               onSubmit={searchIssues}
               className="grid min-w-0 gap-3 rounded-lg border bg-card p-3 shadow-sm sm:grid-cols-2 lg:grid-cols-3"
             >
@@ -1976,7 +1978,8 @@ export function IssueFinder() {
             data={data}
           />
         </div>
-      </section>
+      </div>
+    </section>
 
       <section className="mx-auto grid w-full max-w-7xl gap-6 px-4 py-6 sm:px-6 lg:grid-cols-[260px_minmax(0,1fr)] lg:px-8">
         <IssueFinderSidebar
diff --git a/src/features/organizations/components/organization-dashboard.tsx b/src/features/organizations/components/organization-dashboard.tsx
index 6893245..813c546 100644
--- a/src/features/organizations/components/organization-dashboard.tsx
+++ b/src/features/organizations/components/organization-dashboard.tsx
@@ -482,25 +482,37 @@ export function OrganizationDashboard() {
   return (
     <div className="min-h-screen bg-background text-foreground">
       <div className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
-        <header className="mb-8 space-y-4">
-          <div className="flex flex-wrap items-center justify-between gap-4">
-            <div className="flex items-center gap-3">
-              <DashboardNavigation current="organizations" />
-            </div>
-            <div className="flex items-center gap-3">
-              <AuthControls />
-              <ThemeToggle />
-            </div>
+        <header className="flex flex-wrap items-center justify-between gap-3">
+          <div className="flex flex-wrap items-center gap-2">
+            <Badge variant="secondary" className="gap-1.5">
+              <Image
+                src="/openissue-logo.png"
+                alt=""
+                width={16}
+                height={16}
+                className="h-4 w-4"
+              />
+              OSS Issue Finder
+            </Badge>
+            <Badge variant="outline">GitHub Search API</Badge>
           </div>
-          <div className="max-w-3xl space-y-2">
-            <h1 className="text-3xl font-bold tracking-tight text-foreground sm:text-4xl">
+          <div className="flex items-center gap-2">
+            <AuthControls />
+            <ThemeToggle />
+          </div>
+        </header>
+
+        <div className="mt-8 mb-8 space-y-5">
+          <DashboardNavigation current="organizations" />
+          <div className="max-w-3xl space-y-4">
+            <h1 className="text-4xl font-semibold tracking-normal text-foreground sm:text-5xl">
               Find issues by organization.
             </h1>
-            <p className="text-sm text-muted-foreground">
+            <p className="max-w-2xl text-base leading-7 text-muted-foreground sm:text-lg">
               Discover issues across top open-source organizations filtered by your preferred technology.
             </p>
           </div>
-        </header>
+        </div>
 
         <main className="space-y-6">
           <SearchSession key={query} query={query} />

From 1cec979a0658d730f1cf41aeb26e84b778ace3b6 Mon Sep 17 00:00:00 2001
From: Arnab Nandy <arnab_nandy7@yahoo.com>
Date: Sun, 13 Sep 2026 23:23:15 +0530
Subject: [PATCH 4/4] refactor(admin): eliminate nested ternaries and simplify
 nullish coalescing

Signed-off-by: Arnab Nandy <arnab_nandy7@yahoo.com>
---
 .../admin/components/block-user-dialog.tsx    |  15 +-
 .../components/user-management-table.tsx      | 446 +++++++++---------
 src/features/admin/lib/admin-users-client.ts  |   2 +-
 3 files changed, 235 insertions(+), 228 deletions(-)

diff --git a/src/features/admin/components/block-user-dialog.tsx b/src/features/admin/components/block-user-dialog.tsx
index 406569d..550e2b5 100644
--- a/src/features/admin/components/block-user-dialog.tsx
+++ b/src/features/admin/components/block-user-dialog.tsx
@@ -98,6 +98,13 @@ export function BlockUserDialog({
     }
   }
 
+  let actionIcon = <CheckCircle2 className="size-4" />;
+  if (isSubmitting) {
+    actionIcon = <Loader2 className="size-4 animate-spin" />;
+  } else if (isBlock) {
+    actionIcon = <Ban className="size-4" />;
+  }
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="sm:max-w-md">
@@ -180,13 +187,7 @@ export function BlockUserDialog({
             disabled={isSubmitting}
             className="gap-2"
           >
-            {isSubmitting ? (
-              <Loader2 className="size-4 animate-spin" />
-            ) : isBlock ? (
-              <Ban className="size-4" />
-            ) : (
-              <CheckCircle2 className="size-4" />
-            )}
+            {actionIcon}
             {isBlock ? "Block User" : "Unblock User"}
           </Button>
         </DialogFooter>
diff --git a/src/features/admin/components/user-management-table.tsx b/src/features/admin/components/user-management-table.tsx
index a567a1b..ba57b3e 100644
--- a/src/features/admin/components/user-management-table.tsx
+++ b/src/features/admin/components/user-management-table.tsx
@@ -81,21 +81,19 @@ export function UserManagementTable({
   useEffect(() => {
     let cancelled = false;
 
-    const filterField =
-      statusFilter === "blocked" || statusFilter === "active"
-        ? "banned"
-        : roleFilter !== "all"
-        ? "role"
-        : undefined;
-
-    const filterValue =
-      statusFilter === "blocked"
-        ? true
-        : statusFilter === "active"
-        ? false
-        : roleFilter !== "all"
-        ? roleFilter
-        : undefined;
+    let filterField: string | undefined;
+    let filterValue: string | number | boolean | undefined;
+
+    if (statusFilter === "blocked") {
+      filterField = "banned";
+      filterValue = true;
+    } else if (statusFilter === "active") {
+      filterField = "banned";
+      filterValue = false;
+    } else if (roleFilter !== "all") {
+      filterField = "role";
+      filterValue = roleFilter;
+    }
 
     void listAdminUsers({
       searchValue: debouncedSearch,
@@ -181,6 +179,218 @@ export function UserManagementTable({
     }
   }
 
+  function renderTableRows() {
+    if (isLoading) {
+      return Array.from({ length: 5 }).map((_, i) => (
+        <tr key={i} className="animate-pulse">
+          <td className="px-4 py-3">
+            <div className="flex items-center gap-3">
+              <Skeleton className="size-8 rounded-full" />
+              <div className="space-y-1">
+                <Skeleton className="h-4 w-28" />
+                <Skeleton className="h-3 w-36" />
+              </div>
+            </div>
+          </td>
+          <td className="px-4 py-3">
+            <Skeleton className="h-5 w-16" />
+          </td>
+          <td className="px-4 py-3">
+            <Skeleton className="h-5 w-16" />
+          </td>
+          <td className="hidden px-4 py-3 md:table-cell">
+            <Skeleton className="h-4 w-24" />
+          </td>
+          <td className="px-4 py-3 text-right">
+            <Skeleton className="ml-auto size-8" />
+          </td>
+        </tr>
+      ));
+    }
+
+    if (users.length === 0) {
+      return (
+        <tr>
+          <td colSpan={5} className="px-4 py-8 text-center text-muted-foreground">
+            No users found matching current filters.
+          </td>
+        </tr>
+      );
+    }
+
+    return users.map((userItem) => {
+      const isSelf = currentUserId === userItem.id;
+      const isAdmin = userItem.role === "admin";
+      const isBanned = Boolean(userItem.banned);
+
+      return (
+        <tr
+          key={userItem.id}
+          className="hover:bg-muted/30 transition-colors"
+        >
+          {/* User Info */}
+          <td className="px-4 py-3">
+            <div className="flex items-center gap-3">
+              {userItem.image ? (
+                <Image
+                  src={userItem.image}
+                  alt=""
+                  width={32}
+                  height={32}
+                  className="size-8 rounded-full"
+                />
+              ) : (
+                <div className="flex size-8 items-center justify-center rounded-full bg-muted font-medium text-xs text-muted-foreground">
+                  {userItem.name?.slice(0, 2).toUpperCase() || "U"}
+                </div>
+              )}
+              <div className="flex flex-col">
+                <div className="flex items-center gap-1.5 font-medium">
+                  <span>{userItem.name}</span>
+                  {isSelf ? (
+                    <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground font-normal">
+                      You
+                    </span>
+                  ) : null}
+                </div>
+                <span className="text-xs text-muted-foreground">
+                  {userItem.email}
+                </span>
+              </div>
+            </div>
+          </td>
+
+          {/* Role */}
+          <td className="px-4 py-3">
+            {isAdmin ? (
+              <Badge
+                variant="secondary"
+                className="gap-1 border-primary/20 bg-primary/10 text-primary hover:bg-primary/20"
+              >
+                <Shield className="size-3" />
+                Admin
+              </Badge>
+            ) : (
+              <Badge variant="outline" className="text-muted-foreground">
+                Contributor
+              </Badge>
+            )}
+          </td>
+
+          {/* Status */}
+          <td className="px-4 py-3">
+            {isBanned ? (
+              <Badge
+                variant="destructive"
+                className="gap-1"
+                title={
+                  userItem.banReason
+                    ? `Reason: ${userItem.banReason}`
+                    : "Account blocked"
+                }
+              >
+                <Ban className="size-3" />
+                Blocked
+              </Badge>
+            ) : (
+              <Badge
+                variant="outline"
+                className="gap-1 border-emerald-500/30 text-emerald-600 dark:text-emerald-400"
+              >
+                <CheckCircle2 className="size-3" />
+                Active
+              </Badge>
+            )}
+          </td>
+
+          {/* Joined Date */}
+          <td className="hidden px-4 py-3 text-xs text-muted-foreground md:table-cell">
+            {new Date(userItem.createdAt).toLocaleDateString(undefined, {
+              year: "numeric",
+              month: "short",
+              day: "numeric",
+            })}
+          </td>
+
+          {/* Actions */}
+          <td className="px-4 py-3 text-right">
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon-sm"
+                  aria-label={`Actions for ${userItem.name}`}
+                >
+                  <MoreHorizontal className="size-4" />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end" className="w-48">
+                <DropdownMenuLabel>Actions</DropdownMenuLabel>
+                <DropdownMenuSeparator />
+
+                {/* Block / Unblock action */}
+                {isBanned ? (
+                  <DropdownMenuItem
+                    onClick={() => {
+                      setDialogUser(userItem);
+                      setDialogMode("unblock");
+                      setIsDialogOpen(true);
+                    }}
+                    className="gap-2 text-emerald-600 dark:text-emerald-400"
+                  >
+                    <UserCheck className="size-4" />
+                    Unblock user
+                  </DropdownMenuItem>
+                ) : (
+                  <DropdownMenuItem
+                    onClick={() => {
+                      setDialogUser(userItem);
+                      setDialogMode("block");
+                      setIsDialogOpen(true);
+                    }}
+                    disabled={isSelf}
+                    className="gap-2 text-destructive focus:text-destructive"
+                  >
+                    <UserX className="size-4" />
+                    Block user
+                  </DropdownMenuItem>
+                )}
+
+                {/* Role toggle */}
+                <DropdownMenuItem
+                  onClick={() => void handleToggleRole(userItem)}
+                  disabled={isSelf}
+                  className="gap-2"
+                >
+                  {isAdmin ? (
+                    <>
+                      <ShieldAlert className="size-4 text-amber-500" />
+                      Demote to Contributor
+                    </>
+                  ) : (
+                    <>
+                      <ShieldCheck className="size-4 text-primary" />
+                      Promote to Admin
+                    </>
+                  )}
+                </DropdownMenuItem>
+
+                {/* Revoke sessions */}
+                <DropdownMenuItem
+                  onClick={() => void handleRevokeSessions(userItem)}
+                  className="gap-2 text-muted-foreground"
+                >
+                  <KeyRound className="size-4" />
+                  Revoke all sessions
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </td>
+        </tr>
+      );
+    });
+  }
+
   const currentPage = Math.floor(offset / PAGE_SIZE) + 1;
   const totalPages = Math.ceil(total / PAGE_SIZE) || 1;
 
@@ -286,211 +496,7 @@ export function UserManagementTable({
             </tr>
           </thead>
           <tbody className="divide-y">
-            {isLoading ? (
-              Array.from({ length: 5 }).map((_, i) => (
-                <tr key={i} className="animate-pulse">
-                  <td className="px-4 py-3">
-                    <div className="flex items-center gap-3">
-                      <Skeleton className="size-8 rounded-full" />
-                      <div className="space-y-1">
-                        <Skeleton className="h-4 w-28" />
-                        <Skeleton className="h-3 w-36" />
-                      </div>
-                    </div>
-                  </td>
-                  <td className="px-4 py-3">
-                    <Skeleton className="h-5 w-16" />
-                  </td>
-                  <td className="px-4 py-3">
-                    <Skeleton className="h-5 w-16" />
-                  </td>
-                  <td className="hidden px-4 py-3 md:table-cell">
-                    <Skeleton className="h-4 w-24" />
-                  </td>
-                  <td className="px-4 py-3 text-right">
-                    <Skeleton className="ml-auto size-8" />
-                  </td>
-                </tr>
-              ))
-            ) : users.length === 0 ? (
-              <tr>
-                <td colSpan={5} className="px-4 py-8 text-center text-muted-foreground">
-                  No users found matching current filters.
-                </td>
-              </tr>
-            ) : (
-              users.map((userItem) => {
-                const isSelf = currentUserId === userItem.id;
-                const isAdmin = userItem.role === "admin";
-                const isBanned = Boolean(userItem.banned);
-
-                return (
-                  <tr
-                    key={userItem.id}
-                    className="hover:bg-muted/30 transition-colors"
-                  >
-                    {/* User Info */}
-                    <td className="px-4 py-3">
-                      <div className="flex items-center gap-3">
-                        {userItem.image ? (
-                          <Image
-                            src={userItem.image}
-                            alt=""
-                            width={32}
-                            height={32}
-                            className="size-8 rounded-full"
-                          />
-                        ) : (
-                          <div className="flex size-8 items-center justify-center rounded-full bg-muted font-medium text-xs text-muted-foreground">
-                            {userItem.name?.slice(0, 2).toUpperCase() || "U"}
-                          </div>
-                        )}
-                        <div className="flex flex-col">
-                          <div className="flex items-center gap-1.5 font-medium">
-                            <span>{userItem.name}</span>
-                            {isSelf ? (
-                              <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground font-normal">
-                                You
-                              </span>
-                            ) : null}
-                          </div>
-                          <span className="text-xs text-muted-foreground">
-                            {userItem.email}
-                          </span>
-                        </div>
-                      </div>
-                    </td>
-
-                    {/* Role */}
-                    <td className="px-4 py-3">
-                      {isAdmin ? (
-                        <Badge
-                          variant="secondary"
-                          className="gap-1 border-primary/20 bg-primary/10 text-primary hover:bg-primary/20"
-                        >
-                          <Shield className="size-3" />
-                          Admin
-                        </Badge>
-                      ) : (
-                        <Badge variant="outline" className="text-muted-foreground">
-                          Contributor
-                        </Badge>
-                      )}
-                    </td>
-
-                    {/* Status */}
-                    <td className="px-4 py-3">
-                      {isBanned ? (
-                        <Badge
-                          variant="destructive"
-                          className="gap-1"
-                          title={
-                            userItem.banReason
-                              ? `Reason: ${userItem.banReason}`
-                              : "Account blocked"
-                          }
-                        >
-                          <Ban className="size-3" />
-                          Blocked
-                        </Badge>
-                      ) : (
-                        <Badge
-                          variant="outline"
-                          className="gap-1 border-emerald-500/30 text-emerald-600 dark:text-emerald-400"
-                        >
-                          <CheckCircle2 className="size-3" />
-                          Active
-                        </Badge>
-                      )}
-                    </td>
-
-                    {/* Joined Date */}
-                    <td className="hidden px-4 py-3 text-xs text-muted-foreground md:table-cell">
-                      {new Date(userItem.createdAt).toLocaleDateString(undefined, {
-                        year: "numeric",
-                        month: "short",
-                        day: "numeric",
-                      })}
-                    </td>
-
-                    {/* Actions */}
-                    <td className="px-4 py-3 text-right">
-                      <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                          <Button
-                            variant="ghost"
-                            size="icon-sm"
-                            aria-label={`Actions for ${userItem.name}`}
-                          >
-                            <MoreHorizontal className="size-4" />
-                          </Button>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent align="end" className="w-48">
-                          <DropdownMenuLabel>Actions</DropdownMenuLabel>
-                          <DropdownMenuSeparator />
-
-                          {/* Block / Unblock action */}
-                          {isBanned ? (
-                            <DropdownMenuItem
-                              onClick={() => {
-                                setDialogUser(userItem);
-                                setDialogMode("unblock");
-                                setIsDialogOpen(true);
-                              }}
-                              className="gap-2 text-emerald-600 dark:text-emerald-400"
-                            >
-                              <UserCheck className="size-4" />
-                              Unblock user
-                            </DropdownMenuItem>
-                          ) : (
-                            <DropdownMenuItem
-                              onClick={() => {
-                                setDialogUser(userItem);
-                                setDialogMode("block");
-                                setIsDialogOpen(true);
-                              }}
-                              disabled={isSelf}
-                              className="gap-2 text-destructive focus:text-destructive"
-                            >
-                              <UserX className="size-4" />
-                              Block user
-                            </DropdownMenuItem>
-                          )}
-
-                          {/* Role toggle */}
-                          <DropdownMenuItem
-                            onClick={() => void handleToggleRole(userItem)}
-                            disabled={isSelf}
-                            className="gap-2"
-                          >
-                            {isAdmin ? (
-                              <>
-                                <ShieldAlert className="size-4 text-amber-500" />
-                                Demote to Contributor
-                              </>
-                            ) : (
-                              <>
-                                <ShieldCheck className="size-4 text-primary" />
-                                Promote to Admin
-                              </>
-                            )}
-                          </DropdownMenuItem>
-
-                          {/* Revoke sessions */}
-                          <DropdownMenuItem
-                            onClick={() => void handleRevokeSessions(userItem)}
-                            className="gap-2 text-muted-foreground"
-                          >
-                            <KeyRound className="size-4" />
-                            Revoke all sessions
-                          </DropdownMenuItem>
-                        </DropdownMenuContent>
-                      </DropdownMenu>
-                    </td>
-                  </tr>
-                );
-              })
-            )}
+            {renderTableRows()}
           </tbody>
         </table>
       </div>
diff --git a/src/features/admin/lib/admin-users-client.ts b/src/features/admin/lib/admin-users-client.ts
index 46a7d24..90c50d9 100644
--- a/src/features/admin/lib/admin-users-client.ts
+++ b/src/features/admin/lib/admin-users-client.ts
@@ -38,7 +38,7 @@ export async function listAdminUsers(params: ListUsersParams = {}) {
       sortBy: params.sortBy ?? "createdAt",
       sortDirection: params.sortDirection ?? "desc",
       filterField: params.filterField || undefined,
-      filterValue: params.filterValue !== undefined ? params.filterValue : undefined,
+      filterValue: params.filterValue ?? undefined,
       filterOperator: params.filterOperator || undefined,
     },
   });