feat: user filter to search user's devices for specifc domain

JanssenProject · Jan 21, 2023 · 7c1d641 · 7c1d641
1 parent 5e49be9
commit 7c1d641
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java
@@ -285,9 +285,8 @@ private Pair<ArrayNode, String> prepareAllowedCredentials(String documentDomain,
 			deviceRegistrationService.migrateToFido2(existingFidoRegistrations, documentDomain, username);
 		}
 
-		List<Fido2RegistrationEntry> existingFido2Registrations = registrationPersistenceService.findAllRegisteredByUsername(username);
+		List<Fido2RegistrationEntry> existingFido2Registrations = registrationPersistenceService.findByRpRegisteredUserDevices(username, documentDomain);
 		List<Fido2RegistrationEntry> allowedFido2Registrations = existingFido2Registrations.parallelStream()
-				.filter(f -> StringHelper.equals(documentDomain, f.getRegistrationData().getDomain()))
 				.filter(f -> StringHelper.isNotEmpty(f.getRegistrationData().getPublicKeyId())).collect(Collectors.toList());
 
 		//  f.getRegistrationData().getAttenstationRequest() null check is added to maintain backward compatiblity with U2F devices when U2F devices are migrated to the FIDO2 server

diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AttestationService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AttestationService.java
@@ -403,12 +403,11 @@ private ObjectNode createUserCredentials(String userId, String username, String
 
 	private ArrayNode prepareExcludeCredentials(String documentDomain, String username) {
 		List<Fido2RegistrationEntry> existingRegistrations = registrationPersistenceService
-				.findAllRegisteredByUsername(username);
+				.findByRpRegisteredUserDevices(username, documentDomain);
 		List<JsonNode> excludedKeys = existingRegistrations.parallelStream()
-				.filter(f -> StringHelper.equals(documentDomain, f.getRegistrationData().getDomain()))
 				.filter(f -> StringHelper.isNotEmpty(f.getRegistrationData().getPublicKeyId()))
 				.map(f -> dataMapperService.convertValue(new PublicKeyCredentialDescriptor(
-						f.getRegistrationData().getType(), new String[] { "usb", "ble", "nfc", "internal" },
+						f.getRegistrationData().getType(), new String[] { "usb", "ble", "nfc", "internal", "net", "qr" },
 						f.getRegistrationData().getPublicKeyId()), JsonNode.class))
 				.collect(Collectors.toList());