Merge pull request #233 from niscy-eudiw/main

SD-JWT Support, Metadata Localization and scoped issuance
eu-digital-identity-wallet · Jan 9, 2025 · c84e6ba · c84e6ba
2 parents 61079c7 + 9984e40
commit c84e6ba
Show file tree

Hide file tree

Showing 82 changed files with 3,374 additions and 14,778 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -16,8 +16,6 @@ excluded:
     - "Modules/feature-startup/Tests/*"
     - "Modules/feature-common/Tests/*"
     - "Modules/feature-startup/.build/*"
-    - "Modules/feature-login/Tests/*"
-    - "Modules/feature-login/.build/*"
     - "Modules/feature-dashboard/Tests/*"
     - "Modules/feature-dashboard/.build/*"
     - "Modules/feature-common/.build/*"

diff --git a/EudiReferenceWallet.xcodeproj/project.pbxproj b/EudiReferenceWallet.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1194D2322B06363400377213 /* EUDI_sample_data.json in Resources */ = {isa = PBXBuildFile; fileRef = 1194D2302B06362900377213 /* EUDI_sample_data.json */; };
 		F02921632B8E07870076A58B /* WalletDemoRelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F02921612B8E07870076A58B /* WalletDemoRelease.xcconfig */; };
 		F02921642B8E07870076A58B /* WalletDevRelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = F02921622B8E07870076A58B /* WalletDevRelease.xcconfig */; };
 		F02AE38F2BA6E45F00C25C59 /* logic-assembly in Resources */ = {isa = PBXBuildFile; fileRef = F02AE38E2BA6E45F00C25C59 /* logic-assembly */; };
@@ -33,7 +32,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1194D2302B06362900377213 /* EUDI_sample_data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = EUDI_sample_data.json; sourceTree = "<group>"; };
 		1198ECD72AC453F200F4E71A /* logic-resources */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "logic-resources"; path = "Modules/logic-resources"; sourceTree = "<group>"; };
 		F018D9F32D087C410015876D /* logic-storage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "logic-storage"; path = "Modules/logic-storage"; sourceTree = "<group>"; };
 		F02921612B8E07870076A58B /* WalletDemoRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WalletDemoRelease.xcconfig; sourceTree = "<group>"; };
@@ -63,7 +61,6 @@
 		F1596BB02AD40EE000552D1B /* feature-dashboard */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "feature-dashboard"; path = "Modules/feature-dashboard"; sourceTree = "<group>"; };
 		F1CACADF2AC3097100B40DED /* WalletDev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WalletDev.xcconfig; sourceTree = "<group>"; };
 		F1CACAE12AC3098C00B40DED /* WalletDemo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WalletDemo.xcconfig; sourceTree = "<group>"; };
-		F1E83CFD2ACE91DD00FBC0E3 /* feature-login */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "feature-login"; path = "Modules/feature-login"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -82,7 +79,6 @@
 			isa = PBXGroup;
 			children = (
 				F0635CA72B72431D00260E50 /* eudi_pid_issuer_ut.der */,
-				1194D2302B06362900377213 /* EUDI_sample_data.json */,
 			);
 			path = Sample;
 			sourceTree = "<group>";
@@ -158,7 +154,6 @@
 				F069CC3D2AFAC0AD0033AAC5 /* feature-proximity */,
 				F05E9F372AFABBC200891E8F /* feature-presentation */,
 				F1596BB02AD40EE000552D1B /* feature-dashboard */,
-				F1E83CFD2ACE91DD00FBC0E3 /* feature-login */,
 				F0BFE9B62AD557290062826F /* feature-common */,
 				1198ECD72AC453F200F4E71A /* logic-resources */,
 				F06325112AC59AF50004601F /* feature-test */,
@@ -203,7 +198,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1500;
-				LastUpgradeCheck = 1600;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					F14907B72ABAF54B00DDFE56 = {
 						CreatedOnToolsVersion = 15.0;
@@ -233,7 +228,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1194D2322B06363400377213 /* EUDI_sample_data.json in Resources */,
 				F02AE38F2BA6E45F00C25C59 /* logic-assembly in Resources */,
 				F06325122AC59AF50004601F /* feature-test in Resources */,
 				F14907C32ABAF55000DDFE56 /* Preview Assets.xcassets in Resources */,

diff --git a/EudiReferenceWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EudiReferenceWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "9f057a82d9d7b8b9aaf5e6e6fb50269460c01bbde83b71a2e51eff3bb11a847f",
+  "originHash" : "174246310b281a8484da280433ee4e808e7c00af76fc646a9b3ac2a57fa12f6e",
   "pins" : [
     {
       "identity" : "activityindicatorview",
@@ -91,6 +91,15 @@
         "version" : "0.10.0"
       }
     },
+    {
+      "identity" : "cryptoswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
+      "state" : {
+        "revision" : "729e01bc9b9dab466ac85f21fb9ee2bc1c61b258",
+        "version" : "1.8.4"
+      }
+    },
     {
       "identity" : "cuckoo",
       "kind" : "remoteSourceControl",
@@ -105,35 +114,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-data-model.git",
       "state" : {
-        "revision" : "cf0a7936ffd94698754c9aa611d0724c3b70b527",
-        "version" : "0.4.1"
+        "revision" : "ef353c447c7716c1fe5f5905ff98e089f5a29d43",
+        "version" : "0.5.1"
       }
     },
     {
       "identity" : "eudi-lib-ios-iso18013-data-transfer",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-data-transfer.git",
       "state" : {
-        "revision" : "34b0ca6d1f61e57e967d038a9d1954d25ae6a9dc",
-        "version" : "0.4.1"
+        "revision" : "bb00a75018ad9220880cea3790454ab02fffa6db",
+        "version" : "0.5.1"
       }
     },
     {
       "identity" : "eudi-lib-ios-iso18013-security",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-security.git",
       "state" : {
-        "revision" : "dca2b2aae09753cda3a1ac33d11e83dca40d2201",
-        "version" : "0.3.1"
+        "revision" : "d3d9935b24b05902f840471bb70f651caa7f4cb5",
+        "version" : "0.4.0"
       }
     },
     {
       "identity" : "eudi-lib-ios-openid4vci-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-openid4vci-swift.git",
       "state" : {
-        "revision" : "a2d316ac7fd9b010ed528f41b3992be2eea98881",
-        "version" : "0.9.1"
+        "revision" : "276778d6e4abfefa7df7628bfaf24af7bd9d3a6f",
+        "version" : "0.10.0"
       }
     },
     {
@@ -177,26 +186,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-siop-openid4vp-swift.git",
       "state" : {
-        "revision" : "c72b0f972f765bd106b52c953de0827096398763",
-        "version" : "0.6.2"
+        "revision" : "8a0f93c2163b5c7210b86fe0fd43ccb2725fe30c",
+        "version" : "0.6.4"
       }
     },
     {
       "identity" : "eudi-lib-ios-wallet-kit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-kit.git",
       "state" : {
-        "revision" : "5aa8e3ac98f53623f1798fa68763afe83a0eea91",
-        "version" : "0.8.5"
+        "revision" : "9167f16b8528217c362bf5eb68a14fa68bc85fd7",
+        "version" : "0.9.1"
       }
     },
     {
       "identity" : "eudi-lib-ios-wallet-storage",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git",
       "state" : {
-        "revision" : "627cea96c707da6ebb20039eeb467b96336aa8c3",
-        "version" : "0.4.1"
+        "revision" : "4c5c7c6c0a55a139e2b7c54eda0bdb9b9e09a4d4",
+        "version" : "0.4.3"
+      }
+    },
+    {
+      "identity" : "eudi-lib-sdjwt-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-sdjwt-swift.git",
+      "state" : {
+        "revision" : "3921713715d3ff32dea391bdfd4ec8a080db3921",
+        "version" : "0.4.0"
       }
     },
     {
@@ -217,6 +235,15 @@
         "version" : "0.4.148"
       }
     },
