Skip to content

Commit 33fc121

Browse files
committed
refactor(api): update imports and exceptions handling
- Update import paths to use core package and local paths - Replace HtHttpException with HttpException for broader error handling - Update error mapping and logging to use new exception types - Remove unused imports and adjust package references
1 parent 993b263 commit 33fc121

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

lib/src/middlewares/authentication_middleware.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import 'package:core/core.dart';
12
import 'package:dart_frog/dart_frog.dart';
2-
import 'package:ht_api/src/services/auth_token_service.dart';
3-
import 'package:ht_shared/ht_shared.dart';
3+
import 'package:flutter_news_app_api_server_full_source_code/src/services/auth_token_service.dart';
44
import 'package:logging/logging.dart';
55

66
final _log = Logger('AuthMiddleware');
@@ -58,12 +58,12 @@ Middleware authenticationProvider() {
5858
// using this middleware strictly require a valid token.
5959
// However, providing null allows routes to handle optional auth.
6060
}
61-
} on HtHttpException catch (e) {
61+
} on HttpException catch (e) {
6262
// Log token validation errors from the service
6363
_log.warning('Token validation failed.', e);
6464
// Let the error propagate if needed, or handle specific cases.
6565
// For now, we treat validation errors as resulting in no user.
66-
user = null; // Keep user null if HtHttpException occurred
66+
user = null; // Keep user null if HttpException occurred
6767
} catch (e, s) {
6868
// Catch unexpected errors during validation
6969
_log.severe('Unexpected error during token validation.', e, s);

lib/src/middlewares/authorization_middleware.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import 'package:core/core.dart';
12
import 'package:dart_frog/dart_frog.dart';
2-
import 'package:ht_api/src/rbac/permission_service.dart';
3-
import 'package:ht_api/src/registry/model_registry.dart';
4-
import 'package:ht_shared/ht_shared.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/registry/model_registry.dart';
55
import 'package:logging/logging.dart';
66

77
final _log = Logger('AuthorizationMiddleware');

lib/src/middlewares/error_handler.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import 'dart:io';
55

6+
import 'package:core/core.dart';
67
import 'package:dart_frog/dart_frog.dart';
7-
import 'package:ht_api/src/config/environment_config.dart';
8-
import 'package:ht_shared/ht_shared.dart';
8+
import 'package:flutter_news_app_api_server_full_source_code/src/config/environment_config.dart';
99
import 'package:json_annotation/json_annotation.dart';
1010
import 'package:logging/logging.dart';
1111

@@ -20,10 +20,10 @@ Middleware errorHandler() {
2020
// Attempt to execute the request handler
2121
final response = await handler(context);
2222
return response;
23-
} on HtHttpException catch (e, stackTrace) {
24-
// Handle specific HtHttpExceptions from the client/repository layers
23+
} on HttpException catch (e, stackTrace) {
24+
// Handle specific HttpExceptions from the client/repository layers
2525
final statusCode = _mapExceptionToStatusCode(e);
26-
_log.warning('HtHttpException Caught', e, stackTrace);
26+
_log.warning('HttpException Caught', e, stackTrace);
2727
return _jsonErrorResponse(
2828
statusCode: statusCode,
2929
exception: e,
@@ -64,8 +64,8 @@ Middleware errorHandler() {
6464
};
6565
}
6666

67-
/// Maps HtHttpException subtypes to appropriate HTTP status codes.
68-
int _mapExceptionToStatusCode(HtHttpException exception) {
67+
/// Maps HttpException subtypes to appropriate HTTP status codes.
68+
int _mapExceptionToStatusCode(HttpException exception) {
6969
return switch (exception) {
7070
InvalidInputException() => HttpStatus.badRequest, // 400
7171
AuthenticationException() => HttpStatus.unauthorized, // 401
@@ -82,8 +82,8 @@ int _mapExceptionToStatusCode(HtHttpException exception) {
8282
};
8383
}
8484

85-
/// Maps HtHttpException subtypes to consistent error code strings.
86-
String _mapExceptionToCodeString(HtHttpException exception) {
85+
/// Maps HttpException subtypes to consistent error code strings.
86+
String _mapExceptionToCodeString(HttpException exception) {
8787
return switch (exception) {
8888
InvalidInputException() => 'invalidInput',
8989
AuthenticationException() => 'authenticationFailed',
@@ -107,7 +107,7 @@ String _mapExceptionToCodeString(HtHttpException exception) {
107107
/// application to read the error message body.
108108
Response _jsonErrorResponse({
109109
required int statusCode,
110-
required HtHttpException exception,
110+
required HttpException exception,
111111
required RequestContext context,
112112
}) {
113113
final errorCode = _mapExceptionToCodeString(exception);

lib/src/middlewares/ownership_check_middleware.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import 'package:core/core.dart';
12
import 'package:dart_frog/dart_frog.dart';
2-
import 'package:ht_api/src/rbac/permission_service.dart';
3-
import 'package:ht_api/src/registry/model_registry.dart';
4-
import 'package:ht_data_repository/ht_data_repository.dart';
5-
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/rbac/permission_service.dart';
5+
import 'package:flutter_news_app_api_server_full_source_code/src/registry/model_registry.dart';
66

77
/// A wrapper class to provide a fetched item into the request context.
88
///
@@ -72,13 +72,13 @@ Middleware ownershipCheckMiddleware() {
7272

7373
switch (modelName) {
7474
case 'user':
75-
final repo = context.read<HtDataRepository<User>>();
75+
final repo = context.read<DataRepository<User>>();
7676
item = await repo.read(id: id, userId: userIdForRepoCall);
7777
case 'user_app_settings':
78-
final repo = context.read<HtDataRepository<UserAppSettings>>();
78+
final repo = context.read<DataRepository<UserAppSettings>>();
7979
item = await repo.read(id: id, userId: userIdForRepoCall);
8080
case 'user_content_preferences':
81-
final repo = context.read<HtDataRepository<UserContentPreferences>>();
81+
final repo = context.read<DataRepository<UserContentPreferences>>();
8282
item = await repo.read(id: id, userId: userIdForRepoCall);
8383
default:
8484
throw OperationFailedException(

0 commit comments

Comments
 (0)