Merge branch 'TALAO' into TALAO_android

TalaoDAO · Sep 30, 2023 · ade8514 · ade8514
2 parents 9f2fad9 + 06aa3a6
commit ade8514
Show file tree

Hide file tree

Showing 111 changed files with 4,457 additions and 3,493 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.3",
+  "flutterSdkVersion": "3.13.6",
   "flavors": {}
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -69,6 +69,18 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="openid" />
 			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="siopv2" />
+			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="openid-vc" />
+			</intent-filter>
             <intent-filter android:autoVerify="true">
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
@@ -93,6 +105,12 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="openid-initiate-issuance" />
 			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="openid-credential-offer" />
+			</intent-filter>
         </activity><meta-data
             android:name="flutterEmbedding"
             android:value="2" />

diff --git a/assets/image/liveness-card.png b/assets/image/liveness-card.png
diff --git a/assets/image/liveness-dummy.png b/assets/image/liveness-dummy.png
diff --git a/ios/Podfile b/ios/Podfile
@@ -38,17 +38,31 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
+
+$iOSVersion = '14.0'
+
 post_install do |installer|
+  # Google's ML Kit Barcode Scanning setup
+  installer.pods_project.build_configurations.each do |config|
+    config.build_settings["EXCLUDED_ARCHS[sdk=*]"] = "armv7"
+    config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
+  end
+
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
-     # polygonid-setup
+      # polygonid-setup
       target.build_configurations.each do |config|
         cflags = config.build_settings['OTHER_CFLAGS'] || ['$(inherited)']
         cflags << '-fembed-bitcode'
         config.build_settings['OTHER_CFLAGS'] = cflags
         config.build_settings['SWIFT_VERSION'] = '5.0'
         config.build_settings['ENABLE_BITCODE'] = 'NO'
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
+
+        # Google's ML Kit Barcode Scanning setup 
+        if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
+        end
       end
     if target.name == "Pods-Runner"
       puts "Updating #{target.name} OTHER_LDFLAGS"

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		8D5301A66443EB83C2942617 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0F7CDAE0711D556D0AAC9B9 /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -93,14 +92,6 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		1BE58856EBF47B0203E9C4D6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				C0F7CDAE0711D556D0AAC9B9 /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -162,7 +153,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				84A0BFE3ED1FCBF95CAABE1A /* [CP] Embed Pods Frameworks */,
-				9AE0B04C19293213DBF69ACC /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -222,23 +212,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		336B5EA3C3EB96365DF03060 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -287,23 +260,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
-		9AE0B04C19293213DBF69ACC /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		D54AC9D43D1B04229C2D5652 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -326,21 +282,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -56,6 +56,16 @@
 				<string>openid-initiate-issuance</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>openid-credential-offer</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>openid-credential-offer</string>
+			</array>
+		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
@@ -76,6 +86,26 @@
 				<string>openid</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>openid</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>siopv2</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>openid</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>openid-vc</string>
+			</array>
+		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>

diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
@@ -10,19 +10,17 @@
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: automatic_code_signing" time="0.062071">
+      <testcase classname="fastlane.lanes" name="1: automatic_code_signing" time="0.062988">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: build_app" time="254.595487">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="177.965777">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: upload_to_testflight" time="14.907495">
-
-          <failure message="/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/actions/actions_helper.rb:67:in `execute_action'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:229:in `chdir'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:229:in `execute_action'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing'&#10;Fastfile:25:in `block (2 levels) in parsing_binding'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/lane.rb:33:in `call'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:49:in `block in execute'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:45:in `chdir'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/runner.rb:45:in `execute'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/commands_generator.rb:110:in `block (2 levels) in run'&#10;/Library/Ruby/Gems/2.6.0/gems/commander-4.6.0/lib/commander/command.rb:187:in `call'&#10;/Library/Ruby/Gems/2.6.0/gems/commander-4.6.0/lib/commander/command.rb:157:in `run'&#10;/Library/Ruby/Gems/2.6.0/gems/commander-4.6.0/lib/commander/runner.rb:444:in `run_active_command'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in `run!'&#10;/Library/Ruby/Gems/2.6.0/gems/commander-4.6.0/lib/commander/delegates.rb:18:in `run!'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/commands_generator.rb:354:in `run'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/commands_generator.rb:43:in `start'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in `take_off'&#10;/Library/Ruby/Gems/2.6.0/gems/fastlane-2.209.0/bin/fastlane:23:in `&lt;top (required)&gt;'&#10;/usr/local/bin/fastlane:23:in `load'&#10;/usr/local/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Could not find transporter at /Applications/Xcode.app/Contents/Developer/. Please make sure you set the correct path to your Xcode installation." />
+      <testcase classname="fastlane.lanes" name="3: upload_to_testflight" time="709.069268">
 
       </testcase>
 

