Merge pull request #656 from threefoldtech/development_cleanup_kyc

integrate idenfy

Author: AhmedHanafy725

app/ios/Podfile

@@ -38,4 +38,19 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
   end
-end
+  installer.pods_project.targets.each do |target|
+    if target.name == "lottie-ios"
+      target.build_configurations.each do |config|
+        config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+      end
+    end
+    if target.name == "idenfy_sdk_flutter"
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+        config.build_settings['ENABLE_BITCODE'] = 'NO'
+      end
+    end
+    flutter_additional_ios_build_settings(target)
+  end
+
+end

app/ios/Podfile.lock

@@ -1,4 +1,6 @@
 PODS:
+  - audio_session (0.0.1):
+    - Flutter
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -11,8 +13,16 @@ PODS:
     - OrderedSet (~> 5.0)
   - flutter_pkid (0.0.1):
     - Flutter
+  - idenfy_sdk_flutter (2.5.3):
+    - Flutter
+    - iDenfySDK/iDenfyLiveness (= 8.4.5)
+  - iDenfySDK/iDenfyLiveness (8.4.5):
+    - lottie-ios (= 4.4.3)
+  - just_audio (0.0.1):
+    - Flutter
   - local_auth (0.0.1):
     - Flutter
+  - lottie-ios (4.4.3)
   - MTBBarcodeScanner (5.0.11)
   - open_filex (0.0.2):
     - Flutter
@@ -32,26 +42,33 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - ShuftiPro-Onsite (1.2.9)
-  - shuftipro_onsite_sdk (1.0.2):
-    - Flutter
-    - ShuftiPro-Onsite (~> 1.2.0)
   - smart_auth (0.0.1):
     - Flutter
-  - sodium_libs (2.2.0):
+  - sodium_libs (2.2.1):
+    - Flutter
+  - sqflite (0.0.3):
     - Flutter
+    - FlutterMacOS
   - uni_links (0.0.1):
     - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
+  - video_player_avfoundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - wakelock_plus (0.0.1):
+    - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
 
 DEPENDENCIES:
+  - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_pkid (from `.symlinks/plugins/flutter_pkid/ios`)
+  - idenfy_sdk_flutter (from `.symlinks/plugins/idenfy_sdk_flutter/ios`)
+  - just_audio (from `.symlinks/plugins/just_audio/ios`)
   - local_auth (from `.symlinks/plugins/local_auth/ios`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -60,20 +77,25 @@ DEPENDENCIES:
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - shuftipro_onsite_sdk (from `.symlinks/plugins/shuftipro_onsite_sdk/ios`)
   - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
   - sodium_libs (from `.symlinks/plugins/sodium_libs/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
 
 SPEC REPOS:
   trunk:
+    - iDenfySDK
+    - lottie-ios
     - MTBBarcodeScanner
     - OrderedSet
-    - ShuftiPro-Onsite
 
 EXTERNAL SOURCES:
+  audio_session:
+    :path: ".symlinks/plugins/audio_session/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
@@ -82,6 +104,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_inappwebview/ios"
   flutter_pkid:
     :path: ".symlinks/plugins/flutter_pkid/ios"
+  idenfy_sdk_flutter:
+    :path: ".symlinks/plugins/idenfy_sdk_flutter/ios"
+  just_audio:
+    :path: ".symlinks/plugins/just_audio/ios"
   local_auth:
     :path: ".symlinks/plugins/local_auth/ios"
   open_filex:
@@ -98,42 +124,52 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  shuftipro_onsite_sdk:
-    :path: ".symlinks/plugins/shuftipro_onsite_sdk/ios"
   smart_auth:
     :path: ".symlinks/plugins/smart_auth/ios"
   sodium_libs:
     :path: ".symlinks/plugins/sodium_libs/ios"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/darwin"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
+  video_player_avfoundation:
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
   webview_flutter_wkwebview:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
+  audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_pkid: 7808bd0baee7580afc1cebebf2a6f3b290e190c5
+  idenfy_sdk_flutter: 3f53cc19cd757e9bb9f01d83386a6db84192dae9
+  iDenfySDK: 4bba551e7e824daf7db2b3bac166a9fe339c4269
+  just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c
+  lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   screen_brightness_ios: 7437207a2a9bc56553aa10f782afecf830b4c4e2
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  ShuftiPro-Onsite: 45989f1626cc7bb7d150954e6d4a3f0cc8a86db9
-  shuftipro_onsite_sdk: 1e6ca562c98e8dfb7b8e56940d4d00cb5416d7af
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
-  sodium_libs: 0486eb2c3172ce494406367d4b379042444b769d
+  sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
 
-PODFILE CHECKSUM: 2262097366c615de59b03ca3bf748d7aaad51773
+PODFILE CHECKSUM: f8ab9e5577c96127975d4ff88c95faaa16cd71bb
 
 COCOAPODS: 1.14.3

app/ios/Runner/Info.plist

@@ -2,6 +2,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>NSCameraUsageDescription</key>
+	<string>Required for document and facial capture</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -85,4 +87,4 @@
 	<key>io.flutter.embedded_views_preview</key>
 	<true/>
 </dict>
-</plist>
+</plist>

app/lib/app_config.dart

@@ -209,6 +209,8 @@ void setFallbackConfigs() {
   print("Can't connect to FlagSmith, setting default configs... ");
 
   Globals().isOpenKYCEnabled = false;
+  Globals().maximumKYCRetries = 5;
+  Globals().minimumTFChainBalanceForKYC = 0;
   Globals().debugMode = false;
   Globals().useNewWallet = false;
   Globals().newWalletUrl = '';
@@ -223,4 +225,5 @@ void setFallbackConfigs() {
   Globals().termsAndConditionsUrl = '';
   Globals().spendingLimit = 0;
   Globals().newsUrl = '';
+  Globals().idenfyServiceUrl = '';
 }

app/lib/helpers/flags.dart

@@ -73,6 +73,14 @@ class Flags {
     Globals().spendingLimit = int.parse(
         (await Flags().getFlagValueByFeatureName('spending-limit')).toString());
     Globals().newsUrl = (await Flags().getFlagValueByFeatureName('news-url'))!;
+    Globals().idenfyServiceUrl =
+        (await Flags().getFlagValueByFeatureName('idenfy-service-url'))!;
+    Globals().maximumKYCRetries = int.parse(
+        (await Flags().getFlagValueByFeatureName('max-kyc-retries'))
+            .toString());
+    Globals().minimumTFChainBalanceForKYC = int.parse(
+        (await Flags().getFlagValueByFeatureName('min-tfchain-balance-for-kyc'))
+            .toString());
     Globals().refreshBalance = int.parse(
         (await Flags().getFlagValueByFeatureName('refresh-balance'))
             .toString());

app/lib/helpers/globals.dart

@@ -44,6 +44,8 @@ class Globals {
 
   // FlagSmith configurations
   bool isOpenKYCEnabled = false;
+  int maximumKYCRetries = 5;
+  int minimumTFChainBalanceForKYC = 0;
   bool useNewWallet = false;
   String newWalletUrl = '';
   bool redoIdentityVerification = false;
@@ -61,6 +63,7 @@ class Globals {
   String relayUrl = '';
   String termsAndConditionsUrl = '';
   String newsUrl = '';
+  String idenfyServiceUrl = '';
 
   bool isCacheClearedWallet = false;
   bool isCacheClearedFarmer = false;

app/lib/helpers/kyc_helpers.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 
 import 'package:flutter_pkid/flutter_pkid.dart';
+import 'package:threebotlogin/models/idenfy.dart';
+import 'package:threebotlogin/services/idenfy_service.dart';
 import 'package:threebotlogin/services/migration_service.dart';
 import 'package:threebotlogin/services/pkid_service.dart';
 import 'package:threebotlogin/services/tools_service.dart';
@@ -11,7 +13,7 @@ import 'globals.dart';
 Future<void> fetchPKidData() async {
   FlutterPkid client = await getPkidClient();
 
-  List<String> keyWords = ['email', 'phone', 'identity'];
+  List<String> keyWords = ['email', 'phone'];
 
   var futures = keyWords.map((keyword) async {
     var pKidResult = await client.getPKidDoc(keyword);
@@ -23,12 +25,15 @@ Future<void> fetchPKidData() async {
   var pKidResult = await Future.wait(futures);
   Map<int, dynamic> dataMap = pKidResult.asMap();
 
-  await handleKYCData(dataMap[0], dataMap[1], dataMap[2]);
+  await handleKYCData(dataMap[0], dataMap[1]);
 }
 
-Future<void> handleKYCData(Map<dynamic, dynamic> emailData,
-    Map<dynamic, dynamic> phoneData, Map<dynamic, dynamic> identityData) async {
-  await saveCorrectVerificationStates(emailData, phoneData, identityData);
+Future<void> handleKYCData(
+    Map<dynamic, dynamic> emailData, Map<dynamic, dynamic> phoneData) async {
+  final identityVerificationStatus = await getVerificationStatus();
+
+  await saveCorrectVerificationStates(
+      emailData, phoneData, identityVerificationStatus);
 
   bool? isEmailVerified = await getIsEmailVerified();
   bool? isPhoneVerified = await getIsPhoneVerified();
@@ -59,24 +64,19 @@ Future<void> handleKYCData(Map<dynamic, dynamic> emailData,
 
   if (isIdentityVerified == true) {
     Globals().identityVerified.value = true;
-    await saveIdentity(
-        jsonDecode(identityData['identityName']),
-        identityData['signedIdentityNameIdentifier'],
-        identityData['identityCountry'],
-        identityData['signedIdentityCountryIdentifier'],
-        identityData['identityDOB'],
-        identityData['signedIdentityDOBIdentifier'],
-        jsonDecode(identityData['identityDocumentMeta']),
-        identityData['signedIdentityDocumentMetaIdentifier'],
-        identityData['identityGender'],
-        identityData['signedIdentityGenderIdentifier'],
-        identityData['referenceId']);
+    final data = await getVerificationData();
+    final firstName = utf8.decode(latin1.encode(data.orgFirstName!));
+    final lastName = utf8.decode(latin1.encode(data.orgLastName!));
+    await saveIdentity('$lastName $firstName', data.docIssuingCountry,
+        data.docDob, data.docSex, data.idenfyRef);
   }
 }
 
-Future<void> saveCorrectVerificationStates(Map<dynamic, dynamic> emailData,
-    Map<dynamic, dynamic> phoneData, Map<dynamic, dynamic> identityData) async {
-  if (identityData.containsKey('signedIdentityNameIdentifier')) {
+Future<void> saveCorrectVerificationStates(
+    Map<dynamic, dynamic> emailData,
+    Map<dynamic, dynamic> phoneData,
+    VerificationStatus identityVerificationStatus) async {
+  if (identityVerificationStatus.status == VerificationState.VERIFIED) {
     await setIsIdentityVerified(true);
   } else {
     await setIsIdentityVerified(false);