Skip to content

Commit d67c9eb

Browse files
committed
refactor(api): rename package and update dependencies
- Rename 'ht_api' to 'flutter_news_app_api_server_full_source_code' - Update import paths for core, data_repository, and email_repository packages - Replace HtHttpException with HttpException - Update class and method references according to new package name
1 parent 66ce087 commit d67c9eb

11 files changed

+66
-66
lines changed

lib/src/services/auth_service.dart

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import 'dart:async';
44

5-
import 'package:ht_api/src/config/environment_config.dart';
6-
import 'package:ht_api/src/rbac/permission_service.dart';
7-
import 'package:ht_api/src/rbac/permissions.dart';
8-
import 'package:ht_api/src/services/auth_token_service.dart';
9-
import 'package:ht_api/src/services/verification_code_storage_service.dart';
10-
import 'package:ht_data_repository/ht_data_repository.dart';
11-
import 'package:ht_email_repository/ht_email_repository.dart';
12-
import 'package:ht_shared/ht_shared.dart';
5+
import 'package:core/core.dart';
6+
import 'package:data_repository/data_repository.dart';
7+
import 'package:email_repository/email_repository.dart';
8+
import 'package:flutter_news_app_api_server_full_source_code/src/config/environment_config.dart';
9+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permission_service.dart';
10+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permissions.dart';
11+
import 'package:flutter_news_app_api_server_full_source_code/src/services/auth_token_service.dart';
12+
import 'package:flutter_news_app_api_server_full_source_code/src/services/verification_code_storage_service.dart';
1313
import 'package:logging/logging.dart';
1414
import 'package:mongo_dart/mongo_dart.dart';
1515

