generated from nhcarrigan/template
7579f1ec97
## Summary This PR implements several improvements to the library application: - Added start and finish date tracking for media items - Added "Retired" category for abandoned media - Implemented avatar-based user menu with dropdown navigation - Added automatic background token refresh to prevent session expiry - Created centralised logging system with frontend-to-API log forwarding - Added toast notifications for error handling ## Changes ### Media Tracking (#41) - Added `dateStarted` and `dateFinished` fields to Books, Games, Manga, Music, and Shows - Updated TypeScript types, Prisma schema, and API services - Added manual date input fields to frontend forms - Properly converts HTML date strings to Date objects before API submission ### Retired Category (#43) - Added `RETIRED` status to all media type enums - Updated Prisma schema, frontend dropdowns, and filter buttons - Added status label handling for retired items ### User Menu (#46) - Replaced username text with avatar image in header - Created dropdown menu with navigation items (Users, Audit, Suggestions) - Added logout button to menu - Implemented keyboard accessibility (tabindex, role, keyup handlers) ### Token Refresh (#44) - Implemented automatic token refresh every 13 minutes in background - Added proactive refresh to prevent token expiry during form filling - Prevents users from losing form data due to expired sessions ### Centralised Logging (#1) - Created `/log` endpoint on API to receive frontend logs - Replaced API console.log calls with @nhcarrigan/logger - Created ConsoleLoggerService to intercept all console methods on frontend - Added global error handlers (window.error, unhandledrejection) on frontend - Added process error handlers (uncaughtException, unhandledRejection, SIGTERM, SIGINT) on API - All frontend console activity now forwarded to centralised logging ### Error Handling - Created ToastService and ToastComponent for displaying errors - Integrated with GlobalErrorHandler and HTTP interceptor - Added accessibility features (keyboard navigation, ARIA attributes) - Set toast opacity to 40% for optimal readability ### Testing & Build - Fixed pre-existing test failure for GET / route (now returns version info) - Added ESM module mocking (jsdom, marked, dompurify, @nhcarrigan/logger) - Configured Jest with isolatedModules to handle TypeScript errors - Excluded test-setup.ts from production build - All tests passing (123 total) - Build passing with no errors ## Test Plan - [x] All tests pass (123 tests) - [x] Build passes without errors - [x] Lint passes (only pre-existing warnings) - [x] Date fields work correctly on all media types - [x] Retired status displays and filters properly - [x] Avatar menu opens/closes correctly with keyboard and mouse - [x] Token refresh prevents session expiry - [x] Toast notifications appear for errors - [x] Frontend logs forward to API successfully - [x] Root route returns version information Closes #41 Closes #43 Closes #44 Closes #46 Closes #1 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Hikari <hikari@nhcarrigan.com> Reviewed-on: #50 Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com> Co-committed-by: Naomi Carrigan <commits@nhcarrigan.com>
129 lines
3.5 KiB
TypeScript
129 lines
3.5 KiB
TypeScript
/**
|
|
* @copyright 2026 NHCarrigan
|
|
* @license Naomi's Public License
|
|
* @author Naomi Carrigan
|
|
*/
|
|
|
|
import { Injectable, signal, inject } from '@angular/core';
|
|
import { Router } from '@angular/router';
|
|
import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs';
|
|
import { ApiService } from './api.service';
|
|
import { AuthResponse, User } from '@library/shared-types';
|
|
import { environment } from '../../environments/environment';
|
|
import { HttpClient } from '@angular/common/http';
|
|
|
|
@Injectable({
|
|
providedIn: 'root'
|
|
})
|
|
export class AuthService {
|
|
private api = inject(ApiService);
|
|
private router = inject(Router);
|
|
private http = inject(HttpClient);
|
|
|
|
private currentUser = signal<User | null>(null);
|
|
public readonly user = this.currentUser.asReadonly();
|
|
private refreshing = false;
|
|
private refreshInterval?: ReturnType<typeof setInterval>;
|
|
|
|
login(): void {
|
|
// Redirect to API login endpoint
|
|
window.location.href = `${environment.apiUrl}/auth/login`;
|
|
}
|
|
|
|
getCurrentUser(): Observable<AuthResponse> {
|
|
return this.api.get<AuthResponse>('/auth/me').pipe(
|
|
tap(response => {
|
|
this.currentUser.set(response.user);
|
|
this.startRefreshTimer();
|
|
}),
|
|
catchError(error => {
|
|
if (error.status === 401) {
|
|
return this.refreshToken().pipe(
|
|
switchMap(() => this.api.get<AuthResponse>('/auth/me')),
|
|
tap(response => {
|
|
this.currentUser.set(response.user);
|
|
this.startRefreshTimer();
|
|
}),
|
|
catchError(() => {
|
|
this.currentUser.set(null);
|
|
this.stopRefreshTimer();
|
|
return throwError(() => error);
|
|
})
|
|
);
|
|
}
|
|
return throwError(() => error);
|
|
})
|
|
);
|
|
}
|
|
|
|
refreshToken(): Observable<AuthResponse> {
|
|
if (this.refreshing) {
|
|
return of({ user: this.currentUser()!, accessToken: '' });
|
|
}
|
|
|
|
this.refreshing = true;
|
|
return this.http.post<AuthResponse>(
|
|
`${environment.apiUrl}/auth/refresh`,
|
|
{},
|
|
{ withCredentials: true }
|
|
).pipe(
|
|
tap(response => {
|
|
this.currentUser.set(response.user);
|
|
this.refreshing = false;
|
|
this.startRefreshTimer();
|
|
}),
|
|
catchError(error => {
|
|
this.refreshing = false;
|
|
this.currentUser.set(null);
|
|
this.stopRefreshTimer();
|
|
return throwError(() => error);
|
|
})
|
|
);
|
|
}
|
|
|
|
private startRefreshTimer(): void {
|
|
this.stopRefreshTimer();
|
|
|
|
// Refresh token every 13 minutes (before 15-minute expiry)
|
|
const refreshIntervalMs = 13 * 60 * 1000;
|
|
this.refreshInterval = setInterval(() => {
|
|
this.refreshToken().subscribe({
|
|
error: (err) => {
|
|
console.error('Background token refresh failed:', err);
|
|
this.stopRefreshTimer();
|
|
}
|
|
});
|
|
}, refreshIntervalMs);
|
|
}
|
|
|
|
private stopRefreshTimer(): void {
|
|
if (this.refreshInterval) {
|
|
clearInterval(this.refreshInterval);
|
|
this.refreshInterval = undefined;
|
|
}
|
|
}
|
|
|
|
logout(): Observable<{ message: string }> {
|
|
return this.api.post<{ message: string }>('/auth/logout', {}).pipe(
|
|
tap(() => {
|
|
this.currentUser.set(null);
|
|
this.api.clearCsrfToken();
|
|
this.stopRefreshTimer();
|
|
this.router.navigate(['/']);
|
|
})
|
|
);
|
|
}
|
|
|
|
clearUser(): void {
|
|
this.currentUser.set(null);
|
|
this.stopRefreshTimer();
|
|
}
|
|
|
|
isAuthenticated(): boolean {
|
|
return this.user() !== null;
|
|
}
|
|
|
|
isAdmin(): boolean {
|
|
return this.user()?.isAdmin === true;
|
|
}
|
|
} |