test:v2
All checks were successful
Update changelog / changelog (push) Successful in 28s

This commit is contained in:
Pc
2026-01-04 16:15:08 +01:00
parent 13909c46f6
commit 5dd751600c
2 changed files with 37 additions and 48 deletions

View File

@@ -2,98 +2,72 @@
import Cookies from 'js-cookie';
import { AuthContext } from './AuthContext';
import { sha512 } from '../utils/crypto';
import type { AuthResponse } from '../types/auth';
const TOKEN_KEY = 'ktty_shared_token';
/**
* Konfiguracja ciasteczek dla SSO.
* Na localhost ciasteczka domenowe nie działają, więc używamy undefined.
* Na produkcji używamy '.ktty.is', co pozwala współdzielić sesję między subdomenami.
*/
const getCookieConfig = () => {
const hostname = window.location.hostname;
const isLocal = hostname === 'localhost' || hostname === '127.0.0.1';
return {
domain: isLocal ? undefined : '.ktty.is',
secure: !isLocal, // Wymagane HTTPS na produkcji
secure: !isLocal,
sameSite: 'Lax' as const,
expires: 7 // Token ważny przez 7 dni
path: '/',
expires: 7
};
};
const getSubdomain = (): string | null => {
const hostname = window.location.hostname;
const parts = hostname.split('.');
if (parts.length <= 2) return null;
return parts[0];
};
export function AuthProvider({ children }: { children: ReactNode }) {
const config = getCookieConfig();
const subdomain = getSubdomain();
// Inicjalizacja stanu: sprawdzamy ciasteczko natychmiast przy ładowaniu strony.
// Dzięki temu SSO działa bez opóźnień.
const [token, setToken] = useState<string | null>(() => Cookies.get(TOKEN_KEY) || null);
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const [error, setError] = useState<string | null>(null); // DODANE
const authRequest = useCallback(async (endpoint: 'signUp' | 'signIn', name: string, pass: string) => {
const authRequest = useCallback(async (endpoint: 'signIn' | 'signUp', name: string, pass: string) => {
setLoading(true);
setError(null);
try {
const hashedPassword = await sha512(pass);
// Vite Proxy przekaże to na https://www.ktty.is/api/...
const fullUrl = `/api/v1/user/${endpoint}`;
const response = await fetch(fullUrl, {
const response = await fetch(`/api/v1/user/${endpoint}`, {
method: 'POST',
headers: {
'accept': 'application/json',
'Content-Type': 'application/json',
'X-Subdomain': subdomain || '',
},
body: JSON.stringify({ name, password: hashedPassword, ttl: 86400 }),
headers: { 'Content-Type': 'application/json' },
credentials: 'include',
body: JSON.stringify({ name, password: hashedPassword }),
});
const data: AuthResponse = await response.json();
const data = await response.json();
if (!response.ok) {
throw new Error(data?.error || data?.message || 'Błąd autoryzacji');
throw new Error(data?.message || 'Błąd autoryzacji');
}
if (data?.token) {
// Zapisujemy token z flagą domain: '.ktty.is'
Cookies.set(TOKEN_KEY, data.token, config);
Cookies.set(TOKEN_KEY, data.token, getCookieConfig());
setToken(data.token);
}
return data;
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : 'Wystąpił nieoczekiwany błąd';
const msg = err instanceof Error ? err.message : 'Wystąpił błąd';
setError(msg);
return null;
} finally {
setLoading(false);
}
}, [subdomain, config]);
}, []);
const logout = useCallback(() => {
// Usuwamy ciasteczko z tej samej domeny, na której zostało zapisane
Cookies.remove(TOKEN_KEY, { domain: config.domain });
Cookies.remove(TOKEN_KEY, { domain: getCookieConfig().domain, path: '/' });
setToken(null);
}, [config]);
}, []);
return (
<AuthContext.Provider value={{
isAuthenticated: !!token,
token,
loading,
error,
error, // TERAZ OBECNE
signIn: (n, p) => authRequest('signIn', n, p),
signUp: (n, p) => authRequest('signUp', n, p),
signUp: (n, p) => authRequest('signUp', n, p), // TERAZ OBECNE
logout
}}>
{children}