@thinhnguyencth1204/nextcli 0.9.0 → 1.0.0

package/templates/next-base/src/features/auth/components/account-panel.tsx

@@ -49,17 +49,29 @@ export function AccountPanel() {
   }, []);
 
   if (loading) {
-    return <p>{t("loading")}</p>;
+    return (
+      <Card className="max-w-xl">
+        <CardContent className="py-8 text-sm text-muted-foreground">
+          {t("loading")}
+        </CardContent>
+      </Card>
+    );
   }
 
   if (!session?.user) {
-    return <p>{t("noSession")}</p>;
+    return (
+      <Card className="max-w-xl">
+        <CardContent className="py-8 text-sm text-muted-foreground">
+          {t("noSession")}
+        </CardContent>
+      </Card>
+    );
   }
 
   return (
     <Card className="max-w-xl">
       <CardHeader>
-        <CardTitle>{t("title")}</CardTitle>
+        <CardTitle>{t("panelTitle")}</CardTitle>
       </CardHeader>
       <CardContent className="space-y-2 text-sm">
         <p>

package/templates/next-base/src/features/auth/components/change-password-form.tsx

@@ -8,7 +8,6 @@ import { toast } from "sonner";
 import { protectedApi } from "@/lib/api/axios";
 import { changePasswordSchema } from "@/features/auth/validations";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
@@ -49,34 +48,32 @@ export function ChangePasswordForm() {
   };
 
   return (
-    <Card>
-      <CardContent className="pt-6">
-        <form onSubmit={onSubmit} className="grid gap-4">
-          <div className="grid gap-2">
-            <Label htmlFor="currentPassword">{t("currentPassword")}</Label>
-            <Input
-              id="currentPassword"
-              type="password"
-              value={currentPassword}
-              onChange={(event) => setCurrentPassword(event.target.value)}
-              required
-            />
-          </div>
-          <div className="grid gap-2">
-            <Label htmlFor="newPassword">{t("newPassword")}</Label>
-            <Input
-              id="newPassword"
-              type="password"
-              value={newPassword}
-              onChange={(event) => setNewPassword(event.target.value)}
-              required
-            />
-          </div>
-          <Button type="submit" disabled={isSubmitting}>
-            {isSubmitting ? t("submitting") : t("submit")}
-          </Button>
-        </form>
-      </CardContent>
-    </Card>
+    <form onSubmit={onSubmit} className="space-y-6">
+      <div className="space-y-2">
+        <Label htmlFor="currentPassword">{t("currentPassword")}</Label>
+        <Input
+          id="currentPassword"
+          type="password"
+          value={currentPassword}
+          onChange={(event) => setCurrentPassword(event.target.value)}
+          className="h-12"
+          required
+        />
+      </div>
+      <div className="space-y-2">
+        <Label htmlFor="newPassword">{t("newPassword")}</Label>
+        <Input
+          id="newPassword"
+          type="password"
+          value={newPassword}
+          onChange={(event) => setNewPassword(event.target.value)}
+          className="h-12"
+          required
+        />
+      </div>
+      <Button type="submit" className="h-12 w-full" disabled={isSubmitting}>
+        {isSubmitting ? t("submitting") : t("submit")}
+      </Button>
+    </form>
   );
 }

package/templates/next-base/src/features/auth/components/sign-in-form.tsx

@@ -6,16 +6,13 @@ import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { toast } from "sonner";
 import { publicApi } from "@/lib/api/axios";
-import { setAccessToken } from "@/lib/api/token-store";
 import { signInSchema } from "@/features/auth/validations";
 import type { ApiSuccess } from "@/types";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
 type LoginResponse = {
-  accessToken: string;
   requirePasswordChange: boolean;
 };
 
@@ -41,14 +38,10 @@ export function SignInForm() {
         withCredentials: true,
       });
       const payload = (response.data as ApiSuccess<LoginResponse>).data;
-      if (!payload?.accessToken) {
-        toast.error(t("missingAccessToken"));
-        return;
-      }
-
-      setAccessToken(payload.accessToken);
       toast.success(t("success"));
