Add revision: v1.26.4

Governikus · Apr 28, 2023 · d69f0a9 · d69f0a9
1 parent 5610b88
commit d69f0a9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/card/core/AusweisApp2/AA2SdkConnection.swift b/card/core/AusweisApp2/AA2SdkConnection.swift
@@ -41,7 +41,6 @@ class AA2SdkConnection: SdkConnection {
 		do {
 			let messageData = try jsonEncoder.encode(command)
 			if let messageJson = String(data: messageData, encoding: .utf8) {
-				print("Send message: \(messageJson)")
 				ausweisapp2_send(messageJson)
 			}
 		} catch {

diff --git a/card/core/AusweisApp2/protocol/Messages.swift b/card/core/AusweisApp2/protocol/Messages.swift
@@ -37,6 +37,7 @@ struct AA2Message: Decodable {
 	let description: AA2Description?
 	let url: String?
 	let success: Bool?
+	let reason: String?
 	let reader: AA2Reader?
 	let readers: [AA2Reader]?
 	let name: String?
@@ -56,6 +57,7 @@ struct AA2Message: Decodable {
 		case msg, error, card, result, chat, aux, transactionInfo, validity
 		case description, url, success, reader, workflow, progress, state
 		case name, insertable, attached, keypad, readers, available, current
+		case reason
 	}
 }
 

diff --git a/card/core/WorkflowCallbacks.swift b/card/core/WorkflowCallbacks.swift
@@ -86,7 +86,7 @@ public protocol WorkflowCallbacks: AnyObject {
 
 	 - Parameter changePinResult: Result of the pin change
 	 */
-	func onChangePinCompleted(changePinResult: ChangePinResult?)
+	func onChangePinCompleted(changePinResult: ChangePinResult)
 
 	/**
 	 A pin change has been started via WorkflowController.startChangePin().

diff --git a/card/core/WorkflowController.swift b/card/core/WorkflowController.swift
@@ -470,7 +470,7 @@ public class WorkflowController {
 
 		case AA2Messages.MsgChangePin:
 			if let success = message.success {
-				let result = ChangePinResult(success: success)
+				let result = ChangePinResult(success: success, reason: message.reason)
 				callback { $0.onChangePinCompleted(changePinResult: result) }
 			} else {
 				callback { $0.onChangePinStarted() }

diff --git a/card/core/WorkflowData.swift b/card/core/WorkflowData.swift
@@ -138,6 +138,9 @@ public struct AuthResult {
 public struct ChangePinResult {
 	// False if an error occured or the PIN change was aborted.
 	public let success: Bool
+
+	/// Unique error code if the PIN change failed.
+	public let reason: String?
 }
 
 /// Information about an authentication.