Simon/Scriberr
1
0
Fork 0
mirror of https://github.com/rishikanthc/Scriberr.git synced 2026-03-03 03:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the 'any's

Browse Source
This commit is contained in:
Paul Irish
2026-01-15 17:26:05 -08:00
parent b3ad0d56a6
commit 24eb85e4c3
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
web/frontend/src/features/auth/hooks/useAuth.ts
View File

@@ -1,6 +1,12 @@
import { useEffect, useRef, useCallback } from 'react';
import { useAuthStore } from '../store/authStore';
declare global {
interface Window {
__scriberr_original_fetch?: typeof window.fetch;
}
}
export function useAuth() {
const {
token,
@@ -49,8 +55,7 @@ export function useAuth() {
if (window.location.pathname !== "/") {
// Force navigation handled by RouterContext or window.location if critical
window.history.pushState({ route: { path: 'home' } }, "", "/");
// eslint-disable-next-line @typescript-eslint/no-explicit-any
window.dispatchEvent(new PopStateEvent('popstate', { state: { route: { path: 'home' } } as any }));
window.dispatchEvent(new PopStateEvent('popstate', { state: { route: { path: 'home' } } }));
}
}, [token, storeLogout]);
@@ -63,7 +68,7 @@ export function useAuth() {
const tryRefresh = useCallback(async (): Promise<string | null> => {
try {
const fetchToUse = (window as any).__scriberr_original_fetch || window.fetch;
const fetchToUse = window.__scriberr_original_fetch || window.fetch;
const res = await fetchToUse('/api/v1/auth/refresh', { method: 'POST' })
if (!res.ok) return null
const data = await res.json()
@@ -81,11 +86,11 @@ export function useAuth() {
// Consolidated token management
useEffect(() => {
if (!fetchWrapperSetupRef.current) {
if (!(window as any).__scriberr_original_fetch) {
(window as any).__scriberr_original_fetch = window.fetch.bind(window);
if (!window.__scriberr_original_fetch) {
window.__scriberr_original_fetch = window.fetch.bind(window);
}
const originalFetch = (window as any).__scriberr_original_fetch;
const originalFetch = window.__scriberr_original_fetch!;
const wrappedFetch: typeof window.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
const url = typeof input === 'string' ? input : (input instanceof URL ? input.href : input.url);
const isAuthEndpoint = url.includes('/api/v1/auth/');
@@ -94,11 +99,11 @@ export function useAuth() {
if (res.status === 401 && !isAuthEndpoint) {
const newToken = await tryRefresh()
if (newToken) {
const newInit: RequestInit | undefined = init ? { ...init } : undefined
if (newInit?.headers && typeof newInit.headers === 'object') {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(newInit.headers as any)['Authorization'] = `Bearer ${newToken}`
}
const newInit: RequestInit = init ? { ...init } : {};
const headers = new Headers(newInit.headers);
headers.set('Authorization', `Bearer ${newToken}`);
newInit.headers = headers;
res = await originalFetch(input, newInit)
if (res.status !== 401) return res
}
@@ -106,11 +111,10 @@ export function useAuth() {
}
return res;
};
// eslint-disable-next-line @typescript-eslint/no-explicit-any
window.fetch = wrappedFetch as any;
window.fetch = wrappedFetch;
fetchWrapperSetupRef.current = true;
// Note: We don't restore originalFetch on unmount because other components
// also use useAuth and expect the wrapped version. This is a bit hacky
// Note: We don't restore originalFetch on unmount because other components
// also use useAuth and expect the wrapped version. This is a bit hacky
// but safer than multiple re-wrapping/unwrapping.
}