-      router.push(payload.requirePasswordChange ? "/change-password" : "/dashboard");
+      router.push(
+        payload.requirePasswordChange ? "/change-password" : "/dashboard",
+      );
       router.refresh();
     } catch (error) {
       const message = error instanceof Error ? error.message : t("failed");
@@ -59,37 +52,35 @@ export function SignInForm() {
   };
 
   return (
-    <Card>
-      <CardContent className="pt-6">
-        <form onSubmit={onSubmit} className="grid gap-4">
-          <div className="grid gap-2">
-            <Label htmlFor="username">{t("username")}</Label>
-            <Input
-              id="username"
-              value={username}
-              onChange={(event) => setUsername(event.target.value)}
-              placeholder={t("usernamePlaceholder")}
-              autoComplete="username"
-              required
-            />
-          </div>
-          <div className="grid gap-2">
-            <Label htmlFor="password">{t("password")}</Label>
-            <Input
-              id="password"
-              type="password"
-              value={password}
-              onChange={(event) => setPassword(event.target.value)}
-              placeholder={t("passwordPlaceholder")}
-              autoComplete="current-password"
-              required
-            />
-          </div>
-          <Button type="submit" disabled={isSubmitting}>
-            {isSubmitting ? t("submitting") : t("submit")}
-          </Button>
-        </form>
-      </CardContent>
-    </Card>
+    <form onSubmit={onSubmit} className="space-y-6">
+      <div className="space-y-2">
+        <Label htmlFor="username">{t("username")}</Label>
+        <Input
+          id="username"
+          value={username}
+          onChange={(event) => setUsername(event.target.value)}
+          placeholder={t("usernamePlaceholder")}
+          autoComplete="username"
+          className="h-12"
+          required
+        />
+      </div>
+      <div className="space-y-2">
+        <Label htmlFor="password">{t("password")}</Label>
+        <Input
+          id="password"
+          type="password"
+          value={password}
+          onChange={(event) => setPassword(event.target.value)}
+          placeholder={t("passwordPlaceholder")}
+          autoComplete="current-password"
+          className="h-12"
+          required
+        />
+      </div>
+      <Button type="submit" className="h-12 w-full" disabled={isSubmitting}>
+        {isSubmitting ? t("submitting") : t("submit")}
+      </Button>
+    </form>
   );
 }

package/templates/next-base/src/lib/api/axios.ts

@@ -1,17 +1,8 @@
 import axios from "axios";
-import {
-  clearAccessToken,
-  getAccessToken,
-  setAccessToken,
-} from "@/lib/api/token-store";
-import type { ApiErrorResponse, ApiSuccess } from "@/types";
+import type { ApiErrorResponse } from "@/types";
 
 const baseURL = process.env.NEXT_PUBLIC_APP_URL ?? "http://localhost:3000";
 
