From f9c8442deb64d60bb9aa27025cf34d6f35e162d0 Mon Sep 17 00:00:00 2001 From: Milton Ch Date: Thu, 28 Mar 2024 23:53:56 -0400 Subject: [PATCH] fix(jans-auth-server): the attachDeviceRegistrationToUser method has been extended to support a new deviceName field Signed-off-by: Milton Ch --- .../fido2/RegistrationPersistenceService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/fido2/RegistrationPersistenceService.java b/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/fido2/RegistrationPersistenceService.java index bd03d565021..14b3a922dde 100644 --- a/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/fido2/RegistrationPersistenceService.java +++ b/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/fido2/RegistrationPersistenceService.java @@ -137,34 +137,39 @@ public List findByRpRegisteredUserDevices(String userNam public boolean attachDeviceRegistrationToUser(String userInum, String deviceDn) { + return attachDeviceRegistrationToUser(userInum, deviceDn, null); + } + + public boolean attachDeviceRegistrationToUser(String userInum, String deviceDn, String deviceName) { Fido2RegistrationEntry registrationEntry = persistenceEntryManager.find(Fido2RegistrationEntry.class, deviceDn); if (registrationEntry == null) { return false; } - + User user = userService.getUserByInum(userInum, "uid"); if (user == null) { return false; } - + persistenceEntryManager.remove(deviceDn, Fido2RegistrationEntry.class); - + final String id = UUID.randomUUID().toString(); String userAttestationDn = getDnForRegistrationEntry(userInum, id); registrationEntry.setId(id); registrationEntry.setDn(userAttestationDn); registrationEntry.setUserInum(userInum); + registrationEntry.setDisplayName(deviceName); - Fido2RegistrationData registrationData = registrationEntry.getRegistrationData(); + Fido2RegistrationData registrationData = registrationEntry.getRegistrationData(); registrationData.setUsername(user.getUserId()); registrationEntry.clearExpiration(); - + save(registrationEntry); return true; } - + public Fido2RegistrationEntry findOneStepUserDeviceRegistration(String deviceDn) { Fido2RegistrationEntry registrationEntry = persistenceEntryManager.find(Fido2RegistrationEntry.class, deviceDn);