dev #1
@ -254,6 +254,8 @@ func setupRouter(
|
|||||||
// ===== 认证路由 =====
|
// ===== 认证路由 =====
|
||||||
api.HandleFunc("/auth/login", authHandler.Login).Methods(http.MethodPost)
|
api.HandleFunc("/auth/login", authHandler.Login).Methods(http.MethodPost)
|
||||||
api.HandleFunc("/auth/refresh", authHandler.RefreshToken).Methods(http.MethodPost)
|
api.HandleFunc("/auth/refresh", authHandler.RefreshToken).Methods(http.MethodPost)
|
||||||
|
api.HandleFunc("/auth/status", authHandler.AuthStatus).Methods(http.MethodGet)
|
||||||
|
api.HandleFunc("/auth/setup", authHandler.Setup).Methods(http.MethodPost)
|
||||||
|
|
||||||
protected := api.PathPrefix("").Subrouter()
|
protected := api.PathPrefix("").Subrouter()
|
||||||
protected.Use(authMiddleware(authService))
|
protected.Use(authMiddleware(authService))
|
||||||
|
|||||||
@ -250,6 +250,54 @@ func loginRateLimitKey(r *http.Request, username string) string {
|
|||||||
return strings.ToLower(strings.TrimSpace(username)) + "|" + client
|
return strings.ToLower(strings.TrimSpace(username)) + "|" + client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AuthStatus returns whether the system needs initial setup (no admin exists).
|
||||||
|
func (h *AuthHandler) AuthStatus(w http.ResponseWriter, r *http.Request) {
|
||||||
|
hasAdmin, err := h.authService.IsAdminExists(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
respondError(w, http.StatusInternalServerError, "Failed to check status", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
respondJSON(w, http.StatusOK, map[string]any{
|
||||||
|
"needsSetup": !hasAdmin,
|
||||||
|
"hasUsers": hasAdmin,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup creates the first admin user. Only works when no admin exists.
|
||||||
|
func (h *AuthHandler) Setup(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req struct {
|
||||||
|
Username string `json:"username"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
respondError(w, http.StatusBadRequest, "Invalid request body", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(req.Username) == "" || strings.TrimSpace(req.Password) == "" {
|
||||||
|
respondError(w, http.StatusBadRequest, "Missing fields", "username and password are required")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := h.authService.SetupInitialAdmin(r.Context(), req.Username, req.Password, req.Email)
|
||||||
|
if err != nil {
|
||||||
|
respondServiceError(w, err, "Failed to create initial admin")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate access token immediately
|
||||||
|
accessToken, refreshToken, _, err := h.authService.Login(r.Context(), req.Username, req.Password)
|
||||||
|
if err != nil {
|
||||||
|
respondServiceError(w, err, "Admin created but login failed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
respondJSON(w, http.StatusCreated, map[string]string{
|
||||||
|
"accessToken": accessToken,
|
||||||
|
"refreshToken": refreshToken,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (h *AuthHandler) convertUserResponse(ctx context.Context, user *entity.User) *dto.UserResponse {
|
func (h *AuthHandler) convertUserResponse(ctx context.Context, user *entity.User) *dto.UserResponse {
|
||||||
workspace, _ := h.authService.GetWorkspaceByID(ctx, user.WorkspaceID)
|
workspace, _ := h.authService.GetWorkspaceByID(ctx, user.WorkspaceID)
|
||||||
return &dto.UserResponse{
|
return &dto.UserResponse{
|
||||||
|
|||||||
@ -80,6 +80,55 @@ type UserWorkspaceOptions struct {
|
|||||||
QuotaGPUMem string
|
QuotaGPUMem string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsAdminExists checks whether any admin user already exists in the database.
|
||||||
|
func (s *AuthService) IsAdminExists(ctx context.Context) (bool, error) {
|
||||||
|
users, err := s.userRepo.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
for _, u := range users {
|
||||||
|
if u.Role == authz.RoleAdmin {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetupInitialAdmin creates the first admin user. Fails if an admin already exists.
|
||||||
|
func (s *AuthService) SetupInitialAdmin(ctx context.Context, username, password, email string) (*entity.User, error) {
|
||||||
|
hasAdmin, err := s.IsAdminExists(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if hasAdmin {
|
||||||
|
return nil, entity.ErrForbidden
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hash password
|
||||||
|
passwordHash, err := s.passwordHasher.Hash(password)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if email == "" {
|
||||||
|
email = username + "@local.ocdp"
|
||||||
|
}
|
||||||
|
|
||||||
|
user := entity.NewUser(username, passwordHash, email)
|
||||||
|
user.ID = uuid.New().String()
|
||||||
|
user.Role = authz.RoleAdmin
|
||||||
|
user.WorkspaceID = entity.DefaultWorkspaceID
|
||||||
|
user.IsActive = true
|
||||||
|
|
||||||
|
if err := user.Validate(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := s.userRepo.Create(ctx, user); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (s *AuthService) Register(ctx context.Context, username, password, role, workspaceID string, opts UserWorkspaceOptions, isActive, mustChangePassword *bool) (*entity.User, error) {
|
func (s *AuthService) Register(ctx context.Context, username, password, role, workspaceID string, opts UserWorkspaceOptions, isActive, mustChangePassword *bool) (*entity.User, error) {
|
||||||
principal, err := authz.RequirePrincipal(ctx)
|
principal, err := authz.RequirePrincipal(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -219,6 +219,10 @@ export type NodeMetricsResponse = GeneratedNodeMetricsResponse;
|
|||||||
export const login = postAuthLogin;
|
export const login = postAuthLogin;
|
||||||
export const register = postAuthRegister;
|
export const register = postAuthRegister;
|
||||||
export const refreshAuth = postAuthRefresh;
|
export const refreshAuth = postAuthRefresh;
|
||||||
|
export const fetchAuthStatus = () =>
|
||||||
|
AXIOS_INSTANCE.get<{ needsSetup: boolean; hasUsers: boolean }>("/auth/status").then((r) => r.data);
|
||||||
|
export const setupInitialAdmin = (data: { username: string; password: string; email?: string }) =>
|
||||||
|
AXIOS_INSTANCE.post<{ accessToken: string; refreshToken: string }>("/auth/setup", data).then((r) => r.data);
|
||||||
export const listUsers = () => customAxiosInstance<UserResponse[]>({ url: "/users", method: "GET" });
|
export const listUsers = () => customAxiosInstance<UserResponse[]>({ url: "/users", method: "GET" });
|
||||||
export const createUser = (data: AdminCreateUserRequest) =>
|
export const createUser = (data: AdminCreateUserRequest) =>
|
||||||
customAxiosInstance<UserResponse>({ url: "/users", method: "POST", data });
|
customAxiosInstance<UserResponse>({ url: "/users", method: "POST", data });
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { LogIn, Loader2, ShieldCheck } from "lucide-react";
|
import { LogIn, Loader2, ShieldCheck, UserPlus } from "lucide-react";
|
||||||
import { useToast } from "@/shared";
|
import { useToast } from "@/shared";
|
||||||
import { getErrorMessage } from "@/shared/utils/handleApiError";
|
import { getErrorMessage } from "@/shared/utils/handleApiError";
|
||||||
import { login as apiLogin, type AuthResponse } from "@/api";
|
import { login as apiLogin, fetchAuthStatus, setupInitialAdmin, type AuthResponse } from "@/api";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
onLogin: (response: AuthResponse) => void;
|
onLogin: (response: AuthResponse) => void;
|
||||||
@ -13,12 +13,76 @@ const AuthPage: React.FC<Props> = ({ onLogin }) => {
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { success: toastSuccess, error: toastError, info: toastInfo } = useToast();
|
const { success: toastSuccess, error: toastError, info: toastInfo } = useToast();
|
||||||
|
|
||||||
|
// Auth status
|
||||||
|
const [needsSetup, setNeedsSetup] = useState<boolean | null>(null);
|
||||||
|
const [checkingStatus, setCheckingStatus] = useState(true);
|
||||||
|
|
||||||
// Login form
|
// Login form
|
||||||
const [loginUsername, setLoginUsername] = useState("");
|
const [loginUsername, setLoginUsername] = useState("");
|
||||||
const [loginPassword, setLoginPassword] = useState("");
|
const [loginPassword, setLoginPassword] = useState("");
|
||||||
const [loginLoading, setLoginLoading] = useState(false);
|
const [loginLoading, setLoginLoading] = useState(false);
|
||||||
const [loginError, setLoginError] = useState<string | null>(null);
|
const [loginError, setLoginError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
// Setup form
|
||||||
|
const [setupUsername, setSetupUsername] = useState("");
|
||||||
|
const [setupPassword, setSetupPassword] = useState("");
|
||||||
|
const [setupEmail, setSetupEmail] = useState("");
|
||||||
|
const [setupLoading, setSetupLoading] = useState(false);
|
||||||
|
const [setupError, setSetupError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
// Check if setup is needed on mount
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
fetchAuthStatus()
|
||||||
|
.then((status) => {
|
||||||
|
if (!cancelled) {
|
||||||
|
setNeedsSetup(status.needsSetup);
|
||||||
|
setCheckingStatus(false);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
if (!cancelled) {
|
||||||
|
setNeedsSetup(false); // fall back to login on error
|
||||||
|
setCheckingStatus(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return () => { cancelled = true; };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Handle setup (first admin registration)
|
||||||
|
const handleSetup = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!setupUsername || !setupPassword) return;
|
||||||
|
|
||||||
|
setSetupLoading(true);
|
||||||
|
setSetupError(null);
|
||||||
|
toastInfo("Creating admin account...", { title: "Setup", durationMs: 1200 });
|
||||||
|
|
||||||
|
try {
|
||||||
|
await setupInitialAdmin({
|
||||||
|
username: setupUsername,
|
||||||
|
password: setupPassword,
|
||||||
|
email: setupEmail || undefined,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Login with the returned tokens
|
||||||
|
const loginResponse = await apiLogin({
|
||||||
|
username: setupUsername,
|
||||||
|
password: setupPassword,
|
||||||
|
});
|
||||||
|
|
||||||
|
toastSuccess("Admin account created. Welcome!");
|
||||||
|
onLogin(loginResponse);
|
||||||
|
navigate("/home", { replace: true });
|
||||||
|
} catch (err: unknown) {
|
||||||
|
const msg = getErrorMessage(err, "Setup failed. Please try again later.");
|
||||||
|
setSetupError(msg);
|
||||||
|
toastError(msg);
|
||||||
|
} finally {
|
||||||
|
setSetupLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Handle login
|
// Handle login
|
||||||
const handleLogin = async (e: React.FormEvent) => {
|
const handleLogin = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@ -30,8 +94,6 @@ const AuthPage: React.FC<Props> = ({ onLogin }) => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await apiLogin({ username: loginUsername, password: loginPassword });
|
const response = await apiLogin({ username: loginUsername, password: loginPassword });
|
||||||
|
|
||||||
// JWT 格式: { access_token, refresh_token, username, ... }
|
|
||||||
toastSuccess(`Welcome, ${response.username}!`);
|
toastSuccess(`Welcome, ${response.username}!`);
|
||||||
onLogin(response);
|
onLogin(response);
|
||||||
navigate("/home", { replace: true });
|
navigate("/home", { replace: true });
|
||||||
@ -40,7 +102,6 @@ const AuthPage: React.FC<Props> = ({ onLogin }) => {
|
|||||||
const msg = raw?.message?.includes("Failed to fetch")
|
const msg = raw?.message?.includes("Failed to fetch")
|
||||||
? "Network or CORS error: Please check backend CORS or use Vite proxy in development."
|
? "Network or CORS error: Please check backend CORS or use Vite proxy in development."
|
||||||
: getErrorMessage(err, "Login failed. Please try again later.");
|
: getErrorMessage(err, "Login failed. Please try again later.");
|
||||||
|
|
||||||
setLoginError(msg);
|
setLoginError(msg);
|
||||||
toastError(msg);
|
toastError(msg);
|
||||||
} finally {
|
} finally {
|
||||||
@ -48,6 +109,83 @@ const AuthPage: React.FC<Props> = ({ onLogin }) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (checkingStatus) {
|
||||||
|
return (
|
||||||
|
<div className="relative min-h-screen bg-slate-50 flex items-center justify-center">
|
||||||
|
<Loader2 className="w-8 h-8 text-blue-500 animate-spin" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup view — first admin registration
|
||||||
|
if (needsSetup) {
|
||||||
|
return (
|
||||||
|
<div className="relative min-h-screen bg-slate-50 text-slate-900 flex items-center justify-center px-4 sm:px-6">
|
||||||
|
<div className="pointer-events-none absolute inset-0 bg-app-gradient opacity-90" aria-hidden="true" />
|
||||||
|
<div className="relative w-full max-w-md p-6 sm:p-7 bg-white/95 border border-slate-200 rounded-lg shadow-2xl backdrop-blur-xl">
|
||||||
|
<div className="animate-fadeIn">
|
||||||
|
<header className="mb-6 text-center">
|
||||||
|
<ShieldCheck className="w-11 h-11 text-emerald-600 mx-auto mb-3" />
|
||||||
|
<h1 className="text-2xl font-semibold text-slate-900">OCDP Initial Setup</h1>
|
||||||
|
<p className="text-slate-600 text-sm mt-1">Create the first administrator account to get started.</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<form onSubmit={handleSetup} className="space-y-4">
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm text-slate-600">Admin Username</label>
|
||||||
|
<input
|
||||||
|
value={setupUsername}
|
||||||
|
onChange={(e) => setSetupUsername(e.target.value)}
|
||||||
|
className="mt-1 w-full bg-white border border-slate-200 rounded-lg p-2 text-slate-900 focus:ring-2 focus:ring-emerald-500 focus:border-emerald-600 focus:outline-none transition-shadow"
|
||||||
|
autoComplete="username"
|
||||||
|
autoFocus
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm text-slate-600">Password</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={setupPassword}
|
||||||
|
onChange={(e) => setSetupPassword(e.target.value)}
|
||||||
|
className="mt-1 w-full bg-white border border-slate-200 rounded-lg p-2 text-slate-900 focus:ring-2 focus:ring-emerald-500 focus:border-emerald-600 focus:outline-none transition-shadow"
|
||||||
|
autoComplete="new-password"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="block text-sm text-slate-600">Email (optional)</label>
|
||||||
|
<input
|
||||||
|
type="email"
|
||||||
|
value={setupEmail}
|
||||||
|
onChange={(e) => setSetupEmail(e.target.value)}
|
||||||
|
className="mt-1 w-full bg-white border border-slate-200 rounded-lg p-2 text-slate-900 focus:ring-2 focus:ring-emerald-500 focus:border-emerald-600 focus:outline-none transition-shadow"
|
||||||
|
autoComplete="email"
|
||||||
|
placeholder="admin@example.com"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={setupLoading}
|
||||||
|
className={`w-full disabled:opacity-60 font-semibold py-2.5 rounded-lg flex items-center justify-center gap-2 transition-colors duration-150
|
||||||
|
${setupLoading ? "bg-emerald-500 cursor-wait text-white" : "bg-emerald-600 text-white hover:bg-emerald-700"}`}
|
||||||
|
>
|
||||||
|
{setupLoading ? <Loader2 className="w-4 h-4 animate-spin" /> : <UserPlus className="w-4 h-4" />}
|
||||||
|
{setupLoading ? "Creating..." : "Create Admin Account"}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{setupError && <p className="text-red-400 text-center text-sm">{setupError}</p>}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regular login view
|
||||||
return (
|
return (
|
||||||
<div className="relative min-h-screen bg-slate-50 text-slate-900 flex items-center justify-center px-4 sm:px-6">
|
<div className="relative min-h-screen bg-slate-50 text-slate-900 flex items-center justify-center px-4 sm:px-6">
|
||||||
<div className="pointer-events-none absolute inset-0 bg-app-gradient opacity-90" aria-hidden="true" />
|
<div className="pointer-events-none absolute inset-0 bg-app-gradient opacity-90" aria-hidden="true" />
|
||||||
|
|||||||
Reference in New Issue
Block a user