-type RetryableRequestConfig = {
-  _retry?: boolean;
-};
-
 export const publicApi = axios.create({
   baseURL,
   withCredentials: true,
@@ -28,86 +19,6 @@ export const protectedApi = axios.create({
   },
 });
 
-protectedApi.interceptors.request.use((config) => {
-  const token = getAccessToken();
-  if (token) {
-    config.headers = config.headers ?? {};
-    config.headers.Authorization = `Bearer ${token}`;
-  }
-  return config;
-});
-
-let isRefreshing = false;
-let waitingQueue: Array<(token: string | null) => void> = [];
-
-function flushQueue(token: string | null): void {
-  for (const resolve of waitingQueue) {
-    resolve(token);
-  }
-  waitingQueue = [];
-}
-
-async function refreshAccessToken(): Promise<string | null> {
-  try {
-    const response = await publicApi.post("/api/v1/auth/refresh", null, {
-      withCredentials: true,
-    });
-    const token = (response.data as ApiSuccess<{ accessToken: string }>).data
-      ?.accessToken;
-    if (!token) {
-      clearAccessToken();
-      return null;
-    }
-    setAccessToken(token);
-    return token;
-  } catch {
-    clearAccessToken();
-    return null;
-  }
-}
-
-protectedApi.interceptors.response.use(
-  (response) => response,
-  async (error) => {
-    const config = error.config as typeof error.config & RetryableRequestConfig;
-    if (!config || config._retry || error.response?.status !== 401) {
-      return Promise.reject(error);
-    }
-
-    if (isRefreshing) {
-      return new Promise((resolve, reject) => {
-        waitingQueue.push((token) => {
-          if (!token) {
-            reject(error);
-            return;
-          }
-
-          config.headers = config.headers ?? {};
-          config.headers.Authorization = `Bearer ${token}`;
-          resolve(protectedApi(config));
-        });
-      });
-    }
-
-    config._retry = true;
-    isRefreshing = true;
-
-    try {
-      const token = await refreshAccessToken();
-      flushQueue(token);
-      if (!token) {
-        return Promise.reject(error);
-      }
-
-      config.headers = config.headers ?? {};
-      config.headers.Authorization = `Bearer ${token}`;
-      return protectedApi(config);
-    } finally {
-      isRefreshing = false;
-    }
-  },
-);
-
 function extractApiErrorMessage(error: unknown): string {
   if (!axios.isAxiosError(error)) {
     return "Unexpected error occurred.";

package/templates/next-base/src/lib/auth/client.ts

@@ -1,7 +1,7 @@
 import { createAuthClient } from "better-auth/react";
-import { jwtClient, usernameClient } from "better-auth/client/plugins";
+import { usernameClient } from "better-auth/client/plugins";
 
 export const authClient = createAuthClient({
   baseURL: process.env.NEXT_PUBLIC_APP_URL ?? "http://localhost:3000",
-  plugins: [jwtClient(), usernameClient()],
+  plugins: [usernameClient()],
 });

package/templates/next-base/src/lib/auth/server.ts

@@ -1,6 +1,6 @@
 import { betterAuth } from "better-auth/minimal";
 import { prismaAdapter } from "better-auth/adapters/prisma";
-import { jwt, username } from "better-auth/plugins";
+import { username } from "better-auth/plugins";
 import prisma from "@/lib/db/prisma";
 
 const socialProviders = {
@@ -12,7 +12,7 @@ export const auth = betterAuth({
   database: prismaAdapter(prisma, {
     provider: "postgresql",
   }),
-  plugins: [jwt(), username()],
+  plugins: [username()],
   emailAndPassword: {
     enabled: true,
     minPasswordLength: 8,

package/templates/features/api/src/lib/api/token-store.ts

@@ -1,13 +0,0 @@
-let accessToken: string | null = null;
-
-export function getAccessToken(): string | null {
-  return accessToken;
-}
-
-export function setAccessToken(token: string | null): void {
-  accessToken = token;
-}
-
-export function clearAccessToken(): void {
-  accessToken = null;
-}

package/templates/features/auth/src/app/api/v1/auth/refresh/route.ts

@@ -1,32 +0,0 @@
-import { getRefreshCookieName } from "@/lib/auth/cookies";
-import { fail, ok } from "@/lib/api/response";
-
-const authBaseUrl =
-  process.env.BETTER_AUTH_URL ??
-  process.env.NEXT_PUBLIC_APP_URL ??
-  "http://localhost:3000";
-
-export async function POST(request: Request) {
-  const incomingCookie = request.headers.get("cookie") ?? "";
-  if (!incomingCookie.includes(getRefreshCookieName())) {
-    return fail("UNAUTHORIZED", "Refresh cookie is missing.", { status: 401 });
-  }
-
-  const tokenResponse = await fetch(`${authBaseUrl}/api/auth/token`, {
-    method: "GET",
-    headers: {
-      cookie: incomingCookie,
-    },
-  });
-
-  if (!tokenResponse.ok) {
-    return fail("UNAUTHORIZED", "Failed to refresh access token.", {
-      status: tokenResponse.status,
-    });
-  }
-
-  const tokenPayload = await tokenResponse.json();
-  return ok({
-    accessToken: tokenPayload.token,
-  });
-}

package/templates/features/auth/src/lib/auth/cookies.ts

@@ -1,15 +0,0 @@
-const refreshCookieName = "nextcli_refresh_token";
-
-export function refreshCookieOptions() {
-  return {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === "production",
-    sameSite: "lax",
-    path: "/",
-    maxAge: 60 * 60 * 24 * 30,
-  } as const;
-}
-
-export function getRefreshCookieName(): string {
-  return refreshCookieName;
-}

package/templates/next-base/src/app/api/v1/auth/refresh/route.ts

@@ -1,32 +0,0 @@
-import { getRefreshCookieName } from "@/lib/auth/cookies";
-import { fail, ok } from "@/lib/api/response";
-
-const authBaseUrl =
-  process.env.BETTER_AUTH_URL ??
-  process.env.NEXT_PUBLIC_APP_URL ??
-  "http://localhost:3000";
-
-export async function POST(request: Request) {
-  const incomingCookie = request.headers.get("cookie") ?? "";
-  if (!incomingCookie.includes(getRefreshCookieName())) {
-    return fail("UNAUTHORIZED", "Refresh cookie is missing.", { status: 401 });
-  }
-
-  const tokenResponse = await fetch(`${authBaseUrl}/api/auth/token`, {
-    method: "GET",
-    headers: {
-      cookie: incomingCookie,
-    },
-  });
-
-  if (!tokenResponse.ok) {
-    return fail("UNAUTHORIZED", "Failed to refresh access token.", {
-      status: tokenResponse.status,
-    });
-  }
-
-  const tokenPayload = await tokenResponse.json();
-  return ok({
-    accessToken: tokenPayload.token,
-  });
-}

package/templates/next-base/src/lib/api/token-store.ts

@@ -1,13 +0,0 @@
-let accessToken: string | null = null;
-
-export function getAccessToken(): string | null {
-  return accessToken;
-}
-
-export function setAccessToken(token: string | null): void {
-  accessToken = token;
-}
-
-export function clearAccessToken(): void {
-  accessToken = null;
-}

package/templates/next-base/src/lib/auth/cookies.ts

@@ -1,15 +0,0 @@
-const refreshCookieName = "nextcli_refresh_token";
-
-export function refreshCookieOptions() {
-  return {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === "production",
-    sameSite: "lax",
-    path: "/",
-    maxAge: 60 * 60 * 24 * 30,
-  } as const;
-}
-
-export function getRefreshCookieName(): string {
-  return refreshCookieName;
-}