+    {
+      "identity" : "jose-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/beatt83/jose-swift.git",
+      "state" : {
+        "revision" : "57fe5a03c83feaf73a84b23c02e641f86482e313",
+        "version" : "4.0.2"
+      }
+    },
     {
       "identity" : "joseswift",
       "kind" : "remoteSourceControl",
@@ -312,8 +339,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/realm/realm-swift.git",
       "state" : {
-        "revision" : "5553cfd1c789efdb3d6daf7f0cc0733cfe601846",
-        "version" : "10.54.1"
+        "revision" : "a3abcdf95a3176f5ad990239920aad4ef86e00de",
+        "version" : "10.54.2"
+      }
+    },
+    {
+      "identity" : "secp256k1.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/GigaBitcoin/secp256k1.swift.git",
+      "state" : {
+        "revision" : "4c77c7384768acf1093d66ccaacf298d322b10b7",
+        "version" : "0.15.0"
       }
     },
     {

diff --git a/EudiReferenceWallet.xcodeproj/xcshareddata/xcschemes/EUDI Wallet Demo.xcscheme b/EudiReferenceWallet.xcodeproj/xcshareddata/xcschemes/EUDI Wallet Demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1600"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/EudiReferenceWallet.xcodeproj/xcshareddata/xcschemes/EUDI Wallet Dev.xcscheme b/EudiReferenceWallet.xcodeproj/xcshareddata/xcschemes/EUDI Wallet Dev.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1600"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/EudiWallet.xctestplan b/EudiWallet.xctestplan
@@ -16,13 +16,6 @@
     }
   },
   "testTargets" : [
-    {
-      "target" : {
-        "containerPath" : "container:Modules\/feature-login",
-        "identifier" : "feature-login-tests",
-        "name" : "feature-login-tests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Modules\/feature-dashboard",

diff --git a/MockGeneration/CuckooConfig.toml b/MockGeneration/CuckooConfig.toml
@@ -140,38 +140,6 @@ enableInheritance = true
 protocolsOnly = true
 omitHeaders = false
 
-[modules.FeatureLogin]
-output = "../Modules/feature-login/Tests/Mock/GeneratedMocks.swift"
-testableImports = [
-	"logic_core", 
-	"logic_business", 
-	"logic_analytics",
-	"logic_storage",
-	"logic_ui", 
-	"logic_api", 
-	"logic_authentication",
-	"feature_common",
-	"feature_login"
-]
-sources = [
-	"../Modules/logic-core/Sources/**/*.swift",
-	"../Modules/logic-business/Sources/**/*.swift",
-	"../Modules/logic-analytics/Sources/**/*.swift",
-	"../Modules/logic-storage/Sources/**/*.swift",
-	"../Modules/logic-ui/Sources/**/*.swift",
-	"../Modules/logic-api/Sources/**/*.swift",
-	"../Modules/logic-authentication/Sources/**/*.swift",
-    "../Modules/feature-common/Sources/**/*.swift",
-    "../Modules/feature-login/Sources/**/*.swift"
-]
-
-[modules.FeatureLogin.options]
-glob = true
-keepDocumentation = false
-enableInheritance = true
-protocolsOnly = true
-omitHeaders = false
-
 [modules.FeatureStartup]
 output = "../Modules/feature-startup/Tests/Mock/GeneratedMocks.swift"
 testableImports = [

diff --git a/MockGeneration/GenerateMocks.sh b/MockGeneration/GenerateMocks.sh
@@ -10,7 +10,7 @@ printr() {
 }
 
 # Use xcodebuild to load build settings into environment variables
-build_settings=$(xcodebuild -project ../EudiReferenceWallet.xcodeproj -target EudiWallet  -showBuildSettings)
+build_settings=$(xcodebuild -project ../EudiReferenceWallet.xcodeproj -target EudiWallet -showBuildSettings)
 
 # Set specific build settings as environment variables
 export ACTION=$(echo "$build_settings" | awk -F'=' '/ACTION/{print $2}' | tr -d ' ')

diff --git a/Modules/feature-common/Sources/UI/Loading/BaseLoadingView.swift b/Modules/feature-common/Sources/UI/Loading/BaseLoadingView.swift
@@ -71,7 +71,7 @@ private func content(
   ContentScreenView {
     content(
       isCancellable: true,
-      title: .loadSampleData,
+      title: .requestDataTitle([""]),
       caption: .requestDataCaption,
       onNavigate: {}
     )

diff --git a/Modules/feature-common/Sources/UI/Request/Cell/RequestDataCellView.swift b/Modules/feature-common/Sources/UI/Request/Cell/RequestDataCellView.swift
@@ -103,9 +103,9 @@ struct RequestDataCellView: View {
     cellModel: RequestDataUIModel.requestDataSection(
       RequestDataSection(
         id: "id",
-        type: .age,
         title: "Title"
       )
     ),
-    isLoading: false)
+    isLoading: false
+  )
 }