Merge branch 'main' into TALAO

TalaoDAO · Mar 19, 2024 · efbed7d · efbed7d
2 parents e3608b5 + 6e1c2a9
commit efbed7d
Show file tree

Hide file tree

Showing 81 changed files with 1,830 additions and 976 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -130,6 +130,12 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="openid-hedera" />
 			</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="haip" />
+			</intent-filter>
         </activity><meta-data
             android:name="flutterEmbedding"
             android:value="2" />

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -156,6 +156,16 @@
 				<string>tezos</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>haip</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>haip</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>

diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -68,6 +68,9 @@ class Parameters {
   static const int maxEntries = 3;
 
   static const String appName = 'Talao';
+  static const bool supportDefiCompliance = true;
+  static const bool supportCryptoAccountOwnershipInDiscoverForEnterpriseMode =
+      true;
 
   static const DidKeyType didKeyTypeForEbsiV3 = DidKeyType.ebsiv3;
   static const DidKeyType didKeyTypeForDefault = DidKeyType.edDSA;

diff --git a/lib/app/shared/constants/urls.dart b/lib/app/shared/constants/urls.dart
@@ -63,7 +63,8 @@ class Urls {
   /// linkedin card
   static const String linkedinCardUrl =
       'https://issuer.talao.co/passbase/endpoint/linkedincard/';
-  static const String talaoIpfsGateway = 'https://talao.mypinata.cloud/ipfs/';
+  // static const String talaoIpfsGafteway = 'https://talao.mypinata.cloud/ipfs/';
+  static const String ipfsGateway = 'https://ipfs.io/ipfs/';
 
   /// main tezos rpc
   static const mainnetRPC = [

diff --git a/lib/app/shared/date/date.dart b/lib/app/shared/date/date.dart
@@ -70,8 +70,8 @@ class UiDate {
               .toLocal(),
         );
       }
-    } catch (e, s) {
-      getLogger('date').e('e: $e, s: $s');
+    } catch (e) {
+      //getLogger('date').e('e: $e, s: $s');
       return '';
     }
   }

diff --git a/lib/app/shared/enum/type/oidc4vc_type.dart b/lib/app/shared/enum/type/oidc4vc_type.dart
@@ -22,6 +22,11 @@ enum OIDC4VCType {
   JWTVC(
     offerPrefix: '',
     presentationPrefix: 'openid-vc://',
+  ),
+
+  HAIP(
+    offerPrefix: 'haip',
+    presentationPrefix: 'haip://',
   );
 
   const OIDC4VCType({
@@ -34,27 +39,13 @@ enum OIDC4VCType {
 }
 
 extension OIDC4VCTypeX on OIDC4VCType {
-  String get rename {
-    switch (this) {
-      case OIDC4VCType.DEFAULT:
-        return 'DEFAULT';
-      case OIDC4VCType.GAIAX:
-        return 'GAIA-X';
-      case OIDC4VCType.EBSIV3:
-        return 'EBSI-V3';
-      case OIDC4VCType.GREENCYPHER:
-        return 'GREENCYPHER';
-      case OIDC4VCType.JWTVC:
-        return 'JWT-VC';
-    }
-  }
-
   bool get isEnabled {
     switch (this) {
       case OIDC4VCType.DEFAULT:
       case OIDC4VCType.GAIAX:
       case OIDC4VCType.GREENCYPHER:
       case OIDC4VCType.EBSIV3:
+      case OIDC4VCType.HAIP:
         return true;
       case OIDC4VCType.JWTVC:
         return false;

diff --git a/lib/app/shared/enum/type/profile/did_key_type.dart b/lib/app/shared/enum/type/profile/did_key_type.dart
@@ -12,6 +12,10 @@ enum DidKeyType {
   ebsiv3,
   @JsonValue('did:jwk:p-256')
   jwkP256,
+  @JsonValue(
+    'urn:ietf:params:oauth:client-assertion-type:jwt-client-attestation',
+  )
+  jwtClientAttestation,
 }
 
 extension DidKeyTypeX on DidKeyType {
@@ -27,6 +31,8 @@ extension DidKeyTypeX on DidKeyType {
         return 'did:key EBSI-V3';
       case DidKeyType.jwkP256:
         return 'did:jwk P-256';
+      case DidKeyType.jwtClientAttestation:
+        return '';
     }
   }
 
@@ -42,6 +48,8 @@ extension DidKeyTypeX on DidKeyType {
         return l10n.ebsiV3DecentralizedId;
       case DidKeyType.jwkP256:
         return l10n.jwkDecentralizedIDP256;
+      case DidKeyType.jwtClientAttestation:
+        return '';
     }
   }
 
@@ -50,6 +58,7 @@ extension DidKeyTypeX on DidKeyType {
       case DidKeyType.secp256k1:
       case DidKeyType.p256:
       case DidKeyType.jwkP256:
+      case DidKeyType.jwtClientAttestation:
         return true;
       case DidKeyType.edDSA:
       case DidKeyType.ebsiv3: