cleanup returned errors

torusresearch · Jun 17, 2024 · 586e144 · 586e144
1 parent e2eb021
commit 586e144
Show file tree

Hide file tree

Showing 13 changed files with 229 additions and 67 deletions.
diff --git a/CustomAuthDemo/CustomAuthDemo.xcodeproj/project.pbxproj b/CustomAuthDemo/CustomAuthDemo.xcodeproj/project.pbxproj
@@ -14,6 +14,8 @@
 		511CEAEE2452D4EF00A7ACE9 /* CustomAuthDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEAED2452D4EF00A7ACE9 /* CustomAuthDemoUITests.swift */; };
 		51775EB72484B66A00A29680 /* CustomAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 51775EB62484B66A00A29680 /* CustomAuth */; };
 		B37E3CEE2C1CF30F00B63F41 /* CustomAuthDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */; };
+		B37E3CF12C1E1C6E00B63F41 /* CustomAuth in Frameworks */ = {isa = PBXBuildFile; productRef = B37E3CF02C1E1C6E00B63F41 /* CustomAuth */; };
+		B37E3CF32C1E23B700B63F41 /* CustomAuth in Frameworks */ = {isa = PBXBuildFile; productRef = B37E3CF22C1E23B700B63F41 /* CustomAuth */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -45,7 +47,6 @@
 		511CEAE92452D4EF00A7ACE9 /* CustomAuthDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CustomAuthDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		511CEAED2452D4EF00A7ACE9 /* CustomAuthDemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAuthDemoUITests.swift; sourceTree = "<group>"; };
 		511CEAEF2452D4EF00A7ACE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		517C5F5D24693F9D006D5A43 /* CustomAuthDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CustomAuthDemo.entitlements; sourceTree = "<group>"; };
 		A3C24F222A70FAF9002F4FC9 /* customauth-swift-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "customauth-swift-sdk"; path = ..; sourceTree = "<group>"; };
 		B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAuthDemo.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -63,13 +64,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B37E3CF32C1E23B700B63F41 /* CustomAuth in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		511CEAE62452D4EF00A7ACE9 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B37E3CF12C1E1C6E00B63F41 /* CustomAuth in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -84,6 +87,7 @@
 				511CEAE12452D4EF00A7ACE9 /* CustomAuthDemoTests */,
 				511CEAEC2452D4EF00A7ACE9 /* CustomAuthDemoUITests */,
 				511CEAC92452D4EC00A7ACE9 /* Products */,
+				B37E3CEF2C1E1C6E00B63F41 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -101,7 +105,6 @@
 			isa = PBXGroup;
 			children = (
 				B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */,
-				517C5F5D24693F9D006D5A43 /* CustomAuthDemo.entitlements */,
 				511CEACF2452D4EC00A7ACE9 /* ContentView.swift */,
 				511CEAD12452D4EF00A7ACE9 /* Assets.xcassets */,
 				511CEAD92452D4EF00A7ACE9 /* Info.plist */,
@@ -144,6 +147,13 @@
 			name = Packages;
 			sourceTree = "<group>";
 		};
+		B37E3CEF2C1E1C6E00B63F41 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -181,6 +191,9 @@
 				511CEAE02452D4EF00A7ACE9 /* PBXTargetDependency */,
 			);
 			name = CustomAuthDemoTests;
+			packageProductDependencies = (
+				B37E3CF22C1E23B700B63F41 /* CustomAuth */,
+			);
 			productName = CustomAuthDemoTests;
 			productReference = 511CEADE2452D4EF00A7ACE9 /* CustomAuthDemoTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -199,6 +212,9 @@
 				511CEAEB2452D4EF00A7ACE9 /* PBXTargetDependency */,
 			);
 			name = CustomAuthDemoUITests;
+			packageProductDependencies = (
+				B37E3CF02C1E1C6E00B63F41 /* CustomAuth */,
+			);
 			productName = CustomAuthDemoUITests;
 			productReference = 511CEAE92452D4EF00A7ACE9 /* CustomAuthDemoUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
@@ -611,6 +627,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = CustomAuth;
 		};
+		B37E3CF02C1E1C6E00B63F41 /* CustomAuth */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CustomAuth;
+		};
+		B37E3CF22C1E23B700B63F41 /* CustomAuth */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CustomAuth;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 511CEAC02452D4EC00A7ACE9 /* Project object */;

