feat(throttling): add global rate limit lockout flow

This commit is contained in:
2026-04-30 15:25:45 +03:30
parent 2772b36447
commit e635fd9c2c
10 changed files with 901 additions and 279 deletions

View File

@@ -1,4 +1,4 @@
import { createBrowserRouter, RouterProvider, Navigate, Outlet } from "react-router-dom" import { createBrowserRouter, RouterProvider, Navigate, Outlet, useLocation } from "react-router-dom"
import { useState } from "react" import { useState } from "react"
import { ThemeProvider } from "./components/ThemeProvider" import { ThemeProvider } from "./components/ThemeProvider"
import { LanguageProvider } from "./components/LanguageProvider" import { LanguageProvider } from "./components/LanguageProvider"
@@ -23,6 +23,8 @@ import Reports from "./pages/Reports"
import Timesheet from "./pages/Timesheet" import Timesheet from "./pages/Timesheet"
import Logs from "./pages/Logs" import Logs from "./pages/Logs"
import NotificationsPage from "./pages/Notifications" import NotificationsPage from "./pages/Notifications"
import RateLimitPage from "./pages/RateLimit"
import { isRateLimitActive } from "./lib/rateLimit"
const MainLayout = () => { const MainLayout = () => {
const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false) const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false)
@@ -46,38 +48,58 @@ const MainLayout = () => {
}; };
const RootRedirect = () => { const RootRedirect = () => {
if (isRateLimitActive()) {
return <Navigate to="/rate-limit" replace />
}
const isAuthenticated = !!localStorage.getItem("accessToken") const isAuthenticated = !!localStorage.getItem("accessToken")
return isAuthenticated ? <Navigate to="/timesheet" replace /> : <Navigate to="/auth" replace /> return isAuthenticated ? <Navigate to="/timesheet" replace /> : <Navigate to="/auth" replace />
} }
const RateLimitGuard = () => {
const location = useLocation()
if (isRateLimitActive() && location.pathname !== "/rate-limit") {
return <Navigate to="/rate-limit" replace />
}
return <Outlet />
}
const router = createBrowserRouter([ const router = createBrowserRouter([
{ {
element: ( element: <RateLimitGuard />,
<WorkspaceProvider>
<Outlet />
</WorkspaceProvider>
),
children: [ children: [
{ path: "/", element: <RootRedirect /> },
{ path: "/auth", element: <Auth /> },
{ path: "/terms", element: <Terms /> },
{ {
element: <MainLayout />, element: (
<WorkspaceProvider>
<Outlet />
</WorkspaceProvider>
),
children: [ children: [
{ path: "/profile", element: <Profile /> }, { path: "/", element: <RootRedirect /> },
{ path: "/timesheet", element: <Timesheet /> }, { path: "/auth", element: <Auth /> },
{ path: "/reports", element: <Reports /> }, { path: "/terms", element: <Terms /> },
{ path: "/notifications", element: <NotificationsPage /> }, { path: "/rate-limit", element: <RateLimitPage /> },
{ path: "/logs", element: <Logs /> }, {
{ path: "/tags", element: <Tags /> }, element: <MainLayout />,
{ path: "/workspaces", element: <Workspaces /> }, children: [
{ path: "/workspaces/create", element: <CreateWorkspace /> }, { path: "/profile", element: <Profile /> },
{ path: "/workspaces/:id", element: <WorkspaceDetail /> }, { path: "/timesheet", element: <Timesheet /> },
{ path: "/workspaces/:id/edit", element: <EditWorkspace /> }, { path: "/reports", element: <Reports /> },
{ path: "/clients", element: <Clients /> }, { path: "/notifications", element: <NotificationsPage /> },
{ path: "/projects", element: <Projects /> }, { path: "/logs", element: <Logs /> },
{ path: "/projects/create", element: <ProjectCreate /> }, { path: "/tags", element: <Tags /> },
{ path: "/projects/:id/edit", element: <ProjectEdit /> }, { path: "/workspaces", element: <Workspaces /> },
{ path: "/workspaces/create", element: <CreateWorkspace /> },
{ path: "/workspaces/:id", element: <WorkspaceDetail /> },
{ path: "/workspaces/:id/edit", element: <EditWorkspace /> },
{ path: "/clients", element: <Clients /> },
{ path: "/projects", element: <Projects /> },
{ path: "/projects/create", element: <ProjectCreate /> },
{ path: "/projects/:id/edit", element: <ProjectEdit /> },
],
},
], ],
}, },
], ],

View File

@@ -1,4 +1,10 @@
import { API_BASE_URL } from "../config/constants" import { API_BASE_URL } from "../config/constants"
import {
activateRateLimitLock,
getRateLimitRemainingSeconds,
getStoredRateLimitLock,
isRateLimitActive,
} from "../lib/rateLimit"
import { import {
clearSessionTokens, clearSessionTokens,
emitSessionChanged, emitSessionChanged,
@@ -8,6 +14,42 @@ import {
let refreshRequest: Promise<string | null> | null = null let refreshRequest: Promise<string | null> | null = null
export interface ApiErrorMessage {
attr?: string | null
detail: string
code?: string | null
}
export interface ApiErrorPayload {
error?: string
status_code?: number
messages?: ApiErrorMessage[]
code?: string
retry_after_seconds?: number | null
throttled_until?: string | null
}
export class ApiError extends Error {
status: number
error: string
messages: ApiErrorMessage[]
code: string | null
retryAfterSeconds: number | null
throttledUntil: string | null
constructor(status: number, payload: ApiErrorPayload, fallbackMessage: string) {
const detailMessage = payload.messages?.[0]?.detail
super(detailMessage || payload.error || fallbackMessage)
this.name = "ApiError"
this.status = status
this.error = payload.error || fallbackMessage
this.messages = payload.messages || []
this.code = payload.code || null
this.retryAfterSeconds = payload.retry_after_seconds ?? null
this.throttledUntil = payload.throttled_until ?? null
}
}
const cleanBaseUrl = API_BASE_URL.replace(/\/+$/, "") const cleanBaseUrl = API_BASE_URL.replace(/\/+$/, "")
const buildUrl = (endpoint: string) => { const buildUrl = (endpoint: string) => {
@@ -52,6 +94,50 @@ const clearSessionAndRedirect = () => {
} }
} }
const toIntOrNull = (value: string | number | null | undefined) => {
if (typeof value === "number" && Number.isFinite(value)) {
return Math.max(0, Math.ceil(value))
}
if (typeof value === "string" && value.trim()) {
const parsed = Number.parseInt(value, 10)
if (Number.isFinite(parsed)) {
return Math.max(0, parsed)
}
}
return null
}
const redirectToRateLimitPage = () => {
if (window.location.pathname !== "/rate-limit") {
window.location.replace("/rate-limit")
}
}
const createLockedResponse = () => {
const lock = getStoredRateLimitLock()
const retryAfterSeconds = getRateLimitRemainingSeconds(lock)
const payload = {
error: lock?.message || "Too many requests",
status_code: 429,
messages: [{ detail: lock?.message || "Too many requests" }],
code: lock?.code || "throttled",
retry_after_seconds: retryAfterSeconds,
throttled_until: lock?.throttledUntil || null,
}
return normalizeJsonResponse(
new Response(JSON.stringify(payload), {
status: 429,
headers: {
"Content-Type": "application/json",
"Retry-After": String(retryAfterSeconds),
},
}),
)
}
const shouldAttemptRefresh = (endpoint: string) => { const shouldAttemptRefresh = (endpoint: string) => {
const normalizedEndpoint = endpoint.startsWith("/") ? endpoint : `/${endpoint}` const normalizedEndpoint = endpoint.startsWith("/") ? endpoint : `/${endpoint}`
return ![ return ![
@@ -103,7 +189,34 @@ const refreshAccessToken = async () => {
return refreshRequest return refreshRequest
} }
export const buildApiError = async (response: Response) => {
let payload: ApiErrorPayload = {}
try {
payload = await response.clone().json()
} catch {
payload = {}
}
if (payload.retry_after_seconds == null) {
const retryAfter = toIntOrNull(response.headers.get("Retry-After"))
if (retryAfter != null) {
payload.retry_after_seconds = retryAfter
}
}
const fallbackMessage =
response.statusText || (response.status === 429 ? "Too many requests" : "Request failed")
return new ApiError(response.status, payload, fallbackMessage)
}
export const authFetch = async (endpoint: string, options: RequestInit = {}, allowRetry = true): Promise<Response> => { export const authFetch = async (endpoint: string, options: RequestInit = {}, allowRetry = true): Promise<Response> => {
if (isRateLimitActive()) {
redirectToRateLimitPage()
return createLockedResponse()
}
const token = getAccessToken() const token = getAccessToken()
const isFormData = options.body instanceof FormData const isFormData = options.body instanceof FormData
@@ -144,5 +257,24 @@ export const authFetch = async (endpoint: string, options: RequestInit = {}, all
return response return response
} }
if (!response.ok) {
const apiError = await buildApiError(response)
if (
response.status === 429 ||
apiError.code === "throttled" ||
apiError.retryAfterSeconds != null ||
apiError.throttledUntil
) {
activateRateLimitLock({
status: response.status,
code: apiError.code,
message: apiError.message,
retryAfterSeconds: apiError.retryAfterSeconds,
throttledUntil: apiError.throttledUntil,
})
redirectToRateLimitPage()
}
}
return normalizeJsonResponse(response) return normalizeJsonResponse(response)
} }

View File

@@ -1,4 +1,4 @@
import { authFetch } from './client'; import { authFetch, buildApiError } from './client';
// --- Auth Endpoints --- // --- Auth Endpoints ---
@@ -7,7 +7,7 @@ export const loginWithPassword = async (mobile: string, password: string) => {
method: 'POST', method: 'POST',
body: JSON.stringify({ mobile, password }) body: JSON.stringify({ mobile, password })
}); });
if (!response.ok) throw new Error('Failed to login with password'); if (!response.ok) throw await buildApiError(response);
return response.json(); return response.json();
}; };
@@ -16,7 +16,7 @@ export const sendOtp = async (mobile: string, mode: string) => {
method: 'POST', method: 'POST',
body: JSON.stringify({ mobile, mode }) body: JSON.stringify({ mobile, mode })
}); });
if (!response.ok) throw new Error('Failed to send OTP'); if (!response.ok) throw await buildApiError(response);
return response.json(); return response.json();
}; };
@@ -25,7 +25,7 @@ export const loginWithOtp = async (mobile: string, otp: string) => {
method: 'POST', method: 'POST',
body: JSON.stringify({ mobile, code: otp }) body: JSON.stringify({ mobile, code: otp })
}); });
if (!response.ok) throw new Error('Failed to login with OTP'); if (!response.ok) throw await buildApiError(response);
return response.json(); return response.json();
}; };

