Remove asyncMap

Author: jdmoreira

FullStackTests/Tests/OATHFullStackTests.swift

@@ -56,19 +56,21 @@ class OATHFullStackTests: XCTestCase {
     func testCalculateAllCodes() throws {
         runOATHTest { session in
             let result = try await session.calculateCodes(timestamp: Date(timeIntervalSince1970: 0))
-            let codes = try await result.asyncMap { result in
-                if let code = result.1 {
-                    return code
-                }
-                let credential = result.0
-                if credential.requiresTouch {
-                    print("👆 Touch the YubiKey!")
+            var codes: [OATHSession.Code] = []
+            for pair in result {
+                if let code = pair.1 {
+                    codes.append(code)
+                } else {
+                    let credential = pair.0
+                    if credential.requiresTouch {
+                        print("👆 Touch the YubiKey!")
+                    }
+                    let code = try await session.calculateCode(
+                        credential: credential,
+                        timestamp: Date(timeIntervalSince1970: 0)
+                    )
+                    codes.append(code)
                 }
-                let code = try await session.calculateCode(
-                    credential: credential,
-                    timestamp: Date(timeIntervalSince1970: 0)
-                )
-                return code
             }
             XCTAssert(codes.count == 5)
             XCTAssert(codes[0].code == "659165")

YubiKit/YubiKit/OATH/OATHSession.swift

@@ -317,7 +317,8 @@ public final actor OATHSession: Session {
             throw OATHSessionError.responseDataNotTLVFormatted
         }
 
-        return try await result.asyncMap { (name, response) in
+        var credentialCodePairs: [(Credential, Code?)] = []
+        for (name, response) in result {
             guard name.tag == 0x71 else { throw OATHSessionError.unexpectedTag }
 
             guard let credentialId = CredentialIdParser(data: name.value) else { throw OATHSessionError.unexpectedData }
@@ -343,17 +344,20 @@ public final actor OATHSession: Session {
             if response.value.count == 5 {
                 if credentialId.period != oathDefaultPeriod {
                     let code = try await self.calculateCode(credential: credential, timestamp: timestamp)
-                    return (credential, code)
+                    credentialCodePairs.append((credential, code))
                 } else {
                     let digits = response.value.first!
                     let code = UInt32(bigEndian: response.value.subdata(in: 1..<response.value.count).uint32)
                     let stringCode = String(format: "%0\(digits)d", UInt(code))
-                    return (credential, Code(code: stringCode, timestamp: timestamp, credentialType: credentialType))
+                    credentialCodePairs.append(
+                        (credential, Code(code: stringCode, timestamp: timestamp, credentialType: credentialType))
+                    )
                 }
             } else {
-                return (credential, nil)
+                credentialCodePairs.append((credential, nil))
             }
         }
+        return credentialCodePairs
     }
 
     /// Sets an Access Key derived from a password. Once a key is set, any usage of the credentials stored will