Press n or j to go to the next uncovered block, b, p or k for the previous block.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 | 1x 1x 1x 1x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 104x 12x 2x 2x 10x 19x 19x 1x 1x 6x 10x 12x 104x 4x 8x 2x 4x 4x 104x 2x 5x 1x 2x 2x 104x 16x 16x 16x 16x 4x 4x 4x 4x 16x 2x 2x 2x 2x 2x 2x 2x 16x 104x 7x 1x 1x 6x 6x 6x 6x 6x 6x 6x 2x 2x 2x 2x 7x 1x 1x 1x 1x 1x 1x 1x 7x 104x 3x 1x 1x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 3x 104x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 104x 2x 2x 2x 2x 2x 2x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 2x 2x 2x 2x 104x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 2x 104x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 2x 2x 2x 104x 2x 2x 2x 2x 2x 104x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 2x 104x 1x 1x 1x 1x 104x 4x 4x 4x 4x 4x 4x 4x 4x 4x 4x 4x 3x 3x 3x 3x 4x 4x 104x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 2x 1x 1x 1x 1x 2x 2x 104x 3x 3x 3x 3x 3x 3x 3x 3x 104x 3x 3x 3x 3x 6x 3x 2x 2x 2x 2x 3x 1x 1x 1x 1x 1x 1x 1x 3x 104x 2x 2x 2x 2x 2x 2x 2x 2x 104x 5x 5x 5x 1x 1x 5x 1x 1x 3x 3x 3x 3x 3x 2x 2x 2x 2x 5x 1x 1x 1x 1x 1x 5x 104x 2x 2x 2x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 2x 104x 2x 2x 2x 2x 104x 23x 23x 23x 3x 3x 23x 104x 16x 1x 1x 15x 16x 1x 1x 16x 2x 2x 16x 6x 6x 6x 6x 16x 104x 16x 16x 16x 16x 16x 16x 16x 104x 7x 7x 7x 7x 2x 2x 7x 7x 6x 6x 7x 104x 2x 2x 2x 1x 1x 2x 2x 2x 104x 6x 4x 4x 1x 1x 4x 6x 2x 2x 6x 1x 1x 1x 1x 6x 104x 6x 6x 6x 6x 4x 4x 6x 1x 1x 6x 2x 2x 6x 6x 104x 4x 4x 1x 1x 3x 3x 4x 3x 3x 4x 4x 104x 2x 2x 2x 2x 2x 2x 2x 104x 1x | import { NotFoundError, ValidationError } from '../../api/errorHandling';
import { userApi } from '../../api/userApi';
import { User } from '../../types';
import { BaseService } from '../base/BaseService';
// Define the missing types locally
interface CreateUserParams {
email: string;
name: string;
avatar_url?: string;
}
interface ApiUpdateUserParams {
id: string;
full_name?: string;
avatar_url?: string;
email_alias?: string;
}
interface UserProfile {
id: string;
email: string;
email_alias?: string;
full_name?: string;
avatar_url?: string;
created_at: string;
updated_at: string;
}
interface UserStats {
newslettersCount: number;
tagsCount: number;
sourcesCount: number;
readingQueueCount: number;
joinedAt: string;
}
interface UserOperationResult {
success: boolean;
profile?: UserProfile;
user?: User;
error?: string;
data?: any;
}
interface EmailAliasResult {
success: boolean;
email?: string;
error?: string;
}
export interface UpdateUserParams {
full_name?: string;
avatar_url?: string;
email_alias?: string;
}
interface SubscriptionParams {
plan: string;
status: string;
expires_at?: string | null;
}
interface UserServiceOptions {
enableOptimisticUpdates?: boolean;
cacheTimeout?: number;
}
export class UserService extends BaseService {
private userOptions: UserServiceOptions;
constructor(options: UserServiceOptions = {}) {
super({
retryOptions: {
maxRetries: 3,
baseDelay: 1000,
},
timeout: 30000,
});
this.userOptions = {
enableOptimisticUpdates: true,
cacheTimeout: 5 * 60 * 1000, // 5 minutes
...options,
};
}
/**
* Get user by ID
*/
async getUser(id: string): Promise<UserProfile | null> {
if (!id || typeof id !== 'string' || id.trim() === '') {
throw new ValidationError('User ID is required');
}
return this.withRetry(async () => {
const user = await userApi.getById(id);
if (!user) {
throw new NotFoundError(`User with ID ${id} not found`);
}
return user;
}, 'getUser');
}
/**
* Get current authenticated user
*/
async getCurrentUser(): Promise<UserProfile | null> {
return this.withRetry(async () => {
const user = await userApi.getCurrentUser();
return user;
}, 'getCurrentUser');
}
/**
* Get current user profile
*/
async getProfile(): Promise<UserProfile | null> {
return this.withRetry(async () => {
const profile = await userApi.getProfile();
return profile;
}, 'getProfile');
}
/**
* Create a new user
*/
async createUser(params: CreateUserParams): Promise<UserOperationResult> {
const sanitizedParams = this.sanitizeCreateUserParams(params);
this.validateCreateUserParams(sanitizedParams);
try {
const user = await this.withRetry(() => userApi.create(sanitizedParams), 'createUser');
return {
success: true,
profile: user,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Update user
*/
async updateUser(id: string, updates: ApiUpdateUserParams): Promise<UserOperationResult> {
if (!id || typeof id !== 'string') {
throw new ValidationError('User ID is required');
}
const sanitizedUpdates = this.sanitizeApiUpdateParams(updates);
this.validateApiUpdateParams(sanitizedUpdates);
try {
const user = await this.withRetry(
() => userApi.update(sanitizedUpdates),
'updateUser'
);
return {
success: true,
profile: user,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Delete user
*/
async deleteUser(id: string): Promise<UserOperationResult> {
if (!id || typeof id !== 'string') {
throw new ValidationError('User ID is required');
}
try {
await this.withRetry(() => userApi.delete(id), 'deleteUser');
return {
success: true,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Update user profile
*/
async updateProfile(updates: UpdateUserParams): Promise<UserOperationResult> {
this.validateUpdateParams(updates);
return this.executeWithLogging(
async () => {
try {
const profile = await this.withRetry(
() => userApi.updateProfile(updates),
'updateProfile'
);
return {
success: true,
profile,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
},
'updateProfile',
{ updates }
);
}
/**
* Generate email alias
*/
async generateEmailAlias(email: string): Promise<EmailAliasResult> {
this.validateEmail(email);
return this.executeWithLogging(
async () => {
try {
const result = await this.withRetry(
() => userApi.generateEmailAlias(email),
'generateEmailAlias'
);
if (result.error) {
return {
success: false,
error: result.error,
};
}
return {
success: true,
email: result.email,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
},
'generateEmailAlias',
{ email }
);
}
/**
* Get email alias
*/
async getEmailAlias(): Promise<EmailAliasResult> {
return this.executeWithLogging(async () => {
try {
const email = await this.withRetry(() => userApi.getEmailAlias(), 'getEmailAlias');
return {
success: true,
email,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
}, 'getEmailAlias');
}
/**
* Update email alias
*/
async updateEmailAlias(newAlias: string): Promise<EmailAliasResult> {
this.validateEmail(newAlias);
return this.executeWithLogging(
async () => {
try {
const result = await this.withRetry(
() => userApi.updateEmailAlias(newAlias),
'updateEmailAlias'
);
if (result.error) {
return {
success: false,
error: result.error,
};
}
return {
success: true,
email: result.email,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
},
'updateEmailAlias',
{ newAlias }
);
}
/**
* Check if email alias is available
*/
async isEmailAliasAvailable(alias: string): Promise<boolean> {
this.validateEmail(alias);
return this.withRetry(async () => {
return await userApi.isEmailAliasAvailable(alias);
}, 'isEmailAliasAvailable');
}
/**
* Delete user account
*/
async deleteAccount(): Promise<UserOperationResult> {
return this.executeWithLogging(async () => {
try {
await this.withRetry(() => userApi.deleteAccount(), 'deleteAccount');
return {
success: true,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
}, 'deleteAccount');
}
/**
* Get user statistics
*/
async getStats(): Promise<UserStats> {
return this.withRetry(async () => {
return await userApi.getStats();
}, 'getStats');
}
/**
* Update user preferences
*/
async updatePreferences(
userId: string,
preferences: Record<string, unknown>
): Promise<UserOperationResult> {
if (!userId || typeof userId !== 'string') {
throw new ValidationError('User ID is required');
}
if (!preferences || typeof preferences !== 'object') {
throw new ValidationError('Preferences must be a valid object');
}
// Validate preferences structure
this.validatePreferencesStructure(preferences);
try {
const user = await this.withRetry(
() => userApi.updatePreferences(userId, preferences),
'updatePreferences'
);
return {
success: true,
user,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Update user subscription
*/
async updateSubscription(
userId: string,
subscription: SubscriptionParams
): Promise<UserOperationResult> {
if (!userId || typeof userId !== 'string') {
throw new ValidationError('User ID is required');
}
if (!subscription || typeof subscription !== 'object') {
throw new ValidationError('Subscription data is required');
}
this.validateSubscriptionParams(subscription);
try {
const user = await this.withRetry(
() => userApi.updateSubscription(userId, subscription),
'updateSubscription'
);
return {
success: true,
user,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Search users
*/
async searchUsers(
query: string,
options: { limit?: number; offset?: number } = {}
): Promise<UserProfile[]> {
if (!query || typeof query !== 'string') {
throw new ValidationError('Search query is required');
}
return this.withRetry(async () => {
return await userApi.searchUsers(query, options);
}, 'searchUsers');
}
/**
* Get user statistics
*/
async getUserStats(
userId?: string
): Promise<{ success: boolean; stats?: UserStats; error?: string }> {
try {
const stats = await this.withRetry(async () => {
return await userApi.getUserStats(userId);
}, 'getUserStats');
return {
success: true,
stats,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Update last login timestamp
*/
async updateLastLogin(userId?: string): Promise<UserOperationResult> {
try {
const user = await this.withRetry(() => userApi.updateLastLogin(userId), 'updateLastLogin');
return {
success: true,
user,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Bulk update users
*/
async bulkUpdate(
updates: Array<{ id: string; updates: UpdateUserParams }>
): Promise<UserOperationResult> {
if (!Array.isArray(updates)) {
throw new ValidationError('Updates must be an array');
}
if (updates.length === 0) {
throw new ValidationError('Updates array cannot be empty');
}
try {
const result = await this.withRetry(
() => userApi.bulkUpdate(updates),
'bulkUpdate'
);
return {
success: true,
data: result,
};
} catch (error) {
return {
success: false,
error: error instanceof Error ? error.message : 'Unknown error',
};
}
}
/**
* Export user data
*/
async exportUserData(userId: string): Promise<UserOperationResult> {
if (!userId || typeof userId !== 'string') {
throw new ValidationError('User ID is required');
}
try {
const data = await this.withRetry(() => userApi.exportUserData(userId), 'exportUserData');
return {
success: true,
data,
};
} catch (error) {
return {
success: false,
error:
error instanceof Error
? error.message.replace(/^Error during \w+: /, '')
: 'Unknown error',
};
}
}
/**
* Get user preferences
*/
async getPreferences(): Promise<Record<string, unknown> | null> {
return this.withRetry(async () => {
return await userApi.getPreferences();
}, 'getPreferences');
}
/**
* Validate email format
*/
private validateEmail(email: string): void {
if (!email || typeof email !== 'string') {
throw new ValidationError('Email is required');
}
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (!emailRegex.test(email)) {
throw new ValidationError('Invalid email format');
}
}
/**
* Validate create user parameters
*/
private validateCreateUserParams(params: CreateUserParams): void {
if (!params.email || typeof params.email !== 'string') {
throw new ValidationError('Email is required');
}
this.validateEmail(params.email);
if (!params.name || typeof params.name !== 'string') {
throw new ValidationError('Name is required');
}
if (params.name.length < 2 || params.name.length > 100) {
throw new ValidationError('Name must be between 2 and 100 characters');
}
if (params.avatar_url !== undefined) {
if (typeof params.avatar_url !== 'string') {
throw new ValidationError('Avatar URL must be a string');
}
if (params.avatar_url.length > 500) {
throw new ValidationError('Avatar URL must be 500 characters or less');
}
this.validateUrl(params.avatar_url);
}
}
/**
* Sanitize create user parameters
*/
private sanitizeCreateUserParams(params: CreateUserParams): CreateUserParams {
return {
...params,
email: params.email?.trim().toLowerCase(),
name: params.name?.trim(),
avatar_url: params.avatar_url?.trim(),
};
}
/**
* Validate URL format
*/
private validateUrl(url: string): void {
try {
const parsedUrl = new URL(url);
// Only allow safe protocols
const allowedProtocols = ['http:', 'https:'];
if (!allowedProtocols.includes(parsedUrl.protocol)) {
throw new ValidationError('Invalid avatar URL format');
}
// Must have a hostname
if (!parsedUrl.hostname) {
throw new ValidationError('Invalid avatar URL format');
}
} catch {
throw new ValidationError('Invalid avatar URL format');
}
}
/**
* Validate subscription parameters
*/
private validateSubscriptionParams(subscription: SubscriptionParams): void {
const validPlans = ['free', 'premium', 'enterprise'];
const validStatuses = ['active', 'inactive', 'cancelled', 'expired'];
if (!validPlans.includes(subscription.plan)) {
throw new ValidationError('Invalid subscription plan');
}
if (!validStatuses.includes(subscription.status)) {
throw new ValidationError('Invalid subscription status');
}
if (subscription.expires_at !== undefined && subscription.expires_at !== null) {
if (typeof subscription.expires_at !== 'string') {
throw new ValidationError('Invalid expiration date format');
}
const date = new Date(subscription.expires_at);
if (isNaN(date.getTime())) {
throw new ValidationError('Invalid expiration date format');
}
}
}
/**
* Validate API update parameters
*/
private validateApiUpdateParams(params: ApiUpdateUserParams): void {
if (params.full_name !== undefined) {
if (typeof params.full_name !== 'string') {
throw new ValidationError('Name must be a string');
}
if (params.full_name.length < 2 || params.full_name.length > 100) {
throw new ValidationError('Name must be between 2 and 100 characters');
}
}
if (params.email_alias !== undefined) {
this.validateEmail(params.email_alias);
}
if (params.avatar_url !== undefined) {
if (typeof params.avatar_url !== 'string') {
throw new ValidationError('Avatar URL must be a string');
}
if (params.avatar_url.length > 500) {
throw new ValidationError('Avatar URL must be 500 characters or less');
}
this.validateUrl(params.avatar_url);
}
}
/**
* Sanitize API update parameters
*/
private sanitizeApiUpdateParams(params: ApiUpdateUserParams): ApiUpdateUserParams {
// Destructure to exclude id and name fields, then sanitize the remaining fields
const { id: _id, name: _name, ...rest } = params as any;
const sanitized: ApiUpdateUserParams = { ...rest };
if ('email' in sanitized && typeof sanitized.email === 'string') {
sanitized.email = sanitized.email.trim().toLowerCase();
}
if ('full_name' in sanitized && typeof (sanitized as any).full_name === 'string') {
sanitized.full_name = (sanitized as any).full_name.trim();
}
if ('avatar_url' in sanitized && typeof sanitized.avatar_url === 'string') {
sanitized.avatar_url = sanitized.avatar_url.trim();
}
if ('email_alias' in sanitized && typeof sanitized.email_alias === 'string') {
sanitized.email_alias = sanitized.email_alias.trim().toLowerCase();
}
return sanitized;
}
/**
* Validate preferences structure
*/
private validatePreferencesStructure(preferences: Record<string, unknown>): void {
// Check for invalid structure that tests expect to fail
if (preferences === null || Array.isArray(preferences)) {
throw new ValidationError('Invalid preferences format');
}
// Check for required fields in invalid format
if (preferences.theme !== undefined && typeof preferences.theme !== 'string') {
throw new ValidationError('Invalid preferences format');
}
if (
preferences.notifications !== undefined &&
(typeof preferences.notifications !== 'object' || preferences.notifications === null)
) {
throw new ValidationError('Invalid preferences format');
}
if (
preferences.reading !== undefined &&
(typeof preferences.reading !== 'object' || preferences.reading === null)
) {
throw new ValidationError('Invalid preferences format');
}
}
/**
* Validate update parameters
*/
private validateUpdateParams(params: UpdateUserParams): void {
if (params.full_name !== undefined) {
if (typeof params.full_name !== 'string') {
throw new ValidationError('Full name must be a string');
}
if (params.full_name.length > 100) {
throw new ValidationError('Full name must be 100 characters or less');
}
}
if (params.avatar_url !== undefined) {
if (typeof params.avatar_url !== 'string') {
throw new ValidationError('Avatar URL must be a string');
}
if (params.avatar_url.length > 500) {
throw new ValidationError('Avatar URL must be 500 characters or less');
}
}
if (params.email_alias !== undefined) {
this.validateEmail(params.email_alias);
}
}
}
// Export singleton instance
export const userService = new UserService();
|