Merge pull request #1651 from SatoshiPortal/ios-secure-storage-issue

6.4.1: Secure Storage on IOS Patch

Author: i5hi

ios/Podfile.lock

@@ -107,9 +107,9 @@ PODS:
     - Flutter
   - PromisesObjC (2.4.0)
   - ScreenProtectorKit (1.3.1)
-  - SDWebImage (5.21.4):
-    - SDWebImage/Core (= 5.21.4)
-  - SDWebImage/Core (5.21.4)
+  - SDWebImage (5.21.5):
+    - SDWebImage/Core (= 5.21.5)
+  - SDWebImage/Core (5.21.5)
   - share_plus (0.0.1):
     - Flutter
   - sqlite3 (3.51.1):
@@ -288,7 +288,7 @@ SPEC CHECKSUMS:
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   ScreenProtectorKit: 83a6281b02c7a5902ee6eac4f5045f674e902ae4
-  SDWebImage: d0184764be51240d49c761c37f53dd017e1ccaaf
+  SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
   sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41

ios/Runner/DebugProfile.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array/>
+</dict>
+</plist>

ios/Runner/Release.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array/>
+</dict>
+</plist>

lib/core/storage/migrations/004_legacy/migration01to02.dart

@@ -19,7 +19,7 @@ import 'package:lwk/lwk.dart' as lwk;
 
 Future<void> doMigration0_1to0_2() async {
   try {
-    final secureStorageDatasource = MigrationSecureStorageDatasource();
+    final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
     final hiveDatasource = locator<OldHiveDatasource>();
     final oldSeedRepository = OldSeedRepository(secureStorageDatasource);
 

lib/core/storage/migrations/004_legacy/migration02to03.dart

@@ -12,7 +12,7 @@ import 'package:bb_mobile/locator.dart';
 import 'package:boltz/boltz.dart';
 
 Future<void> doMigration0_2to0_3() async {
-  final secureStorageDatasource = MigrationSecureStorageDatasource();
+  final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
   final hiveDatasource = locator<OldHiveDatasource>();
   final oldWalletRepository = OldWalletRepository(hiveDatasource);
 

lib/core/storage/migrations/004_legacy/migration03to04.dart

@@ -1,8 +1,9 @@
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_storage_keys.dart';
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart';
+import 'package:bb_mobile/locator.dart';
 
 Future<void> doMigration0_3to0_4() async {
-  final secureStorageDatasource = MigrationSecureStorageDatasource();
+  final secureStorageDatasource = locator<MigrationSecureStorageDatasource>();
 
   await secureStorageDatasource.store(
     key: OldStorageKeys.version.name,

lib/core/storage/migrations/005_hive_to_sqlite/old/old_hive_datasource.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_storage_keys.dart';
-import 'package:bb_mobile/core/storage/secure_storage.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hive/hive.dart' show Box, Hive, HiveAesCipher;
 import 'package:path_provider/path_provider.dart'
     show getApplicationDocumentsDirectory;
@@ -11,10 +11,9 @@ class OldHiveDatasource {
 
   OldHiveDatasource(this.box);
 
-  static Future<Box> getBox() async {
+  static Future<Box> getBox(FlutterSecureStorage secureStorage) async {
     final dir = await getApplicationDocumentsDirectory();
     Hive.init(dir.path);
-    final secureStorage = SecureStorage.init();
     final password = await secureStorage.read(
       key: OldStorageKeys.hiveEncryption.name,
     );

lib/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart

@@ -1,13 +1,12 @@
 import 'dart:convert';
 
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/entities/old_seed.dart';
-import 'package:bb_mobile/core/storage/secure_storage.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 class MigrationSecureStorageDatasource {
   final FlutterSecureStorage _storage;
 
-  MigrationSecureStorageDatasource() : _storage = SecureStorage.init();
+  MigrationSecureStorageDatasource(this._storage);
 
   Future<void> store({required String key, required String value}) async {
     await _storage.write(key: key, value: value);

lib/core/storage/secure_storage.dart

@@ -10,22 +10,26 @@ import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/old_see
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/old/old_wallet_repository.dart';
 import 'package:bb_mobile/core/storage/migrations/005_hive_to_sqlite/secure_storage_datasource.dart';
 import 'package:bb_mobile/core/storage/requires_migration_usecase.dart';
-import 'package:bb_mobile/core/storage/secure_storage.dart';
 import 'package:bb_mobile/core/swaps/data/repository/boltz_swap_repository.dart';
 import 'package:bb_mobile/core/utils/constants.dart';
 import 'package:bb_mobile/core/wallet/data/repositories/wallet_repository.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get_it/get_it.dart';
 
 class StorageLocator {
   static Future<void> registerDatasources(GetIt locator) async {
+    const secureStorage = FlutterSecureStorage(
+      aOptions: AndroidOptions(encryptedSharedPreferences: true),
+      // iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock),
+    );
     locator.registerLazySingleton<KeyValueStorageDatasource<String>>(
-      () => SecureStorageDatasourceImpl(SecureStorage.init()),
+      () => SecureStorageDatasourceImpl(secureStorage),
       instanceName: LocatorInstanceNameConstants.secureStorageDatasource,
     );
     locator.registerLazySingleton<MigrationSecureStorageDatasource>(
-      () => MigrationSecureStorageDatasource(),
+      () => MigrationSecureStorageDatasource(secureStorage),
     );
-    final oldHiveBox = await OldHiveDatasource.getBox();
+    final oldHiveBox = await OldHiveDatasource.getBox(secureStorage);
     locator.registerLazySingleton<OldHiveDatasource>(
       () => OldHiveDatasource(oldHiveBox),
     );
@@ -64,7 +68,8 @@ class StorageLocator {
       () => GetAllSeedsUsecase(seedRepository: locator<SeedRepository>()),
     );
     locator.registerFactory<MigrateToV4LegacyUsecase>(
-      () => MigrateToV4LegacyUsecase(MigrationSecureStorageDatasource()),
+      () =>
+          MigrateToV4LegacyUsecase(locator<MigrationSecureStorageDatasource>()),
     );
     locator.registerFactory<RequiresMigrationUsecase>(
       () => RequiresMigrationUsecase(