Make functions more readable

Author: oskardanielsson-yubico

Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsBeginResponse.cs

@@ -72,13 +72,16 @@ public EnumerateRpsBeginResponse(ResponseApdu responseApdu)
         {
             var credentialManagementData = _response.GetData();
 
-            if (credentialManagementData.RelyingParty is not null &&
+            bool conditionsMet = 
+                credentialManagementData.RelyingParty is not null &&
                 credentialManagementData.RelyingPartyIdHash is not null &&
                 credentialManagementData.TotalRelyingPartyCount is not null &&
-                credentialManagementData.RelyingParty.IsMatchingRelyingPartyId(credentialManagementData.RelyingPartyIdHash.Value))
+                credentialManagementData.RelyingParty.IsMatchingRelyingPartyId(credentialManagementData.RelyingPartyIdHash.Value);
+
+            if (conditionsMet)
             {
                 return (credentialManagementData.TotalRelyingPartyCount.Value, credentialManagementData.RelyingParty);
-            }   
+            }  
 
             throw new Ctap2DataException(ExceptionMessages.InvalidFido2Info);
         }

Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsGetNextResponse.cs

@@ -43,9 +43,13 @@ public EnumerateRpsGetNextResponse(ResponseApdu responseApdu)
         public RelyingParty GetData()
         {
             var credentialManagementData = _response.GetData();
-            if (credentialManagementData.RelyingParty is not null &&
+
+            bool conditionsMet = 
+                credentialManagementData.RelyingParty is not null &&
                 credentialManagementData.RelyingPartyIdHash is not null &&
-                credentialManagementData.RelyingParty.IsMatchingRelyingPartyId(credentialManagementData.RelyingPartyIdHash.Value))
+                credentialManagementData.RelyingParty.IsMatchingRelyingPartyId(credentialManagementData.RelyingPartyIdHash.Value);
+
+            if (conditionsMet)
             {
                 return credentialManagementData.RelyingParty;
             }