diff --git a/...mo/CustomAuthDemo.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/...mo/CustomAuthDemo.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<true/>
 	<key>PreviewsEnabled</key>
 	<false/>
 </dict>

diff --git a/CustomAuthDemo/CustomAuthDemo.xcodeproj/xcshareddata/xcschemes/CustomAuthDemoTests.xcscheme b/CustomAuthDemo/CustomAuthDemo.xcodeproj/xcshareddata/xcschemes/CustomAuthDemoTests.xcscheme
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "511CEADD2452D4EF00A7ACE9"
+               BuildableName = "CustomAuthDemoTests.xctest"
+               BlueprintName = "CustomAuthDemoTests"
+               ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "511CEAC72452D4EC00A7ACE9"
+            BuildableName = "CustomAuthDemo.app"
+            BlueprintName = "CustomAuthDemo"
+            ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "511CEAC72452D4EC00A7ACE9"
+            BuildableName = "CustomAuthDemo.app"
+            BlueprintName = "CustomAuthDemo"
+            ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...omAuthDemo/CustomAuthDemo.xcodeproj/xcshareddata/xcschemes/CustomAuthDemoUITests.xcscheme b/...omAuthDemo/CustomAuthDemo.xcodeproj/xcshareddata/xcschemes/CustomAuthDemoUITests.xcscheme
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "511CEAE82452D4EF00A7ACE9"
+               BuildableName = "CustomAuthDemoUITests.xctest"
+               BlueprintName = "CustomAuthDemoUITests"
+               ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "511CEAC72452D4EC00A7ACE9"
+            BuildableName = "CustomAuthDemo.app"
+            BlueprintName = "CustomAuthDemo"
+            ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "511CEAC72452D4EC00A7ACE9"
+            BuildableName = "CustomAuthDemo.app"
+            BlueprintName = "CustomAuthDemo"
+            ReferencedContainer = "container:CustomAuthDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CustomAuthDemo/CustomAuthDemoTests/CustomAuthDemoTests.swift b/CustomAuthDemo/CustomAuthDemoTests/CustomAuthDemoTests.swift
@@ -4,22 +4,16 @@ import CustomAuthDemo
 class CustomAuthDemoTests: XCTestCase {
 
     override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
     }
 
     override func tearDownWithError() throws {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
     func testExample() throws {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
     }
 
     func testPerformanceExample() throws {
-        // This is an example of a performance test case.
         self.measure {
-            // Put the code you want to measure the time of here.
         }
     }
 

diff --git a/CustomAuthDemo/CustomAuthDemoUITests/CustomAuthDemoUITests.swift b/CustomAuthDemo/CustomAuthDemoUITests/CustomAuthDemoUITests.swift
@@ -2,35 +2,21 @@ import XCTest
 import CustomAuthDemo
 
 class CustomAuthDemoUITests: XCTestCase {
-
+    
     override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-
-        // In UI tests it is usually best to stop immediately when a failure occurs.
         continueAfterFailure = false
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
     }
 
     override func tearDownWithError() throws {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
     func testExample() throws {
-        // UI tests must launch the application that they test.
-        let app = XCUIApplication()
-        app.launch()
 
-        // Use recording to get started writing UI tests.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
     }
 
     func testLaunchPerformance() throws {
-        if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {
-            // This measures how long it takes to launch your application.
-            measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) {
+            measure(metrics: [XCTApplicationLaunchMetric.init()]) {
                 XCUIApplication().launch()
             }
-        }
     }
 }
diff --git a/Sources/CustomAuth/Common/AggregateVerifierParams/AggregateLoginParams.swift b/Sources/CustomAuth/Common/AggregateVerifierParams/AggregateLoginParams.swift
@@ -3,9 +3,9 @@ import Foundation
 public class AggregateLoginParams: Codable {
     public let aggregateVerifierType: AggregateVerifierType
     public let verifierIdentifier: String
-    public let subVerifierDetailsArray: [SubVerifierDetails]
+    public let subVerifierDetailsArray: [SingleLoginParams]
 
-    public init(aggregateVerifierType: AggregateVerifierType, verifierIdentifier: String, subVerifierDetailsArray: [SubVerifierDetails]) {
+    public init(aggregateVerifierType: AggregateVerifierType, verifierIdentifier: String, subVerifierDetailsArray: [SingleLoginParams]) {
         self.aggregateVerifierType = aggregateVerifierType
         self.verifierIdentifier = verifierIdentifier
         self.subVerifierDetailsArray = subVerifierDetailsArray