From b12074db74d1c99c387682ef6ddeb274e50d35df Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Mon, 23 Sep 2024 23:14:16 +0300 Subject: [PATCH] Fix kyc for ios --- app/ios/Podfile.lock | 82 ++++++++----------- .../screens/identity_verification_screen.dart | 3 +- app/lib/services/tfchain_service.dart | 2 +- app/pubspec.lock | 60 ++++++++------ app/pubspec.yaml | 8 +- 5 files changed, 76 insertions(+), 79 deletions(-) diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index 6053a9f4..7e85dbad 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -9,39 +9,35 @@ PODS: - flutter_inappwebview/Core (0.0.1): - Flutter - OrderedSet (~> 5.0) - - flutter_native_splash (0.0.1): - - Flutter - flutter_pkid (0.0.1): - Flutter - local_auth (0.0.1): - Flutter - - lottie-ios (4.1.3) - MTBBarcodeScanner (5.0.11) - open_filex (0.0.2): - Flutter - OrderedSet (5.0.0) - package_info_plus (0.4.5): - Flutter - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter - - permission_handler_apple (9.0.4): + - FlutterMacOS + - permission_handler_apple (9.1.1): - Flutter - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - shared_preferences_ios (0.0.1): + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - ShuftiPro-Onsite (1.2.9) + - shuftipro_onsite_sdk (1.0.2): - Flutter - - ShuftiPro (3.4.7): - - lottie-ios - - Socket.IO-Client-Swift - - shuftipro_sdk (2.0.5): + - ShuftiPro-Onsite (~> 1.2.0) + - smart_auth (0.0.1): - Flutter - - ShuftiPro (~> 3.4.1) - - Socket.IO-Client-Swift (16.1.0): - - Starscream (~> 4.0.6) - - sodium_libs (2.1.0): + - sodium_libs (2.2.0): - Flutter - - Starscream (4.0.6) - uni_links (0.0.1): - Flutter - url_launcher_ios (0.0.1): @@ -51,28 +47,25 @@ DEPENDENCIES: - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) - - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - flutter_pkid (from `.symlinks/plugins/flutter_pkid/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`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - - shuftipro_sdk (from `.symlinks/plugins/shuftipro_sdk/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`) - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: - - lottie-ios - MTBBarcodeScanner - OrderedSet - - ShuftiPro - - Socket.IO-Client-Swift - - Starscream + - ShuftiPro-Onsite EXTERNAL SOURCES: device_info_plus: @@ -81,8 +74,6 @@ EXTERNAL SOURCES: :path: Flutter flutter_inappwebview: :path: ".symlinks/plugins/flutter_inappwebview/ios" - flutter_native_splash: - :path: ".symlinks/plugins/flutter_native_splash/ios" flutter_pkid: :path: ".symlinks/plugins/flutter_pkid/ios" local_auth: @@ -91,16 +82,18 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/open_filex/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" - shuftipro_sdk: - :path: ".symlinks/plugins/shuftipro_sdk/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" uni_links: @@ -109,28 +102,25 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_inappwebview: acd4fc0f012cefd09015000c241137d82f01ba62 - flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf flutter_pkid: 7808bd0baee7580afc1cebebf2a6f3b290e190c5 local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c - lottie-ios: d0954d3150061f662ed0adf96ef98d7421864c47 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad - ShuftiPro: 3178fb1123ccb6c407beceabc12a81923243f0b0 - shuftipro_sdk: c9f5c5c719930894be64f8736fed11e1a0aa616a - Socket.IO-Client-Swift: ee4b8f80a3db18dd7f32b266ddf273310609443c - sodium_libs: ede573662dadcbe9823a374c3c970557ad7a4725 - Starscream: fb2c4510bebf908c62bd383bcf05e673720e91fd + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + ShuftiPro-Onsite: 45989f1626cc7bb7d150954e6d4a3f0cc8a86db9 + shuftipro_onsite_sdk: 1e6ca562c98e8dfb7b8e56940d4d00cb5416d7af + smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2 + sodium_libs: 0486eb2c3172ce494406367d4b379042444b769d uni_links: d97da20c7701486ba192624d99bffaaffcfc298a - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe PODFILE CHECKSUM: 2262097366c615de59b03ca3bf748d7aaad51773 diff --git a/app/lib/screens/identity_verification_screen.dart b/app/lib/screens/identity_verification_screen.dart index d5bb9dce..d25dad48 100644 --- a/app/lib/screens/identity_verification_screen.dart +++ b/app/lib/screens/identity_verification_screen.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_pkid/flutter_pkid.dart'; import 'package:http/http.dart'; -import 'package:shuftipro_sdk/shuftipro_sdk.dart'; +import 'package:shuftipro_onsite_sdk/shuftipro_onsite_sdk.dart'; import 'package:threebotlogin/events/events.dart'; import 'package:threebotlogin/events/identity_callback_event.dart'; import 'package:threebotlogin/helpers/globals.dart'; @@ -64,6 +64,7 @@ class _IdentityVerificationScreenState }; Map authObject = { + 'auth_type': 'access_token', 'access_token': '', }; diff --git a/app/lib/services/tfchain_service.dart b/app/lib/services/tfchain_service.dart index 6d238eaf..e81806ee 100644 --- a/app/lib/services/tfchain_service.dart +++ b/app/lib/services/tfchain_service.dart @@ -14,7 +14,7 @@ Future getMyTwinId() async { final token = RootIsolateToken.instance; return await compute((dynamic token) async { BackgroundIsolateBinaryMessenger.ensureInitialized(token); - final wallet = await Stellar.Client.createFromMnemonic( + final wallet = await Stellar.Client.fromMnemonic( Stellar.NetworkType.PUBLIC, phrase); final privateKey = wallet.privateKey; if (privateKey != null) { diff --git a/app/pubspec.lock b/app/pubspec.lock index d902b162..4023f379 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda" + sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" url: "https://pub.dev" source: hosted - version: "1.5.3" + version: "1.5.5" async: dependency: transitive description: @@ -476,18 +476,20 @@ packages: gridproxy_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" - relative: true - source: path + path: "packages/gridproxy_client" + ref: tfchain_graphql_hotfix + resolved-ref: "314f46728e43cb86f430cda6ba756d4be3fb6e07" + url: "https://github.com/codescalers/tfgrid-sdk-dart" + source: git version: "1.0.0" hashlib: dependency: transitive description: name: hashlib - sha256: "7431346983b7c18fa3d6107891b7f00da4fffc378eed8454a0c9e17961164ffd" + sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1 url: "https://pub.dev" source: hosted - version: "1.20.2" + version: "1.21.0" hashlib_codecs: dependency: transitive description: @@ -636,10 +638,10 @@ packages: dependency: "direct overridden" description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -724,10 +726,10 @@ packages: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -996,10 +998,10 @@ packages: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "671e7a931f55a08aa45be2a13fe7247f2a41237897df434b30d2012388191833" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.0" shared_preferences_linux: dependency: transitive description: @@ -1048,20 +1050,20 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - shuftipro_sdk: + shuftipro_onsite_sdk: dependency: "direct main" description: - name: shuftipro_sdk - sha256: fd47550bbbfe50c99ef490fdb609b5a8d5e3e770d3fb8196c984a7f68d00772e + name: shuftipro_onsite_sdk + sha256: d1329e5fe5a15cbbe5d2e75af9ab0eab1dd00a41a017eaf74225cb37d39f9e52 url: "https://pub.dev" source: hosted - version: "1.3.9" + version: "1.0.5" signer: dependency: transitive description: path: "packages/signer" ref: main - resolved-ref: "27c3fda2b6fe8c67785cbe5ff08373878a2a8470" + resolved-ref: fb8afb190f8c4fcad43692f37ea0d72cc57bcefc url: "https://github.com/codescalers/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1153,9 +1155,11 @@ packages: stellar_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" - relative: true - source: path + path: "packages/stellar_client" + ref: tfchain_graphql_hotfix + resolved-ref: "314f46728e43cb86f430cda6ba756d4be3fb6e07" + url: "https://github.com/codescalers/tfgrid-sdk-dart" + source: git version: "0.1.0" stellar_flutter_sdk: dependency: transitive @@ -1240,9 +1244,11 @@ packages: tfchain_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" - relative: true - source: path + path: "packages/tfchain_client" + ref: tfchain_graphql_hotfix + resolved-ref: "314f46728e43cb86f430cda6ba756d4be3fb6e07" + url: "https://github.com/codescalers/tfgrid-sdk-dart" + source: git version: "0.1.0" timing: dependency: transitive @@ -1344,10 +1350,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.3.1" url_launcher_linux: dependency: transitive description: @@ -1510,4 +1516,4 @@ packages: version: "1.1.4+10" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.0" + flutter: ">=3.16.6" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 94e28f69..66269a8a 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -19,19 +19,19 @@ dependencies: tfchain_client: git: url: https://github.com/codescalers/tfgrid-sdk-dart - ref: main + ref: tfchain_graphql_hotfix path: packages/tfchain_client stellar_client: git: url: https://github.com/codescalers/tfgrid-sdk-dart - ref: main + ref: tfchain_graphql_hotfix path: packages/stellar_client gridproxy_client: git: url: https://github.com/codescalers/tfgrid-sdk-dart - ref: main + ref: tfchain_graphql_hotfix path: packages/gridproxy_client - shuftipro_sdk: ^1.2.5 + shuftipro_onsite_sdk: ^1.0.5 flutter_svg: ^2.0.6 bip39: ^1.0.6 socket_io_client: ^1.0.2