diff --git a/lib/app/shared/alert_message/alert_message.dart b/lib/app/shared/alert_message/alert_message.dart
@@ -35,11 +35,10 @@ class AlertMessage {
     if (stateMessage.showDialog) {
       showDialog<bool>(
         context: context,
-        builder: (context) => ConfirmDialog(
+        builder: (context) => ErrorDialog(
           title: message,
-          yes: context.l10n.ok,
-          showNoButton: false,
-          //icon: stateMessage.type.iconPath,
+          erroDescription: stateMessage.erroDescription,
+          erroUrl: stateMessage.erroUrl,
         ),
       );
     } else {

diff --git a/lib/app/shared/constants/image_strings.dart b/lib/app/shared/constants/image_strings.dart
@@ -21,6 +21,7 @@ class ImageStrings {
   static const String walletCertificateAndroid =
       '$imagePath/wallet-certificate-android.png';
   static const String bloometaPass = '$imagePath/bloometa-pass.png';
+  static const String livenessCard = '$imagePath/liveness-card.png';
   static const String tezotopiaMemberShip =
       '$imagePath/tezotopia-membership.png';
   static const String chainbornMemberShip =
@@ -114,6 +115,7 @@ class ImageStrings {
   static const String tezotopiaMemberShipDummy =
       '$imagePath/tezotopia-membership-dummy.png';
   static const String bloometaDummy = '$imagePath/bloometa-dummy.png';
+  static const String livenessDummy = '$imagePath/liveness-dummy.png';
   static const String chainbornMemberShipDummy =
       '$imagePath/chainborn-membership-dummy.png';
   static const String twitterCardDummy = '$imagePath/twitter-card-dummy.png';

diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -22,7 +22,10 @@ class Parameters {
   );
 
   static const oidc4vcUniversalLink =
-      'https://app.talao.co/app/download/oidc4vc';
+      'https://app.talao.co/app/download/callback';
+
+  static const authorizeEndPoint =
+      'https://app.talao.co/app/download/authorize';
 
   static const web3RpcMainnetUrl = 'https://mainnet.infura.io/v3/';
 

diff --git a/lib/app/shared/constants/secure_storage_keys.dart b/lib/app/shared/constants/secure_storage_keys.dart
@@ -22,13 +22,15 @@ class SecureStorageKeys {
   static const String isWalletIntegrityEnabled = 'isWalletIntegrityEnabled';
   static const String isBiometricEnabled = 'fingerprintEnabled';
 
-  static const String alertEnabled = 'alertEnabled';
   static const String userConsentForIssuerAccess = 'userConsentForIssuerAccess';
   static const String userConsentForVerifierAccess =
       'userConsentForVerifierAccess';
   static const String userPINCodeForAuthentication =
       'userPINCodeForAuthentication';
 
+  static const String isSecurityLow = 'isSecurityLow';
+  static const String userPinDigitsLength = 'userPinDigitsLength';
+
   static const String pinCode = 'pinCode';
   static const String data = 'data';
   static const String rsaKeyJson = 'RSAKeyJson';
@@ -57,7 +59,7 @@ class SecureStorageKeys {
   static const String ssiMnemonic = 'ssi/mnemonic';
   static const String ssiKey = 'ssi/key';
 
-  static const String p256PrivateKey = 'ssi/p256PrivateKey';
+  static const String p256PrivateKey = 'p256PrivateKey';
 
   static const String cryptoAccount = 'cryptoAccount';
   static const String cryptoAccounTrackingIndex = 'cryptoAccounTrackingIndex';
@@ -82,6 +84,4 @@ class SecureStorageKeys {
   static const String buildNumber = 'buildNumber';
 
   static const String hasVerifiedMnemonics = 'hasVerifiedMnemonics';
-
-  static const String oidc4vcType = 'oidc4vcType';
 }
diff --git a/lib/app/shared/constants/urls.dart b/lib/app/shared/constants/urls.dart
@@ -42,6 +42,9 @@ class Urls {
 
   static const String bloometaCardUrl = 'https://issuer.talao.co/bloometa';
 
+  static const String livenessCardUrl =
+      'https://issuer.talao.co/passbase/endpoint/liveness';
+
   static const String defaultPolygonIdCardUrl =
       'https://issuer.talao.co/credential-manifest/polygonid/default';
 

diff --git a/lib/app/shared/enum/credential_category.dart b/lib/app/shared/enum/credential_category.dart
@@ -84,6 +84,7 @@ extension CredentialCategoryX on CredentialCategory {
           CredentialSubjectType.over13,
           // CredentialSubjectType.passportFootprint,
           CredentialSubjectType.verifiableIdCard,
+          CredentialSubjectType.livenessCard,
         ];
       case CredentialCategory.contactInfoCredentials:
         return [

diff --git a/lib/app/shared/enum/message/response_string/response_string.dart b/lib/app/shared/enum/message/response_string/response_string.dart
@@ -136,9 +136,13 @@ enum ResponseString {
   RESPONSE_STRING_bloometaPassExpirationDate,
   RESPONSE_STRING_bloometaPassWhyGetThisCard,
   RESPONSE_STRING_bloometaPassHowToGetIt,
+  RESPONSE_STRING_livenessCardExpirationDate,
+  RESPONSE_STRING_livenessCardWhyGetThisCard,
+  RESPONSE_STRING_livenessCardHowToGetIt,
   RESPONSE_STRING_tezotopiaMembershipLongDescription,
   RESPONSE_STRING_chainbornMembershipLongDescription,
   RESPONSE_STRING_bloometaPassLongDescription,
+  RESPONSE_STRING_livenessCardLongDescription,
   RESPONSE_STRING_succesfullyAuthenticated,
   RESPONSE_STRING_authenticationFailed,
   RESPONSE_STRING_deviceIncompatibilityMessage,
@@ -153,4 +157,13 @@ enum ResponseString {
   RESPONSE_STRING_youcanSelectOnlyXCredential,
   RESPONSE_STRING_theCredentialIsNotReady,
   RESPONSE_STRING_theCredentialIsNoMoreReady,
+  RESPONSE_STRING_theRequestIsRejected,
+  RESPONSE_STRING_userPinIsIncorrect,
+  RESPONSE_STRING_responseTypeNotSupported,
+  RESPONSE_STRING_invalidRequest,
+  RESPONSE_STRING_subjectSyntaxTypeNotSupported,
+  RESPONSE_STRING_accessDenied,
+  RESPONSE_STRING_thisRequestIsNotSupported,
+  RESPONSE_STRING_unsupportedCredential,
+  RESPONSE_STRING_credentialIssuanceNotAllowedToTheWallet,
 }