Symorton/presentation sample flow

Demo/WalletLibraryDemo/WalletLibraryDemo.xcodeproj/project.pbxproj

@@ -7,8 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		552A75BB29C50DBA005BFF3D /* VerifiedIdRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552A75BA29C50DB9005BFF3D /* VerifiedIdRepository.swift */; };
+		552A760629C8E32C005BFF3D /* RequirementListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552A760529C8E32C005BFF3D /* RequirementListView.swift */; };
+		552A760829C8E3B5005BFF3D /* UserInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552A760729C8E3B5005BFF3D /* UserInputView.swift */; };
+		552A760C29C8F70E005BFF3D /* VerifiedIdPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552A760B29C8F70E005BFF3D /* VerifiedIdPickerView.swift */; };
 		553CC08929A94686005A5FD6 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553CC08829A94686005A5FD6 /* ErrorView.swift */; };
-		553CC08B29A9469B005A5FD6 /* SuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553CC08A29A9469B005A5FD6 /* SuccessView.swift */; };
+		553CC08B29A9469B005A5FD6 /* VerifiedIdView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553CC08A29A9469B005A5FD6 /* VerifiedIdView.swift */; };
 		553CC08D29A94A13005A5FD6 /* RequirementListCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553CC08C29A94A13005A5FD6 /* RequirementListCellView.swift */; };
 		5585BDE129A047370059710B /* SampleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5585BDE029A047370059710B /* SampleViewModel.swift */; };
 		5585BDE529A692E10059710B /* RequirementState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5585BDE429A692E10059710B /* RequirementState.swift */; };
@@ -39,8 +43,12 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		552A75BA29C50DB9005BFF3D /* VerifiedIdRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifiedIdRepository.swift; sourceTree = "<group>"; };
+		552A760529C8E32C005BFF3D /* RequirementListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequirementListView.swift; sourceTree = "<group>"; };
+		552A760729C8E3B5005BFF3D /* UserInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInputView.swift; sourceTree = "<group>"; };
+		552A760B29C8F70E005BFF3D /* VerifiedIdPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifiedIdPickerView.swift; sourceTree = "<group>"; };
 		553CC08829A94686005A5FD6 /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
-		553CC08A29A9469B005A5FD6 /* SuccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuccessView.swift; sourceTree = "<group>"; };
+		553CC08A29A9469B005A5FD6 /* VerifiedIdView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifiedIdView.swift; sourceTree = "<group>"; };
 		553CC08C29A94A13005A5FD6 /* RequirementListCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequirementListCellView.swift; sourceTree = "<group>"; };
 		5585BDE029A047370059710B /* SampleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleViewModel.swift; sourceTree = "<group>"; };
 		5585BDE429A692E10059710B /* RequirementState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequirementState.swift; sourceTree = "<group>"; };
@@ -75,8 +83,11 @@
 				553CC08829A94686005A5FD6 /* ErrorView.swift */,
 				5585BDFD29A6C4CA0059710B /* RequestView.swift */,
 				553CC08C29A94A13005A5FD6 /* RequirementListCellView.swift */,
+				552A760529C8E32C005BFF3D /* RequirementListView.swift */,
 				5585BDFF29A6C5070059710B /* RequirementView.swift */,
-				553CC08A29A9469B005A5FD6 /* SuccessView.swift */,
+				553CC08A29A9469B005A5FD6 /* VerifiedIdView.swift */,
+				552A760729C8E3B5005BFF3D /* UserInputView.swift */,
+				552A760B29C8F70E005BFF3D /* VerifiedIdPickerView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -106,6 +117,7 @@
 				55E33699293E8F7500CD2ED7 /* Persistence.swift */,
 				5585BDE429A692E10059710B /* RequirementState.swift */,
 				5585BDE029A047370059710B /* SampleViewModel.swift */,
+				552A75BA29C50DB9005BFF3D /* VerifiedIdRepository.swift */,
 				55E33697293E8F7500CD2ED7 /* WalletLibraryDemoApp.swift */,
 				55E336A0293E8F7700CD2ED7 /* Assets.xcassets */,
 				55E336A2293E8F7700CD2ED7 /* WalletLibraryDemo.entitlements */,
@@ -204,12 +216,16 @@
 			files = (
 				5585BDFE29A6C4CA0059710B /* RequestView.swift in Sources */,
 				55E3369D293E8F7500CD2ED7 /* WalletLibraryDemo.xcdatamodeld in Sources */,
-				553CC08B29A9469B005A5FD6 /* SuccessView.swift in Sources */,
+				553CC08B29A9469B005A5FD6 /* VerifiedIdView.swift in Sources */,
 				55E33698293E8F7500CD2ED7 /* WalletLibraryDemoApp.swift in Sources */,
+				552A75BB29C50DBA005BFF3D /* VerifiedIdRepository.swift in Sources */,
+				552A760629C8E32C005BFF3D /* RequirementListView.swift in Sources */,
 				55E3369F293E8F7500CD2ED7 /* ContentView.swift in Sources */,
 				5585BE0029A6C5070059710B /* RequirementView.swift in Sources */,
 				5585BDE529A692E10059710B /* RequirementState.swift in Sources */,
+				552A760C29C8F70E005BFF3D /* VerifiedIdPickerView.swift in Sources */,
 				55E3369A293E8F7500CD2ED7 /* Persistence.swift in Sources */,
+				552A760829C8E3B5005BFF3D /* UserInputView.swift in Sources */,
 				553CC08929A94686005A5FD6 /* ErrorView.swift in Sources */,
 				553CC08D29A94A13005A5FD6 /* RequirementListCellView.swift in Sources */,
 				5585BDE129A047370059710B /* SampleViewModel.swift in Sources */,

Demo/WalletLibraryDemo/WalletLibraryDemo/ContentView.swift

@@ -12,13 +12,15 @@ struct ContentView: View {
 
     @StateObject private var viewModel = SampleViewModel()
 
+    @State private var input: String = ""
+
     var body: some View {
         NavigationView {
             VStack {
                 Text("Sample Request URL:")
                 TextField(
                     "OpenId Request URL",
-                    text: $viewModel.input,
+                    text: $input,
                     axis: .vertical
                 )
                 .padding(EdgeInsets(top: 5, leading: 5, bottom: 5, trailing: 5))
@@ -29,8 +31,25 @@ struct ContentView: View {
                 NavigationLink(destination: RequestView()) {
                     Text("Create Request")
                 }.navigationTitle("Verified Id Sample App")
+                Spacer()
+                if !viewModel.issuedVerifiedIds.isEmpty {
+                    Text("Issued Verified Ids")
+                        .bold()
+                    List {
+                        ForEach(viewModel.issuedVerifiedIds, id: \.id) { verifiedId in
+                            NavigationLink {
+                                VerifiedIdView(verifiedId: verifiedId)
+                            } label: {
+                                Text(verifiedId.id)
+                            }
+                        }.onDelete { indexSet in
+                            viewModel.deleteVerifiedId(indexSet: indexSet)
+                        }
+                    }
+                    .listStyle(.inset)
+                }
             }.onDisappear {
-                viewModel.createRequest()
+                viewModel.createRequest(fromInput: input)
             }
         }
         .environmentObject(viewModel)

Demo/WalletLibraryDemo/WalletLibraryDemo/Persistence.swift

@@ -8,24 +8,6 @@ import CoreData
 struct PersistenceController {
     static let shared = PersistenceController()
 
-    static var preview: PersistenceController = {
-        let result = PersistenceController(inMemory: true)
-        let viewContext = result.container.viewContext
-        for _ in 0..<10 {
-            let newItem = Item(context: viewContext)
-            newItem.timestamp = Date()
-        }
-        do {
-            try viewContext.save()
-        } catch {
-            // Replace this implementation with code to handle the error appropriately.
-            // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-            let nsError = error as NSError
-            fatalError("Unresolved error \(nsError), \(nsError.userInfo)")
-        }
-        return result
-    }()
-
     let container: NSPersistentContainer
 
     init(inMemory: Bool = false) {

Demo/WalletLibraryDemo/WalletLibraryDemo/RequirementState.swift

@@ -8,6 +8,7 @@ import WalletLibrary
 enum RequirementStateError: String, Error {
     case unsupportedRequirementType = "Unsupported Requirement Type"
     case invalidInputToFulfillRequirement = "Invalid Input to Fulfill Requirement"
+    case requirementIsNotOfTypeVerifiedIdRequirement = "Requirement cannot be fulfilled by Verified Id"
 }
 
 /// Requirement Status based on whether requirement is valid or missing.
@@ -46,6 +47,8 @@ class RequirementState: Identifiable, ObservableObject {
         case let idTokenRequirement as IdTokenRequirement:
             self.label = "Id Token for: \(idTokenRequirement.configuration)"
             try? addNewLabelIfValid(newLabel: "Valid Id Token Present")
+        case let verifiedIdRequirement as VerifiedIdRequirement:
+            self.label = "Verified Id Requirement for types: \(verifiedIdRequirement.types)"
         default:
             throw RequirementStateError.unsupportedRequirementType
         }
@@ -64,6 +67,16 @@ class RequirementState: Identifiable, ObservableObject {
         }
     }
 
+    func fulfill(with value: VerifiedId) throws {
+
+        guard let verifiedIdRequirement = requirement as? VerifiedIdRequirement else {
+            throw RequirementStateError.requirementIsNotOfTypeVerifiedIdRequirement
+        }
+
+        try verifiedIdRequirement.fulfill(with: value)
+        try addNewLabelIfValid(newLabel: "Verified Id Requirement Fulfilled.")
+    }
+
     private func addNewLabelIfValid(newLabel: String) throws {
         do {
             try requirement.validate()