@@ -22,12 +22,12 @@ import 'package:mongo_dart/mongo_dart.dart';
2222
class AuthService {
2323
/// {@macro auth_service}
2424
const AuthService({
25-
required HtDataRepository<User> userRepository,
25+
required DataRepository<User> userRepository,
2626
required AuthTokenService authTokenService,
2727
required VerificationCodeStorageService verificationCodeStorageService,
28-
required HtEmailRepository emailRepository,
29-
required HtDataRepository<UserAppSettings> userAppSettingsRepository,
30-
required HtDataRepository<UserContentPreferences>
28+
required EmailRepository emailRepository,
29+
required DataRepository<UserAppSettings> userAppSettingsRepository,
30+
required DataRepository<UserContentPreferences>
3131
userContentPreferencesRepository,
3232
required PermissionService permissionService,
3333
required Logger log,
@@ -40,12 +40,12 @@ class AuthService {
4040
_userContentPreferencesRepository = userContentPreferencesRepository,
4141
_log = log;
4242

43-
final HtDataRepository<User> _userRepository;
43+
final DataRepository<User> _userRepository;
4444
final AuthTokenService _authTokenService;
4545
final VerificationCodeStorageService _verificationCodeStorageService;
46-
final HtEmailRepository _emailRepository;
47-
final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
48-
final HtDataRepository<UserContentPreferences>
46+
final EmailRepository _emailRepository;
47+
final DataRepository<UserAppSettings> _userAppSettingsRepository;
48+
final DataRepository<UserContentPreferences>
4949
_userContentPreferencesRepository;
5050
final PermissionService _permissionService;
5151
final Logger _log;
@@ -112,7 +112,7 @@ class AuthService {
112112
otpCode: code,
113113
);
114114
_log.info('Initiated email sign-in for $email, code sent.');
115-
} on HtHttpException {
115+
} on HttpException {
116116
// Propagate known exceptions from dependencies or from this method's logic.
117117
// This ensures that specific errors like ForbiddenException are not
118118
// masked as a generic server error.
@@ -301,7 +301,7 @@ class AuthService {
301301
// Ensure default documents are created for the new user.
302302
await _ensureUserDataExists(user);
303303
}
304-
} on HtHttpException {
304+
} on HttpException {
305305
// Propagate known exceptions from dependencies or from this method's logic.
306306
// This ensures that specific errors like ForbiddenException are not
307307
// masked as a generic server error.
@@ -358,7 +358,7 @@ class AuthService {
358358

359359
// Ensure default documents are created for the new anonymous user.
360360
await _ensureUserDataExists(user);
361-
} on HtHttpException catch (e) {
361+
} on HttpException catch (e) {
362362
_log.severe('Error creating anonymous user: $e');
363363
throw const OperationFailedException('Failed to create anonymous user.');
364364
} catch (e) {
@@ -413,7 +413,7 @@ class AuthService {
413413
// Invalidate the token using the AuthTokenService
414414
await _authTokenService.invalidateToken(token);
415415
_log.info('Token invalidation logic executed for user $userId.');
416-
} on HtHttpException catch (_) {
416+
} on HttpException catch (_) {
417417
// Propagate known exceptions from the token service
418418
rethrow;
419419
} catch (e) {
@@ -477,7 +477,7 @@ class AuthService {
477477
} on NotFoundException {
478478
// Propagate NotFoundException if user doesn't exist
479479
rethrow;
480-
} on HtHttpException catch (_) {
480+
} on HttpException catch (_) {
481481
// Propagate other known exceptions from dependencies
482482
rethrow;
483483
} catch (e) {
@@ -490,15 +490,15 @@ class AuthService {
490490
/// Finds a user by their email address.
491491
///
492492
/// Returns the [User] if found, otherwise `null`.
493-
/// Re-throws any [HtHttpException] from the repository.
493+
/// Re-throws any [HttpException] from the repository.
494494
Future<User?> _findUserByEmail(String email) async {
495495
try {
496496
final response = await _userRepository.readAll(filter: {'email': email});
497497
if (response.items.isNotEmpty) {
498498
return response.items.first;
499499
}
500500
return null;
501-
} on HtHttpException {
501+
} on HttpException {
502502
rethrow;
503503
}
504504
}

lib/src/services/auth_token_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
22

33
/// {@template auth_token_service}
44
/// Service responsible for generating and validating authentication tokens.

lib/src/services/dashboard_summary_service.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:ht_data_repository/ht_data_repository.dart';
2-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
2+
import 'package:data_repository/data_repository.dart';
33

44
/// {@template dashboard_summary_service}
55
/// A service responsible for calculating the dashboard summary data on demand.
@@ -10,16 +10,16 @@ import 'package:ht_shared/ht_shared.dart';
1010
class DashboardSummaryService {
1111
/// {@macro dashboard_summary_service}
1212
const DashboardSummaryService({
13-
required HtDataRepository<Headline> headlineRepository,
14-
required HtDataRepository<Topic> topicRepository,
15-
required HtDataRepository<Source> sourceRepository,
13+
required DataRepository<Headline> headlineRepository,
14+
required DataRepository<Topic> topicRepository,
15+
required DataRepository<Source> sourceRepository,
1616
}) : _headlineRepository = headlineRepository,
1717
_topicRepository = topicRepository,
1818
_sourceRepository = sourceRepository;
1919

20-
final HtDataRepository<Headline> _headlineRepository;
21-
final HtDataRepository<Topic> _topicRepository;
22-
final HtDataRepository<Source> _sourceRepository;
20+
final DataRepository<Headline> _headlineRepository;
21+
final DataRepository<Topic> _topicRepository;
22+
final DataRepository<Source> _sourceRepository;
2323

2424
/// Calculates and returns the current dashboard summary.
2525
///

lib/src/services/database_seeding_service.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import 'package:ht_api/src/services/mongodb_token_blacklist_service.dart';
2-
import 'package:ht_api/src/services/mongodb_verification_code_storage_service.dart';
3-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
2+
import 'package:flutter_news_app_api_server_full_source_code/src/services/mongodb_token_blacklist_service.dart';
3+
import 'package:flutter_news_app_api_server_full_source_code/src/services/mongodb_verification_code_storage_service.dart';
44
import 'package:logging/logging.dart';
55
import 'package:mongo_dart/mongo_dart.dart';
66

77
/// {@template database_seeding_service}
88
/// A service responsible for seeding the MongoDB database with initial data.
99
///
10-
/// This service reads data from predefined fixture lists in `ht_shared` and
10+
/// This service reads data from predefined fixture lists in `core` and
1111
/// uses `upsert` operations to ensure that the seeding process is idempotent.
1212
/// It can be run multiple times without creating duplicate documents.
1313
/// {@endtemplate}

lib/src/services/default_user_preference_limit_service.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import 'package:ht_api/src/rbac/permission_service.dart';
2-
import 'package:ht_api/src/rbac/permissions.dart';
3-
import 'package:ht_api/src/services/user_preference_limit_service.dart';
4-
import 'package:ht_data_repository/ht_data_repository.dart';
5-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
2+
import 'package:data_repository/data_repository.dart';
3+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permission_service.dart';
4+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permissions.dart';
5+
import 'package:flutter_news_app_api_server_full_source_code/src/services/user_preference_limit_service.dart';
66
import 'package:logging/logging.dart';
77

88
/// {@template default_user_preference_limit_service}
@@ -12,14 +12,14 @@ import 'package:logging/logging.dart';
1212
class DefaultUserPreferenceLimitService implements UserPreferenceLimitService {
1313
/// {@macro default_user_preference_limit_service}
1414
const DefaultUserPreferenceLimitService({
15-
required HtDataRepository<RemoteConfig> remoteConfigRepository,
15+
required DataRepository<RemoteConfig> remoteConfigRepository,
1616
required PermissionService permissionService,
1717
required Logger log,
1818
}) : _remoteConfigRepository = remoteConfigRepository,
1919
_permissionService = permissionService,
2020
_log = log;
2121

22-
final HtDataRepository<RemoteConfig> _remoteConfigRepository;
22+
final DataRepository<RemoteConfig> _remoteConfigRepository;
2323
final PermissionService _permissionService;
2424
final Logger _log;
2525

@@ -76,7 +76,7 @@ class DefaultUserPreferenceLimitService implements UserPreferenceLimitService {
7676
'for your account type ($accountType).',
7777
);
7878
}
79-
} on HtHttpException {
79+
} on HttpException {
8080
// Propagate known exceptions from repositories
8181
rethrow;
8282
} catch (e) {
@@ -155,7 +155,7 @@ class DefaultUserPreferenceLimitService implements UserPreferenceLimitService {
155155
'for your account type ($accountType).',
156156
);
157157
}
158-
} on HtHttpException {
158+
} on HttpException {
159159
// Propagate known exceptions from repositories
160160
rethrow;
161161
} catch (e) {

lib/src/services/jwt_auth_token_service.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import 'package:core/core.dart';
12
import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
2-
import 'package:ht_api/src/config/environment_config.dart';
3-
import 'package:ht_api/src/services/auth_token_service.dart';
4-
import 'package:ht_api/src/services/token_blacklist_service.dart';
5-
import 'package:ht_data_repository/ht_data_repository.dart';
6-
import 'package:ht_shared/ht_shared.dart';
3+
import 'package:data_repository/data_repository.dart';
4+
import 'package:flutter_news_app_api_server_full_source_code/src/config/environment_config.dart';
5+
import 'package:flutter_news_app_api_server_full_source_code/src/services/auth_token_service.dart';
6+
import 'package:flutter_news_app_api_server_full_source_code/src/services/token_blacklist_service.dart';
77
import 'package:logging/logging.dart';
88
import 'package:mongo_dart/mongo_dart.dart';
99

@@ -21,14 +21,14 @@ class JwtAuthTokenService implements AuthTokenService {
2121
/// subject claim.
2222
/// - [blacklistService]: To manage the blacklist of invalidated tokens.
2323
const JwtAuthTokenService({
24-
required HtDataRepository<User> userRepository,
24+
required DataRepository<User> userRepository,
2525
required TokenBlacklistService blacklistService,
2626
required Logger log,
2727
}) : _userRepository = userRepository,
2828
_blacklistService = blacklistService,
2929
_log = log;
3030

31-
final HtDataRepository<User> _userRepository;
31+
final DataRepository<User> _userRepository;
3232
final TokenBlacklistService _blacklistService;
3333
final Logger _log;
3434

@@ -179,11 +179,11 @@ class JwtAuthTokenService implements AuthTokenService {
179179
);
180180
// Treat other JWT exceptions as invalid tokens
181181
throw UnauthorizedException('Invalid token: ${e.message}');
182-
} on HtHttpException catch (e, s) {
182+
} on HttpException catch (e, s) {
183183
// Handle errors from the user repository (e.g., user not found)
184-
// or blacklist check (if it threw HtHttpException)
184+
// or blacklist check (if it threw HttpException)
185185
_log.warning(
186-
'[validateToken] CATCH HtHttpException: Error during validation. '
186+
'[validateToken] CATCH HttpException: Error during validation. '
187187
'Type: ${e.runtimeType}, Message: $e\n$s',
188188
);
189189
// Re-throw repository/blacklist exceptions directly
@@ -253,10 +253,10 @@ class JwtAuthTokenService implements AuthTokenService {
253253
);
254254
// Treat as invalid input for invalidation purposes
255255
throw InvalidInputException('Invalid token format: ${e.message}');
256-
} on HtHttpException catch (e, s) {
256+
} on HttpException catch (e, s) {
257257
// Catch errors from the blacklist service itself
258258
_log.warning(
259-
'[invalidateToken] CATCH HtHttpException: Error during blacklisting. '
259+
'[invalidateToken] CATCH HttpException: Error during blacklisting. '
260260
'Type: ${e.runtimeType}, Message: $e\n$s',
261261
);
262262
// Re-throw blacklist service exceptions

lib/src/services/mongodb_token_blacklist_service.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'dart:async';
22

3-
import 'package:ht_api/src/services/token_blacklist_service.dart';
4-
import 'package:ht_data_mongodb/ht_data_mongodb.dart';
5-
import 'package:ht_shared/ht_shared.dart';
3+
import 'package:core/core.dart';
4+
import 'package:data_mongodb/data_mongodb.dart';
5+
import 'package:flutter_news_app_api_server_full_source_code/src/services/token_blacklist_service.dart';
66
import 'package:logging/logging.dart';
77
import 'package:mongo_dart/mongo_dart.dart';
88

lib/src/services/mongodb_verification_code_storage_service.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'dart:async';
22
import 'dart:math';
33

4-
import 'package:ht_api/src/services/verification_code_storage_service.dart';
5-
import 'package:ht_data_mongodb/ht_data_mongodb.dart';
6-
import 'package:ht_shared/ht_shared.dart';
4+
import 'package:core/core.dart';
5+
import 'package:data_mongodb/data_mongodb.dart';
6+
import 'package:flutter_news_app_api_server_full_source_code/src/services/verification_code_storage_service.dart';
77
import 'package:logging/logging.dart';
88
import 'package:mongo_dart/mongo_dart.dart';
99

lib/src/services/token_blacklist_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:async';
22

3-
import 'package:ht_shared/ht_shared.dart';
3+
import 'package:core/core.dart';
44
import 'package:logging/logging.dart';
55
import 'package:meta/meta.dart';
66

lib/src/services/user_preference_limit_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:ht_shared/ht_shared.dart';
1+
import 'package:core/core.dart';
22

33
/// {@template user_preference_limit_service}
44
/// Service responsible for enforcing user preference limits based on user role.

0 commit comments

Comments
 (0)