View File

@@ -23,6 +23,7 @@ import {
} from "../api/notifications" } from "../api/notifications"
import { useTranslation } from "../hooks/useTranslation" import { useTranslation } from "../hooks/useTranslation"
import { presentNotification } from "../lib/notificationPresenter" import { presentNotification } from "../lib/notificationPresenter"
import { isRateLimitActive } from "../lib/rateLimit"
import { import {
getAccessToken, getAccessToken,
SESSION_CHANGED_EVENT, SESSION_CHANGED_EVENT,
@@ -171,7 +172,7 @@ export function NotificationsProvider({ children }: { children: ReactNode }) {
) )
const refreshNotifications = useCallback(async () => { const refreshNotifications = useCallback(async () => {
if (!getAccessToken()) { if (!getAccessToken() || isRateLimitActive()) {
setNotifications([]) setNotifications([])
setUnreadCount(0) setUnreadCount(0)
setTotalCount(0) setTotalCount(0)
@@ -279,7 +280,7 @@ export function NotificationsProvider({ children }: { children: ReactNode }) {
}, [markAsSeen, openNotificationTarget, t.notifications]) }, [markAsSeen, openNotificationTarget, t.notifications])
const connectToStream = useCallback(async () => { const connectToStream = useCallback(async () => {
if (!getAccessToken()) { if (!getAccessToken() || isRateLimitActive()) {
closeEventSource() closeEventSource()
setConnectionStatus("idle") setConnectionStatus("idle")
return return
@@ -413,7 +414,7 @@ export function NotificationsProvider({ children }: { children: ReactNode }) {
useEffect(() => { useEffect(() => {
const startNotifications = async () => { const startNotifications = async () => {
if (!getAccessToken()) { if (!getAccessToken() || isRateLimitActive()) {
closeEventSource() closeEventSource()
setNotifications([]) setNotifications([])
setUnreadCount(0) setUnreadCount(0)

View File

@@ -1,6 +1,7 @@
import { createContext, useContext, useState, useEffect, type ReactNode } from "react" import { createContext, useContext, useState, useEffect, type ReactNode } from "react"
import { fetchWorkspaces, createWorkspace, type Workspace } from "../api/workspaces" import { fetchWorkspaces, createWorkspace, type Workspace } from "../api/workspaces"
import { useTranslation } from "../hooks/useTranslation" import { useTranslation } from "../hooks/useTranslation"
import { isRateLimitActive } from "../lib/rateLimit"
import { toast } from "sonner" import { toast } from "sonner"
import { Button } from "../components/ui/button" import { Button } from "../components/ui/button"
import { Input } from "../components/ui/input" import { Input } from "../components/ui/input"
@@ -31,9 +32,10 @@ export const WorkspaceProvider = ({ children }: { children: ReactNode }) => {
const [isCreatingFirst, setIsCreatingFirst] = useState(false) const [isCreatingFirst, setIsCreatingFirst] = useState(false)
const isAuthenticated = !!localStorage.getItem("accessToken") const isAuthenticated = !!localStorage.getItem("accessToken")
const rateLimited = isRateLimitActive()
const refreshWorkspaces = async () => { const refreshWorkspaces = async () => {
if (!isAuthenticated) { if (!isAuthenticated || isRateLimitActive()) {
setIsLoading(false) setIsLoading(false)
return return
} }
@@ -66,13 +68,13 @@ export const WorkspaceProvider = ({ children }: { children: ReactNode }) => {
} }
useEffect(() => { useEffect(() => {
if (!isAuthenticated) { if (!isAuthenticated || rateLimited) {
setIsLoading(false) setIsLoading(false)
return return
} }
void refreshWorkspaces() void refreshWorkspaces()
}, [isAuthenticated]) }, [isAuthenticated, rateLimited])
const setActiveWorkspace = (workspace: Workspace | null) => { const setActiveWorkspace = (workspace: Workspace | null) => {
setActiveWorkspaceState(workspace) setActiveWorkspaceState(workspace)
@@ -100,7 +102,7 @@ export const WorkspaceProvider = ({ children }: { children: ReactNode }) => {
} }
// Force workspace creation if authenticated but none exist // Force workspace creation if authenticated but none exist
if (!isLoading && isAuthenticated && workspaces.length === 0) { if (!rateLimited && !isLoading && isAuthenticated && workspaces.length === 0) {
return ( return (
<div className="min-h-screen flex items-center justify-center bg-slate-50 dark:bg-slate-900 px-4"> <div className="min-h-screen flex items-center justify-center bg-slate-50 dark:bg-slate-900 px-4">
<div className="w-full max-w-md bg-white dark:bg-slate-800 p-8 rounded-xl shadow-lg border border-slate-200 dark:border-slate-700"> <div className="w-full max-w-md bg-white dark:bg-slate-800 p-8 rounded-xl shadow-lg border border-slate-200 dark:border-slate-700">

144
src/lib/rateLimit.ts Normal file
View File

@@ -0,0 +1,144 @@
const STORAGE_KEY = "qlockify:rate-limit-lock"
export interface RateLimitLock {
status: number
code: string | null
message: string
retryAfterSeconds: number
throttledUntil: string
returnTo: string
}
interface ActivateRateLimitInput {
status: number
code?: string | null
message?: string | null
retryAfterSeconds?: number | null
throttledUntil?: string | null
returnTo?: string | null
}
const DEFAULT_RETRY_SECONDS = 60
const isBrowser = typeof window !== "undefined"
const getCurrentPath = () => {
if (!isBrowser) {
return "/"
}
return `${window.location.pathname}${window.location.search}${window.location.hash}`
}
const parseIsoDate = (value: string | null | undefined) => {
if (!value) {
return null
}
const timestamp = Date.parse(value)
return Number.isFinite(timestamp) ? timestamp : null
}
const readStoredLock = (): RateLimitLock | null => {
if (!isBrowser) {
return null
}
try {
const raw = window.localStorage.getItem(STORAGE_KEY)
if (!raw) {
return null
}
const parsed = JSON.parse(raw) as Partial<RateLimitLock>
if (
typeof parsed.status !== "number" ||
typeof parsed.message !== "string" ||
typeof parsed.retryAfterSeconds !== "number" ||
typeof parsed.throttledUntil !== "string" ||
typeof parsed.returnTo !== "string"
) {
window.localStorage.removeItem(STORAGE_KEY)
return null
}
if (parseIsoDate(parsed.throttledUntil) == null) {
window.localStorage.removeItem(STORAGE_KEY)
return null
}
return {
status: parsed.status,
code: typeof parsed.code === "string" ? parsed.code : null,
message: parsed.message,
retryAfterSeconds: parsed.retryAfterSeconds,
throttledUntil: parsed.throttledUntil,
returnTo: parsed.returnTo,
}
} catch {
window.localStorage.removeItem(STORAGE_KEY)
return null
}
}
export const getRateLimitRemainingSeconds = (lock: RateLimitLock | null) => {
if (!lock) {
return 0
}
const untilTimestamp = parseIsoDate(lock.throttledUntil)
if (untilTimestamp == null) {
return 0
}
return Math.max(0, Math.ceil((untilTimestamp - Date.now()) / 1000))
}
export const getStoredRateLimitLock = () => readStoredLock()
export const isRateLimitActive = () => getRateLimitRemainingSeconds(readStoredLock()) > 0
export const clearRateLimitLock = () => {
if (!isBrowser) {
return
}
window.localStorage.removeItem(STORAGE_KEY)
}
export const activateRateLimitLock = (input: ActivateRateLimitInput) => {
if (!isBrowser) {
return null
}
const parsedThrottledUntil = parseIsoDate(input.throttledUntil)
const retryFromUntil =
parsedThrottledUntil != null
? Math.ceil(Math.max(parsedThrottledUntil - Date.now(), 0) / 1000)
: 0
const retryAfterSeconds = Math.max(
input.retryAfterSeconds ?? retryFromUntil ?? DEFAULT_RETRY_SECONDS,
retryFromUntil,
0,
) || DEFAULT_RETRY_SECONDS
const throttledUntil =
input.throttledUntil && parsedThrottledUntil != null
? input.throttledUntil
: new Date(Date.now() + retryAfterSeconds * 1000).toISOString()
const returnTo =
input.returnTo && input.returnTo !== "/rate-limit" ? input.returnTo : getCurrentPath()
const lock: RateLimitLock = {
status: input.status,
code: input.code ?? "throttled",
message: input.message || "Too many requests",
retryAfterSeconds,
throttledUntil,
returnTo: returnTo === "/rate-limit" ? "/" : returnTo,
}
window.localStorage.setItem(STORAGE_KEY, JSON.stringify(lock))
return lock
}

View File

@@ -52,6 +52,15 @@ export const en = {
invalidCreds: "Invalid credentials", invalidCreds: "Invalid credentials",
enterOtp: "Please enter the OTP code", enterOtp: "Please enter the OTP code",
invalidOtp: "Invalid OTP code" invalidOtp: "Invalid OTP code"
},
throttle: {
title: "Too many attempts",
genericMessage: (time: string) => `Too many requests. Try again in ${time}.`,
otpSendMessage: (time: string) => `Too many OTP requests. Try again in ${time}.`,
passwordLoginMessage: (time: string) => `Too many password login attempts. Try again in ${time}.`,
otpLoginMessage: (time: string) => `Too many OTP login attempts. Try again in ${time}.`,
countdownLabel: (time: string) => `Retry in ${time}`,
fallback: "Too many requests. Please wait and try again.",
} }
}, },
@@ -61,6 +70,18 @@ export const en = {
suffix: "" suffix: ""
}, },
rateLimit: {
eyebrow: "Request limit reached",
title: "Please wait before trying again",
message: "You have sent too many requests. Access is temporarily locked until the cooldown finishes.",
cooldownLabel: "Cooldown",
waitingMessage: (time: string) => `Requests are blocked for now.`,
finishedMessage: "The cooldown has finished. You can continue now.",
continue: "Continue",
continueCooldown: (time: string) => `Continue in ${time}`,
ready: "Ready",
},
terms: { terms: {
back: "Back", back: "Back",
title: "Terms of Service and Privacy Policy", title: "Terms of Service and Privacy Policy",

View File

@@ -52,6 +52,15 @@ export const fa = {
invalidCreds: "اطلاعات ورود نامعتبر است", invalidCreds: "اطلاعات ورود نامعتبر است",
enterOtp: "لطفا کد تایید را وارد کنید", enterOtp: "لطفا کد تایید را وارد کنید",
invalidOtp: "کد تایید نامعتبر است" invalidOtp: "کد تایید نامعتبر است"
},
throttle: {
title: "تعداد تلاش‌ها بیش از حد مجاز است",
genericMessage: (time: string) => `درخواست‌های زیادی ارسال شده است. ${time} دیگر دوباره تلاش کنید.`,
otpSendMessage: (time: string) => `ارسال کد یکبار مصرف بیش از حد مجاز انجام شده است. ${time} دیگر دوباره تلاش کنید.`,
passwordLoginMessage: (time: string) => `تلاش برای ورود با رمز عبور بیش از حد مجاز بوده است. ${time} دیگر دوباره تلاش کنید.`,
otpLoginMessage: (time: string) => `تلاش برای ورود با کد یکبار مصرف بیش از حد مجاز بوده است. ${time} دیگر دوباره تلاش کنید.`,
countdownLabel: (time: string) => `تلاش دوباره تا ${time}`,
fallback: "درخواست‌های زیادی ارسال شده است. کمی صبر کنید و دوباره تلاش کنید.",
} }
}, },
@@ -61,6 +70,18 @@ export const fa = {
suffix: " ما موافقت می‌کنید." suffix: " ما موافقت می‌کنید."
}, },
rateLimit: {
eyebrow: "محدودیت درخواست فعال شده است",
title: "لطفاً پیش از تلاش دوباره صبر کنید",
message: "درخواست‌های زیادی ارسال شده است. دسترسی شما تا پایان زمان انتظار به صورت موقت محدود شده است.",
cooldownLabel: "زمان انتظار",
waitingMessage: (time: string) => `ارسال درخواست برای مدتی مسدود است.`,
finishedMessage: "زمان انتظار به پایان رسیده است. اکنون می‌توانید ادامه دهید.",
continue: "ادامه",
continueCooldown: (time: string) => `ادامه تا ${time}`,
ready: "آماده",
},
terms: { terms: {
back: "بازگشت", back: "بازگشت",
title: "شرایط خدمات و حریم خصوصی", title: "شرایط خدمات و حریم خصوصی",

View File

@@ -1,16 +1,25 @@
import React, { useState } from "react" import React, { useEffect, useMemo, useState } from "react"
import { useNavigate, Link } from "react-router-dom" import { useNavigate, Link } from "react-router-dom"
import { Button } from "../components/ui/button" import { Button } from "../components/ui/button"
import { Input } from "../components/ui/input" import { Input } from "../components/ui/input"
import { SettingsMenu } from "../components/SettingsMenu" import { SettingsMenu } from "../components/SettingsMenu"
import { ArrowLeft, ArrowRight, Command, Loader2, Eye, EyeOff } from "lucide-react" import { AlertTriangle, ArrowLeft, ArrowRight, Command, Eye, EyeOff, Loader2 } from "lucide-react"
import { toast } from "sonner" import { toast } from "sonner"
import { useTranslation } from "../hooks/useTranslation" import { useTranslation } from "../hooks/useTranslation"
import { loginWithPassword, sendOtp, loginWithOtp } from "../api/users" import { loginWithOtp, loginWithPassword, sendOtp } from "../api/users"
import { ApiError } from "../api/client"
import { setSessionTokens } from "../lib/session" import { setSessionTokens } from "../lib/session"
type AuthStep = "mobile" | "password" | "otp" type AuthStep = "mobile" | "password" | "otp"
type AuthMode = "login" | "register" type AuthMode = "login" | "register"
type CooldownKey = "otpSend" | "passwordLogin" | "otpLogin"
type Cooldowns = Record<CooldownKey, number>
const PERSIAN_DIGITS = ["۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"]
const toPersianDigits = (value: string) =>
value.replace(/\d/g, (digit) => PERSIAN_DIGITS[Number.parseInt(digit, 10)] ?? digit)
export default function Auth() { export default function Auth() {
const navigate = useNavigate() const navigate = useNavigate()
@@ -23,7 +32,47 @@ export default function Auth() {
const [password, setPassword] = useState("") const [password, setPassword] = useState("")
const [otpCode, setOtpCode] = useState("") const [otpCode, setOtpCode] = useState("")
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [showPassword, setShowPassword] = useState(false) // Added state for password visibility const [showPassword, setShowPassword] = useState(false)
const [cooldowns, setCooldowns] = useState<Cooldowns>({
otpSend: 0,
passwordLogin: 0,
otpLogin: 0,
})
useEffect(() => {
if (!Object.values(cooldowns).some((value) => value > 0)) {
return
}
const timer = window.setInterval(() => {
setCooldowns((current) => ({
otpSend: Math.max(0, current.otpSend - 1),
passwordLogin: Math.max(0, current.passwordLogin - 1),
otpLogin: Math.max(0, current.otpLogin - 1),
}))
}, 1000)
return () => window.clearInterval(timer)
}, [cooldowns])
const localizeDigits = (value: string) => (isRtl ? toPersianDigits(value) : value)
const formatCooldown = (seconds: number) => {
const minutes = Math.floor(seconds / 60)
const remainingSeconds = seconds % 60
const base = minutes > 0
? `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
: `${remainingSeconds}s`
return localizeDigits(base)
}
const setCooldown = (key: CooldownKey, seconds: number) => {
setCooldowns((current) => ({
...current,
[key]: Math.max(current[key], seconds),
}))
}
const handleTokenResponse = (access: string, refresh: string) => { const handleTokenResponse = (access: string, refresh: string) => {
setSessionTokens(access, refresh) setSessionTokens(access, refresh)
@@ -31,17 +80,49 @@ export default function Auth() {
navigate("/profile") navigate("/profile")
} }
const handleThrottleError = (error: unknown, key: CooldownKey) => {
if (!(error instanceof ApiError) || error.code !== "throttled") {
return false
}
const seconds = Math.max(1, error.retryAfterSeconds ?? 0)
const formattedTime = formatCooldown(seconds)
setCooldown(key, seconds)
const throttleCopy = t.login.throttle
const message =
key === "otpSend"
? throttleCopy.otpSendMessage(formattedTime)
: key === "passwordLogin"
? throttleCopy.passwordLoginMessage(formattedTime)
: throttleCopy.otpLoginMessage(formattedTime)
toast.error(message, {
description: throttleCopy.countdownLabel(formattedTime),
})
return true
}
const handleSendOtp = async (selectedMode: AuthMode) => { const handleSendOtp = async (selectedMode: AuthMode) => {
if (!mobile) return toast.error(t.login.toasts.enterMobile) if (!mobile) {
toast.error(t.login.toasts.enterMobile)
return
}
setLoading(true) setLoading(true)
try { try {
await sendOtp(mobile, selectedMode) await sendOtp(mobile, selectedMode)
setCooldowns((current) => ({ ...current, otpSend: 0 }))
setMode(selectedMode) setMode(selectedMode)
setStep("otp") setStep("otp")
toast.success(t.login.toasts.verifySent) toast.success(t.login.toasts.verifySent)
} catch (err: any) { } catch (error) {
toast.error(t.login.toasts.failedOtp) if (!handleThrottleError(error, "otpSend")) {
toast.error(error instanceof Error ? error.message : t.login.toasts.failedOtp)
}
} finally { } finally {
setLoading(false) setLoading(false)
} }
@@ -49,14 +130,21 @@ export default function Auth() {
const handlePasswordLogin = async (e: React.FormEvent) => { const handlePasswordLogin = async (e: React.FormEvent) => {
e.preventDefault() e.preventDefault()
if (!mobile || !password) return toast.error(t.login.toasts.fillAll) if (!mobile || !password) {
toast.error(t.login.toasts.fillAll)
return
}
setLoading(true) setLoading(true)
try { try {
const data = await loginWithPassword(mobile, password) const data = await loginWithPassword(mobile, password)
setCooldowns((current) => ({ ...current, passwordLogin: 0 }))
handleTokenResponse(data.access, data.refresh) handleTokenResponse(data.access, data.refresh)
} catch (err: any) { } catch (error) {
toast.error(t.login.toasts.invalidCreds) if (!handleThrottleError(error, "passwordLogin")) {
toast.error(error instanceof Error ? error.message : t.login.toasts.invalidCreds)
}
} finally { } finally {
setLoading(false) setLoading(false)
} }
@@ -64,24 +152,69 @@ export default function Auth() {
const handleOtpVerify = async (e: React.FormEvent) => { const handleOtpVerify = async (e: React.FormEvent) => {
e.preventDefault() e.preventDefault()
if (!mobile || !otpCode) return toast.error(t.login.toasts.enterOtp) if (!mobile || !otpCode) {
toast.error(t.login.toasts.enterOtp)
return
}
setLoading(true) setLoading(true)
try { try {
const data = await loginWithOtp(mobile, otpCode) const data = await loginWithOtp(mobile, otpCode)
setCooldowns((current) => ({ ...current, otpLogin: 0 }))
handleTokenResponse(data.access, data.refresh) handleTokenResponse(data.access, data.refresh)
} catch (err: any) { } catch (error) {
toast.error(t.login.toasts.invalidOtp) if (!handleThrottleError(error, "otpLogin")) {
toast.error(error instanceof Error ? error.message : t.login.toasts.invalidOtp)
}
} finally { } finally {
setLoading(false) setLoading(false)
} }
} }
const activeCooldownMessage = useMemo(() => {
const throttleCopy = t.login.throttle
if (step === "mobile" && cooldowns.otpSend > 0) {
const formatted = formatCooldown(cooldowns.otpSend)
return {
title: throttleCopy.title,
description: throttleCopy.otpSendMessage(formatted),
}
}
if (step === "password" && cooldowns.passwordLogin > 0) {
const formatted = formatCooldown(cooldowns.passwordLogin)
return {
title: throttleCopy.title,
description: throttleCopy.passwordLoginMessage(formatted),
}
}
if (step === "otp" && cooldowns.otpLogin > 0) {
const formatted = formatCooldown(cooldowns.otpLogin)
return {
title: throttleCopy.title,
description: throttleCopy.otpLoginMessage(formatted),
}
}
return null
}, [cooldowns, formatCooldown, step, t.login.throttle])
const otpCooldownLabel =
cooldowns.otpSend > 0 ? t.login.throttle.countdownLabel(formatCooldown(cooldowns.otpSend)) : null
const passwordCooldownLabel =
cooldowns.passwordLogin > 0
? t.login.throttle.countdownLabel(formatCooldown(cooldowns.passwordLogin))
: null
const otpLoginCooldownLabel =
cooldowns.otpLogin > 0 ? t.login.throttle.countdownLabel(formatCooldown(cooldowns.otpLogin)) : null
const BackIcon = isRtl ? ArrowRight : ArrowLeft const BackIcon = isRtl ? ArrowRight : ArrowLeft
return ( return (
<div className="container relative min-h-screen flex-col items-center justify-center grid lg:max-w-none lg:grid-cols-2 lg:px-0 bg-white dark:bg-slate-950 transition-colors"> <div className="container relative min-h-screen flex-col items-center justify-center grid lg:max-w-none lg:grid-cols-2 lg:px-0 bg-white dark:bg-slate-950 transition-colors">
<div className="absolute inset-e-4 top-4 z-50 md:inset-e-8 md:top-8"> <div className="absolute inset-e-4 top-4 z-50 md:inset-e-8 md:top-8">
<SettingsMenu /> <SettingsMenu />
</div> </div>
@@ -100,7 +233,6 @@ export default function Auth() {
<div className="p-8 lg:p-8 flex h-screen items-center justify-center"> <div className="p-8 lg:p-8 flex h-screen items-center justify-center">
<div className="mx-auto flex w-full flex-col justify-center space-y-6 sm:w-87.5"> <div className="mx-auto flex w-full flex-col justify-center space-y-6 sm:w-87.5">
<div className="flex flex-col space-y-2 text-center text-slate-900 dark:text-slate-50"> <div className="flex flex-col space-y-2 text-center text-slate-900 dark:text-slate-50">
<div className="flex justify-center lg:hidden mb-4"> <div className="flex justify-center lg:hidden mb-4">
<Command className="h-8 w-8" /> <Command className="h-8 w-8" />
@@ -117,6 +249,18 @@ export default function Auth() {
</p> </p>
</div> </div>
{activeCooldownMessage && (
<div className="rounded-2xl border border-amber-200 bg-amber-50 px-4 py-3 text-start text-amber-900 shadow-sm dark:border-amber-900/50 dark:bg-amber-950/40 dark:text-amber-100">
<div className="flex items-start gap-3">
<AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
<div className="space-y-1">
<p className="text-sm font-medium">{activeCooldownMessage.title}</p>
<p className="text-sm">{activeCooldownMessage.description}</p>
</div>
</div>
</div>
)}
<div className="grid gap-6"> <div className="grid gap-6">
{step === "mobile" && ( {step === "mobile" && (
<div className="grid gap-4"> <div className="grid gap-4">
@@ -131,7 +275,16 @@ export default function Auth() {
disabled={loading} disabled={loading}
className={`h-11 ${isRtl ? "text-end" : "text-start"}`} className={`h-11 ${isRtl ? "text-end" : "text-start"}`}
/> />
<Button onClick={() => { if (!mobile) return toast.error(t.login.toasts.enterMobile); setStep("password") }} className="w-full h-11"> <Button
onClick={() => {
if (!mobile) {
toast.error(t.login.toasts.enterMobile)
return
}
setStep("password")
}}
className="w-full h-11"
>
{t.login.continueWithPassword} {t.login.continueWithPassword}
</Button> </Button>
@@ -147,13 +300,23 @@ export default function Auth() {
</div> </div>
<div className="grid grid-cols-2 gap-4"> <div className="grid grid-cols-2 gap-4">
<Button variant="outline" onClick={() => handleSendOtp("login")} disabled={loading} className="h-11"> <Button
variant="outline"
onClick={() => handleSendOtp("login")}
disabled={loading || cooldowns.otpSend > 0}
className="h-11"
>
{loading && mode === "login" && <Loader2 className="me-2 h-4 w-4 animate-spin" />} {loading && mode === "login" && <Loader2 className="me-2 h-4 w-4 animate-spin" />}
{t.login.otpLogin} {cooldowns.otpSend > 0 ? otpCooldownLabel : t.login.otpLogin}
</Button> </Button>
<Button variant="outline" onClick={() => handleSendOtp("register")} disabled={loading} className="h-11"> <Button
variant="outline"
onClick={() => handleSendOtp("register")}
disabled={loading || cooldowns.otpSend > 0}
className="h-11"
>
{loading && mode === "register" && <Loader2 className="me-2 h-4 w-4 animate-spin" />} {loading && mode === "register" && <Loader2 className="me-2 h-4 w-4 animate-spin" />}
{t.login.register} {cooldowns.otpSend > 0 ? otpCooldownLabel : t.login.register}
</Button> </Button>
</div> </div>
</div> </div>
@@ -178,13 +341,14 @@ export default function Auth() {
type="button" type="button"
tabIndex={-1} tabIndex={-1}
onClick={() => setShowPassword((prev) => !prev)} onClick={() => setShowPassword((prev) => !prev)}
className="absolute inset-y-0 right-0 flex items-center pr-3 text-slate-500 hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-300" className="absolute inset-y-0 right-0 flex cursor-pointer items-center pr-3 text-slate-500 hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-300"
> >
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />} {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
</button> </button>
</div> </div>
<Button type="submit" className="w-full h-11" disabled={loading}> <Button type="submit" className="w-full h-11" disabled={loading || cooldowns.passwordLogin > 0}>
{loading && <Loader2 className="me-2 h-4 w-4 animate-spin" />} {t.login.signIn} {loading && <Loader2 className="me-2 h-4 w-4 animate-spin" />}
{passwordCooldownLabel || t.login.signIn}
</Button> </Button>
<Button type="button" variant="ghost" onClick={() => setStep("mobile")} className="text-sm text-slate-500 dark:text-slate-400"> <Button type="button" variant="ghost" onClick={() => setStep("mobile")} className="text-sm text-slate-500 dark:text-slate-400">
<BackIcon className="me-2 h-4 w-4" /> {t.login.back} <BackIcon className="me-2 h-4 w-4" /> {t.login.back}
@@ -205,8 +369,9 @@ export default function Auth() {
disabled={loading} disabled={loading}
className="h-11 text-center tracking-widest text-lg" className="h-11 text-center tracking-widest text-lg"
/> />
<Button type="submit" className="w-full h-11" disabled={loading}> <Button type="submit" className="w-full h-11" disabled={loading || cooldowns.otpLogin > 0}>
{loading && <Loader2 className="me-2 h-4 w-4 animate-spin" />} {t.login.verifyAndContinue} {loading && <Loader2 className="me-2 h-4 w-4 animate-spin" />}
{otpLoginCooldownLabel || t.login.verifyAndContinue}
</Button> </Button>
<Button type="button" variant="ghost" onClick={() => setStep("mobile")} className="text-sm text-slate-500 dark:text-slate-400"> <Button type="button" variant="ghost" onClick={() => setStep("mobile")} className="text-sm text-slate-500 dark:text-slate-400">
<BackIcon className="me-2 h-4 w-4" /> {t.login.back} <BackIcon className="me-2 h-4 w-4" /> {t.login.back}
@@ -225,7 +390,6 @@ export default function Auth() {
</Link> </Link>
{t.loginTerms?.suffix} {t.loginTerms?.suffix}
</div> </div>
</div> </div>
</div> </div>
</div> </div>

115
src/pages/RateLimit.tsx Normal file
View File

@@ -0,0 +1,115 @@
import { useEffect, useMemo, useState } from "react"
import { useNavigate } from "react-router-dom"
import { AlertTriangle, Clock3 } from "lucide-react"
import { Button } from "../components/ui/button"
import { useTranslation } from "../hooks/useTranslation"
import {
clearRateLimitLock,
getRateLimitRemainingSeconds,
getStoredRateLimitLock,
} from "../lib/rateLimit"
const PERSIAN_DIGITS = ["۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"]
const toPersianDigits = (value: string) =>
value.replace(/\d/g, (digit) => PERSIAN_DIGITS[Number.parseInt(digit, 10)] ?? digit)
export default function RateLimitPage() {
const navigate = useNavigate()
const { t, lang } = useTranslation()
const isRtl = lang === "fa"
const initialLock = getStoredRateLimitLock()
const [returnTo] = useState(initialLock?.returnTo || "/")
const [status] = useState(initialLock?.status ?? 429)
const [message] = useState(initialLock?.message || t.rateLimit.message)
const [remainingSeconds, setRemainingSeconds] = useState(getRateLimitRemainingSeconds(initialLock))
useEffect(() => {
if (!initialLock) {
navigate(returnTo, { replace: true })
return
}
const timer = window.setInterval(() => {
const currentLock = getStoredRateLimitLock()
setRemainingSeconds(getRateLimitRemainingSeconds(currentLock))
}, 1000)
return () => window.clearInterval(timer)
}, [initialLock, navigate, returnTo])
const localizedDigits = (value: string) => (isRtl ? toPersianDigits(value) : value)
const countdown = useMemo(() => {
const minutes = Math.floor(remainingSeconds / 60)
const seconds = remainingSeconds % 60
const base =
minutes > 0
? `${minutes}:${seconds.toString().padStart(2, "0")}`
: `${seconds}s`
return localizedDigits(base)
}, [isRtl, remainingSeconds])
const handleContinue = () => {
clearRateLimitLock()
navigate(returnTo, { replace: true })
}
const isCoolingDown = remainingSeconds > 0
return (
<div className="min-h-screen bg-slate-50 px-4 py-10 text-slate-900 dark:bg-slate-950 dark:text-slate-100">
<div className="mx-auto flex min-h-[calc(100vh-5rem)] max-w-2xl items-center justify-center">
<div className="w-full rounded-3xl border border-slate-200 bg-white p-8 shadow-sm dark:border-slate-800 dark:bg-slate-900 sm:p-10">
<div className="mb-6 flex items-center justify-center">
<div className="flex h-16 w-16 items-center justify-center rounded-2xl bg-amber-100 text-amber-700 dark:bg-amber-950/50 dark:text-amber-300">
<AlertTriangle className="h-8 w-8" />
</div>
</div>
<div className="space-y-4 text-center">
<p className="text-sm font-medium uppercase tracking-[0.3em] text-amber-600 dark:text-amber-300">
{t.rateLimit.eyebrow}
</p>
<h1 className="text-3xl font-semibold tracking-tight">
{t.rateLimit.title}
</h1>
<p className="text-sm text-slate-500 dark:text-slate-400 sm:text-base">
{t.rateLimit.message}
</p>
</div>
<div className="mt-8 grid gap-4">
<div className="rounded-2xl border border-slate-200 bg-slate-50 p-5 text-start dark:border-slate-800 dark:bg-slate-950/60">
<div className="flex items-center gap-2 text-slate-500 dark:text-slate-400">
<Clock3 className="h-4 w-4" />
<p className="text-xs font-medium uppercase tracking-[0.2em]">
{t.rateLimit.cooldownLabel}
</p>
</div>
<p className="mt-2 text-2xl font-semibold">
{isCoolingDown ? countdown : t.rateLimit.ready}
</p>
</div>
</div>
<div className="mt-8 rounded-2xl border border-dashed border-slate-200 bg-slate-50/70 p-4 text-sm text-slate-600 dark:border-slate-800 dark:bg-slate-950/50 dark:text-slate-300">
{isCoolingDown ? t.rateLimit.waitingMessage(countdown) : t.rateLimit.finishedMessage}
</div>
<div className="mt-8 flex justify-center">
<Button
onClick={handleContinue}
disabled={isCoolingDown}
className="h-11 min-w-52"
>
{isCoolingDown ? t.rateLimit.continueCooldown(countdown) : t.rateLimit.continue}
</Button>
</div>
</div>
</div>
</div>
)
}