Refactor/sync with core package update

analysis_options.yaml

@@ -11,6 +11,7 @@ analyzer:
     document_ignores: ignore
     one_member_abstracts: ignore
     cascade_invocations: ignore
+    cast_nullable_to_non_nullable: ignore
   exclude:
     - build/**
 linter:

lib/src/config/app_dependencies.dart

@@ -65,7 +65,7 @@ class AppDependencies {
   late final DataRepository<Country> countryRepository;
   late final DataRepository<Language> languageRepository;
   late final DataRepository<User> userRepository;
-  late final DataRepository<UserAppSettings> userAppSettingsRepository;
+  late final DataRepository<AppSettings> appSettingsRepository;
   late final DataRepository<UserContentPreferences>
   userContentPreferencesRepository;
   late final DataRepository<PushNotificationDevice>
@@ -190,12 +190,12 @@ class AppDependencies {
         toJson: (item) => item.toJson(),
         logger: Logger('DataMongodb<User>'),
       );
-      final userAppSettingsClient = DataMongodb<UserAppSettings>(
+      final appSettingsClient = DataMongodb<AppSettings>(
         connectionManager: _mongoDbConnectionManager,
-        modelName: 'user_app_settings',
-        fromJson: UserAppSettings.fromJson,
+        modelName: 'app_settings',
+        fromJson: AppSettings.fromJson,
         toJson: (item) => item.toJson(),
-        logger: Logger('DataMongodb<UserAppSettings>'),
+        logger: Logger('DataMongodb<AppSettings>'),
       );
       final userContentPreferencesClient = DataMongodb<UserContentPreferences>(
         connectionManager: _mongoDbConnectionManager,
@@ -306,8 +306,8 @@ class AppDependencies {
       countryRepository = DataRepository(dataClient: countryClient);
       languageRepository = DataRepository(dataClient: languageClient);
       userRepository = DataRepository(dataClient: userClient);
-      userAppSettingsRepository = DataRepository(
-        dataClient: userAppSettingsClient,
+      appSettingsRepository = DataRepository(
+        dataClient: appSettingsClient,
       );
       userContentPreferencesRepository = DataRepository(
         dataClient: userContentPreferencesClient,
@@ -359,7 +359,7 @@ class AppDependencies {
         verificationCodeStorageService: verificationCodeStorageService,
         permissionService: permissionService,
         emailRepository: emailRepository,
-        userAppSettingsRepository: userAppSettingsRepository,
+        appSettingsRepository: appSettingsRepository,
         userContentPreferencesRepository: userContentPreferencesRepository,
         log: Logger('AuthService'),
       );

lib/src/models/models.dart

@@ -0,0 +1,2 @@
+export 'push_notification/push_notification.dart';
+export 'request_id.dart';

lib/src/models/push_notification/firebase_request_body.dart

@@ -0,0 +1,95 @@
+import 'package:core/core.dart';
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'firebase_request_body.g.dart';
+
+/// {@template firebase_request_body}
+/// Represents the top-level structure for a Firebase Cloud Messaging
+/// v1 API request.
+/// {@endtemplate}
+@JsonSerializable(
+  explicitToJson: true,
+  includeIfNull: true,
+  checked: true,
+  createFactory: false,
+)
+class FirebaseRequestBody extends Equatable {
+  /// {@macro firebase_request_body}
+  const FirebaseRequestBody({required this.message});
+
+  /// The message payload.
+  final FirebaseMessage message;
+
+  /// Converts this [FirebaseRequestBody] instance to a JSON map.
+  Map<String, dynamic> toJson() => _$FirebaseRequestBodyToJson(this);
+
+  @override
+  List<Object> get props => [message];
+}
+
+/// {@template firebase_message}
+/// Represents the message object within a Firebase request.
+/// {@endtemplate}
+@JsonSerializable(
+  explicitToJson: true,
+  includeIfNull: true,
+  checked: true,
+  createFactory: false,
+)
+class FirebaseMessage extends Equatable {
+  /// {@macro firebase_message}
+  const FirebaseMessage({
+    required this.token,
+    required this.notification,
+    required this.data,
+  });
+
+  /// The registration token of the device to send the message to.
+  final String token;
+
+  /// The notification content.
+  final FirebaseNotification notification;
+
+  /// The custom data payload.
+  final PushNotificationPayload data;
+
+  /// Converts this [FirebaseMessage] instance to a JSON map.
+  Map<String, dynamic> toJson() => _$FirebaseMessageToJson(this);
+
+  @override
+  List<Object> get props => [token, notification, data];
+}
+
+/// {@template firebase_notification}
+/// Represents the notification content within a Firebase message.
+/// {@endtemplate}
+@JsonSerializable(
+  explicitToJson: true,
+  includeIfNull: true,
+  checked: true,
+  createFactory: false,
+)
+class FirebaseNotification extends Equatable {
+  /// {@macro firebase_notification}
+  const FirebaseNotification({
+    required this.title,
+    this.body,
+    this.image,
+  });
+
+  /// The notification's title.
+  final String title;
+
+  /// The notification's body text.
+  final String? body;
+
+  /// The URL of an image to be displayed in the notification.
+  final String? image;
+
+  /// Converts this [FirebaseNotification] instance to a JSON map.
+  Map<String, dynamic> toJson() => _$FirebaseNotificationToJson(this);
+
+  @override
+  List<Object?> get props => [title, body, image];
+}

lib/src/models/push_notification/onesignal_request_body.dart

@@ -0,0 +1,58 @@
+import 'package:core/core.dart';
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'onesignal_request_body.g.dart';
+
+/// {@template onesignal_request_body}
+/// Represents the request body for the OneSignal /notifications endpoint.
+/// {@endtemplate}
+@JsonSerializable(
+  explicitToJson: true,
+  includeIfNull: false, // Do not include null fields in the JSON
+  checked: true,
+  fieldRename: FieldRename.snake,
+  createFactory: false,
+)
+class OneSignalRequestBody extends Equatable {
+  /// {@macro onesignal_request_body}
+  const OneSignalRequestBody({
+    required this.appId,
+    required this.includePlayerIds,
+    required this.headings,
+    required this.data,
+    this.contents,
+    this.bigPicture,
+  });
+
+  /// The OneSignal App ID.
+  final String appId;
+
+  /// A list of OneSignal Player IDs to send the notification to.
+  final List<String> includePlayerIds;
+
+  /// The notification's title.
+  final Map<String, String> headings;
+
+  /// The notification's content.
+  final Map<String, String>? contents;
+
+  /// The custom data payload
+  final PushNotificationPayload data;
+
+  /// The URL of a large image to display in the notification.
+  final String? bigPicture;
+
+  /// Converts this [OneSignalRequestBody] instance to a JSON map.
+  Map<String, dynamic> toJson() => _$OneSignalRequestBodyToJson(this);
+
+  @override
+  List<Object?> get props => [
+    appId,
+    includePlayerIds,
+    headings,
+    contents,
+    data,
+    bigPicture,
+  ];
+}

lib/src/models/push_notification/push_notification.dart

@@ -0,0 +1,2 @@
+export 'firebase_request_body.dart';
+export 'onesignal_request_body.dart';

lib/src/rbac/permissions.dart

@@ -50,9 +50,8 @@ abstract class Permissions {
   static const String userUpdate = 'user.update';
 
   // User App Settings Permissions (User-owned)
-  static const String userAppSettingsReadOwned = 'user_app_settings.read_owned';
-  static const String userAppSettingsUpdateOwned =
-      'user_app_settings.update_owned';
+  static const String appSettingsReadOwned = 'app_settings.read_owned';
+  static const String appSettingsUpdateOwned = 'app_settings.update_owned';
 
   // User Content Preferences Permissions (User-owned)
   static const String userContentPreferencesReadOwned =

lib/src/rbac/role_permissions.dart

@@ -9,8 +9,8 @@ final Set<String> _appGuestUserPermissions = {
   Permissions.sourceRead,
   Permissions.countryRead,
   Permissions.languageRead,
-  Permissions.userAppSettingsReadOwned,
-  Permissions.userAppSettingsUpdateOwned,
+  Permissions.appSettingsReadOwned,
+  Permissions.appSettingsUpdateOwned,
   Permissions.userContentPreferencesReadOwned,
   Permissions.userContentPreferencesUpdateOwned,
   Permissions.remoteConfigRead,

lib/src/registry/data_operation_registry.dart

@@ -113,8 +113,8 @@ class DataOperationRegistry {
           c.read<DataRepository<Language>>().read(id: id, userId: null),
       'user': (c, id) =>
           c.read<DataRepository<User>>().read(id: id, userId: null),
-      'user_app_settings': (c, id) =>
-          c.read<DataRepository<UserAppSettings>>().read(id: id, userId: null),
+      'app_settings': (c, id) =>
+          c.read<DataRepository<AppSettings>>().read(id: id, userId: null),
       'user_content_preferences': (c, id) => c
           .read<DataRepository<UserContentPreferences>>()
           .read(id: id, userId: null),
@@ -389,9 +389,9 @@ class DataOperationRegistry {
           userId: uid,
         );
       },
-      'user_app_settings': (c, id, item, uid) => c
-          .read<DataRepository<UserAppSettings>>()
-          .update(id: id, item: item as UserAppSettings, userId: uid),
+      'app_settings': (c, id, item, uid) => c
+          .read<DataRepository<AppSettings>>()
+          .update(id: id, item: item as AppSettings, userId: uid),
       'user_content_preferences': (context, id, item, uid) async {
         _log.info(
           'Executing custom updater for user_content_preferences ID: $id.',
@@ -454,8 +454,8 @@ class DataOperationRegistry {
           c.read<DataRepository<Country>>().delete(id: id, userId: uid),
       'language': (c, id, uid) =>
           c.read<DataRepository<Language>>().delete(id: id, userId: uid),
-      'user_app_settings': (c, id, uid) =>
-          c.read<DataRepository<UserAppSettings>>().delete(id: id, userId: uid),
+      'app_settings': (c, id, uid) =>
+          c.read<DataRepository<AppSettings>>().delete(id: id, userId: uid),
       'user_content_preferences': (c, id, uid) => c
           .read<DataRepository<UserContentPreferences>>()
           .delete(id: id, userId: uid),

lib/src/registry/model_registry.dart

@@ -305,37 +305,36 @@ final modelRegistry = <String, ModelConfig<dynamic>>{
       type: RequiredPermissionType.unsupported,
     ),
   ),
-  'user_app_settings': ModelConfig<UserAppSettings>(
-    fromJson: UserAppSettings.fromJson,
+  'app_settings': ModelConfig<AppSettings>(
+    fromJson: AppSettings.fromJson,
     getId: (s) => s.id,
-    getOwnerId: (dynamic item) =>
-        (item as UserAppSettings).id as String?, // User ID is the owner ID
+    getOwnerId: (dynamic item) => (item as AppSettings).id,
     getCollectionPermission: const ModelActionPermission(
       type: RequiredPermissionType.unsupported, // Not accessible via collection
       requiresAuthentication: true,
     ),
     getItemPermission: const ModelActionPermission(
       type: RequiredPermissionType.specificPermission,
-      permission: Permissions.userAppSettingsReadOwned,
+      permission: Permissions.appSettingsReadOwned,
       requiresOwnershipCheck: true,
       requiresAuthentication: true,
     ),
     postPermission: const ModelActionPermission(
       type: RequiredPermissionType.unsupported,
       requiresAuthentication: true,
-      // Creation of UserAppSettings is handled by the authentication service
+      // Creation of AppSettings is handled by the authentication service
       // during user creation, not via a direct POST to /api/v1/data.
     ),
     putPermission: const ModelActionPermission(
       type: RequiredPermissionType.specificPermission,
-      permission: Permissions.userAppSettingsUpdateOwned,
+      permission: Permissions.appSettingsUpdateOwned,
       requiresOwnershipCheck: true,
       requiresAuthentication: true,
     ),
     deletePermission: const ModelActionPermission(
       type: RequiredPermissionType.unsupported,
       requiresAuthentication: true,
-      // Deletion of UserAppSettings is handled by the authentication service
+      // Deletion of AppSettings is handled by the authentication service
       // during account deletion, not via a direct DELETE to /api/v1/data.
     ),
   ),