fix: Silent handling of expired auth tokens (no console error)
Some checks are pending
Deploy Elmeg / deploy (push) Waiting to run
Some checks are pending
Deploy Elmeg / deploy (push) Waiting to run
This commit is contained in:
parent
14a509ddb5
commit
cddd3e2389
1 changed files with 24 additions and 20 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import React, { createContext, useContext, useState, useEffect } from "react"
|
import React, { createContext, useContext, useState, useEffect, useCallback } from "react"
|
||||||
import { getApiUrl } from "@/lib/api-config"
|
import { getApiUrl } from "@/lib/api-config"
|
||||||
|
|
||||||
interface User {
|
interface User {
|
||||||
|
|
@ -32,15 +32,33 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||||
const [token, setToken] = useState<string | null>(null)
|
const [token, setToken] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
|
|
||||||
|
const fetchUser = useCallback(async (authToken: string): Promise<boolean> => {
|
||||||
|
const res = await fetch(`${getApiUrl()}/auth/users/me`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${authToken}`
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (res.ok) {
|
||||||
|
const userData = await res.json()
|
||||||
|
setUser(userData)
|
||||||
|
return true
|
||||||
|
} else if (res.status === 401 || res.status === 403) {
|
||||||
|
// Token expired or invalid - handle silently
|
||||||
|
return false
|
||||||
|
} else {
|
||||||
|
// Unexpected error
|
||||||
|
console.warn("Auth check failed with status:", res.status)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const initAuth = async () => {
|
const initAuth = async () => {
|
||||||
const storedToken = localStorage.getItem("token")
|
const storedToken = localStorage.getItem("token")
|
||||||
if (storedToken) {
|
if (storedToken) {
|
||||||
setToken(storedToken)
|
setToken(storedToken)
|
||||||
try {
|
const success = await fetchUser(storedToken)
|
||||||
await fetchUser(storedToken)
|
if (!success) {
|
||||||
} catch (err) {
|
|
||||||
console.error("Auth init failed", err)
|
|
||||||
localStorage.removeItem("token")
|
localStorage.removeItem("token")
|
||||||
setToken(null)
|
setToken(null)
|
||||||
}
|
}
|
||||||
|
|
@ -48,21 +66,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
initAuth()
|
initAuth()
|
||||||
}, [])
|
}, [fetchUser])
|
||||||
|
|
||||||
const fetchUser = async (token: string) => {
|
|
||||||
const res = await fetch(`${getApiUrl()}/auth/users/me`, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${token}`
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (res.ok) {
|
|
||||||
const userData = await res.json()
|
|
||||||
setUser(userData)
|
|
||||||
} else {
|
|
||||||
throw new Error("Failed to fetch user")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const login = async (newToken: string) => {
|
const login = async (newToken: string) => {
|
||||||
localStorage.setItem("token", newToken)
|
localStorage.setItem("token", newToken)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue