WIP - Replaced get_it + injectable with Provider

lib/features/login/bloc/authentication_cubit.dart

@@ -1,24 +1,28 @@
 import 'dart:io';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/security/security_context_aware_dio_manager.dart';
 import 'package:paperless_mobile/core/store/local_vault.dart';
-import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_state.dart';
 import 'package:paperless_mobile/features/login/model/authentication_information.dart';
 import 'package:paperless_mobile/features/login/model/client_certificate.dart';
 import 'package:paperless_mobile/features/login/model/user_credentials.model.dart';
 import 'package:paperless_mobile/features/login/services/authentication_service.dart';
 import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 
-class AuthenticationCubit extends Cubit<AuthenticationState> {
+class AuthenticationCubit extends HydratedCubit<AuthenticationState> {
   final LocalAuthenticationService _localAuthService;
-  PaperlessAuthenticationApi _authApi;
+  final PaperlessAuthenticationApi _authApi;
   final LocalVault _localVault;
+  final SecurityContextAwareDioManager _dioWrapper;
 
   AuthenticationCubit(
     this._localVault,
     this._localAuthService,
     this._authApi,
+    this._dioWrapper,
   ) : super(AuthenticationState.initial);
 
   Future<void> login({
@@ -28,22 +32,21 @@ class AuthenticationCubit extends Cubit<AuthenticationState> {
   }) async {
     assert(credentials.username != null && credentials.password != null);
     try {
-      await registerSecurityContext(clientCertificate);
-      //TODO: Workaround for new architecture, listen for security context changes in timeout_client, possibly persisted in hive.
-      _authApi = getIt<PaperlessAuthenticationApi>();
-      // Store information required to make requests
-      final currentAuth = AuthenticationInformation(
-        serverUrl: serverUrl,
+      _dioWrapper.updateSettings(
+        baseUrl: serverUrl,
         clientCertificate: clientCertificate,
       );
-      await _localVault.storeAuthenticationInformation(currentAuth);
 
       final token = await _authApi.login(
         username: credentials.username!,
         password: credentials.password!,
       );
 
-      final auth = currentAuth.copyWith(token: token);
+      final auth = AuthenticationInformation(
+        serverUrl: serverUrl,
+        clientCertificate: clientCertificate,
+        token: token,
+      );
 
       await _localVault.storeAuthenticationInformation(auth);
 
@@ -83,9 +86,9 @@ class AuthenticationCubit extends Cubit<AuthenticationState> {
         final localAuthSuccess = await _localAuthService
             .authenticateLocalUser("Authenticate to log back in");
         if (localAuthSuccess) {
-          await registerSecurityContext(storedAuth.clientCertificate);
-          //TODO: Workaround for new architecture, listen for security context changes in timeout_client, possibly persisted in hive.
-          _authApi = getIt<PaperlessAuthenticationApi>();
+          _dioWrapper.updateSettings(
+            clientCertificate: storedAuth.clientCertificate,
+          );
           return emit(
             AuthenticationState(
               isAuthenticated: true,
@@ -102,7 +105,9 @@ class AuthenticationCubit extends Cubit<AuthenticationState> {
           ));
         }
       } else {
-        await registerSecurityContext(storedAuth.clientCertificate);
+        _dioWrapper.updateSettings(
+          clientCertificate: storedAuth.clientCertificate,
+        );
         final authState = AuthenticationState(
           isAuthenticated: true,
           authentication: storedAuth,
@@ -115,40 +120,14 @@ class AuthenticationCubit extends Cubit<AuthenticationState> {
 
   Future<void> logout() async {
     await _localVault.clear();
+    await super.clear();
     emit(AuthenticationState.initial);
   }
-}
-
-class AuthenticationState {
-  final bool wasLoginStored;
-  final bool? wasLocalAuthenticationSuccessful;
-  final bool isAuthenticated;
-  final AuthenticationInformation? authentication;
-
-  static final AuthenticationState initial = AuthenticationState(
-    wasLoginStored: false,
-    isAuthenticated: false,
-  );
-
-  AuthenticationState({
-    required this.isAuthenticated,
-    required this.wasLoginStored,
-    this.wasLocalAuthenticationSuccessful,
-    this.authentication,
-  });
-
-  AuthenticationState copyWith({
-    bool? wasLoginStored,
-    bool? isAuthenticated,
-    AuthenticationInformation? authentication,
-    bool? wasLocalAuthenticationSuccessful,
-  }) {
-    return AuthenticationState(
-      isAuthenticated: isAuthenticated ?? this.isAuthenticated,
-      wasLoginStored: wasLoginStored ?? this.wasLoginStored,
-      authentication: authentication ?? this.authentication,
-      wasLocalAuthenticationSuccessful: wasLocalAuthenticationSuccessful ??
-          this.wasLocalAuthenticationSuccessful,
-    );
-  }
+
+  @override
+  AuthenticationState? fromJson(Map<String, dynamic> json) =>
+      AuthenticationState.fromJson(json);
+
+  @override
+  Map<String, dynamic>? toJson(AuthenticationState state) => state.toJson();
 }

lib/features/login/bloc/authentication_state.dart

@@ -0,0 +1,44 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+
+part 'authentication_state.g.dart';
+
+@JsonSerializable()
+class AuthenticationState {
+  final bool wasLoginStored;
+  final bool? wasLocalAuthenticationSuccessful;
+  final bool isAuthenticated;
+  final AuthenticationInformation? authentication;
+
+  static final AuthenticationState initial = AuthenticationState(
+    wasLoginStored: false,
+    isAuthenticated: false,
+  );
+
+  AuthenticationState({
+    required this.isAuthenticated,
+    required this.wasLoginStored,
+    this.wasLocalAuthenticationSuccessful,
+    this.authentication,
+  });
+
+  AuthenticationState copyWith({
+    bool? wasLoginStored,
+    bool? isAuthenticated,
+    AuthenticationInformation? authentication,
+    bool? wasLocalAuthenticationSuccessful,
+  }) {
+    return AuthenticationState(
+      isAuthenticated: isAuthenticated ?? this.isAuthenticated,
+      wasLoginStored: wasLoginStored ?? this.wasLoginStored,
+      authentication: authentication ?? this.authentication,
+      wasLocalAuthenticationSuccessful: wasLocalAuthenticationSuccessful ??
+          this.wasLocalAuthenticationSuccessful,
+    );
+  }
+
+  factory AuthenticationState.fromJson(Map<String, dynamic> json) =>
+      _$AuthenticationStateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AuthenticationStateToJson(this);
+}

lib/features/login/bloc/authentication_state.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'authentication_state.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AuthenticationState _$AuthenticationStateFromJson(Map<String, dynamic> json) =>
+    AuthenticationState(
+      isAuthenticated: json['isAuthenticated'] as bool,
+      wasLoginStored: json['wasLoginStored'] as bool,
+      wasLocalAuthenticationSuccessful:
+          json['wasLocalAuthenticationSuccessful'] as bool?,
+      authentication: json['authentication'] == null
+          ? null
+          : AuthenticationInformation.fromJson(
+              json['authentication'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$AuthenticationStateToJson(
+        AuthenticationState instance) =>
+    <String, dynamic>{
+      'wasLoginStored': instance.wasLoginStored,
+      'wasLocalAuthenticationSuccessful':
+          instance.wasLocalAuthenticationSuccessful,
+      'isAuthenticated': instance.isAuthenticated,
+      'authentication': instance.authentication,
+    };

lib/features/login/model/authentication_information.dart

@@ -1,11 +1,10 @@
-import 'package:paperless_mobile/core/type/types.dart';
+import 'package:json_annotation/json_annotation.dart';
 import 'package:paperless_mobile/features/login/model/client_certificate.dart';
 
-class AuthenticationInformation {
-  static const tokenKey = 'token';
-  static const serverUrlKey = 'serverUrl';
-  static const clientCertificateKey = 'clientCertificate';
+part 'authentication_information.g.dart';
 
+@JsonSerializable()
+class AuthenticationInformation {
   final String? token;
   final String serverUrl;
   final ClientCertificate? clientCertificate;
@@ -16,21 +15,6 @@ class AuthenticationInformation {
     this.clientCertificate,
   });
 
-  AuthenticationInformation.fromJson(JSON json)
-      : token = json[tokenKey],
-        serverUrl = json[serverUrlKey],
-        clientCertificate = json[clientCertificateKey] != null
-            ? ClientCertificate.fromJson(json[clientCertificateKey])
-            : null;
-
-  JSON toJson() {
-    return {
-      tokenKey: token,
-      serverUrlKey: serverUrl,
-      clientCertificateKey: clientCertificate?.toJson(),
-    };
-  }
-
   bool get isValid {
     return serverUrl.isNotEmpty && (token?.isNotEmpty ?? false);
   }
@@ -48,4 +32,9 @@ class AuthenticationInformation {
           (removeClientCertificate ? null : this.clientCertificate),
     );
   }
+
+  factory AuthenticationInformation.fromJson(Map<String, dynamic> json) =>
+      _$AuthenticationInformationFromJson(json);
+
+  Map<String, dynamic> toJson() => _$AuthenticationInformationToJson(this);
 }

lib/features/login/model/authentication_information.g.dart

@@ -0,0 +1,26 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'authentication_information.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AuthenticationInformation _$AuthenticationInformationFromJson(
+        Map<String, dynamic> json) =>
+    AuthenticationInformation(
+      token: json['token'] as String?,
+      serverUrl: json['serverUrl'] as String,
+      clientCertificate: json['clientCertificate'] == null
+          ? null
+          : ClientCertificate.fromJson(
+              json['clientCertificate'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$AuthenticationInformationToJson(
+        AuthenticationInformation instance) =>
+    <String, dynamic>{
+      'token': instance.token,
+      'serverUrl': instance.serverUrl,
+      'clientCertificate': instance.clientCertificate,
+    };

lib/features/login/view/widgets/server_address_form_field.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
-import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
+import 'package:provider/provider.dart';
 
 class ServerAddressFormField extends StatefulWidget {
   static const String fkServerAddress = "serverAddress";
@@ -64,7 +64,8 @@ class _ServerAddressFormFieldState extends State<ServerAddressFormField> {
     //https://stackoverflow.com/questions/49648022/check-whether-there-is-an-internet-connection-available-on-flutter-app
     setState(() => _reachabilityStatus = ReachabilityStatus.testing);
     final isReachable =
-        await getIt<ConnectivityStatusService>().isServerReachable(address);
+        await Provider.of<ConnectivityStatusService>(context, listen: false)
+            .isServerReachable(address);
     if (isReachable) {
       setState(() => _reachabilityStatus = ReachabilityStatus.reachable);
     } else {