generated from nhcarrigan/template
86404497f0
## Summary This PR implements comprehensive user profile enhancements including: - User profile pages showing stats, badges, social links, and bio - Achievement system with 62 achievements across 5 categories - Primary badge selection allowing users to display their preferred badge - Admin profile editing capabilities ## Changes ### User Profiles (#45) - **Frontend**: User profile pages with stats display - Profile cards showing avatar, display name, username, and bio - Social links section (Website, GitHub, Bluesky, LinkedIn, Twitch, YouTube, Discord) - Stats display (suggestions, accepted suggestions, likes, comments) - Recent achievements section - Badge display - Report button for other users' profiles - **Backend**: Profile API endpoints - Get user profile by username or ID - Profile includes stats, badges, and achievement points ### Achievement System (#48) - **Database**: UserAchievement model for tracking progress - **62 Total Achievements** across 5 categories: - **Suggestions (15)**: First suggestion through ultimate curator - **Likes (12)**: First like through legendary fan - **Comments (12)**: First comment through review legend - **Engagement (15)**: Login streaks and activity milestones - **Reports (8)**: Valid reports and accuracy tracking - **Backend**: AchievementService with real-time checking - Integrated into all user interaction points - API endpoints for achievement data - Progress tracking to avoid recalculation - **Frontend**: Achievements page and profile integration - Full achievements page with category filtering - Tier-based styling (Bronze, Silver, Gold, Platinum, Diamond) - Progress indicators for in-progress achievements - Recent achievements on profile pages ### Primary Badge System (#49) - **Database**: Add primaryBadge field to User model - **Backend**: Update profile endpoints to include primary badge - **Frontend**: Primary badge selection in settings - Only shows badges the user has earned - Displayed on profile page - Displayed in comments (next to username) - Falls back to no badge if selection is invalid - **Admin Features**: Admin can edit any user's primary badge ### Admin Enhancements - Comprehensive profile editing modal for admins - Edit display name, bio, slug, social links - Set primary badge for users - Visual feedback for save/error states - Admin action buttons in report review modals - Ban user, delete comment, edit profile - Integrated with report workflow ### Quality Improvements - Improved dropdown option contrast for readability - Hide all badges when no primary badge is selected - "View All" achievements link only shown on own profile - Improved achievement text readability ## Testing - ✅ User profiles display correctly with stats and badges - ✅ Achievement checking works for all interaction types - ✅ Primary badge selection persists and displays correctly - ✅ Admin profile editing saves successfully - ✅ Report workflow integrated with admin actions - ✅ Achievements page shows all 62 achievements with filtering - ✅ Text readability improved across components Closes #45 Closes #48 Closes #49 Co-authored-by: Hikari <hikari@nhcarrigan.com> Reviewed-on: #58 Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com> Co-committed-by: Naomi Carrigan <commits@nhcarrigan.com>
133 lines
3.5 KiB
TypeScript
133 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;
|
|
}
|
|
|
|
updateUser(user: User): void {
|
|
this.currentUser.set(user);
|
|
}
|
|
|
|
isAdmin(): boolean {
|
|
return this.user()?.isAdmin === true;
|
|
}
|
|
} |