Rename CredentialRepositoryV2.get{CredentialIds => CredentialDescriptors}ForUserHandle

Author: emlun

webauthn-server-core/src/main/java/com/yubico/webauthn/CredentialRepositoryV1ToV2Adapter.java

@@ -14,7 +14,8 @@ class CredentialRepositoryV1ToV2Adapter
   private final CredentialRepository inner;
 
   @Override
-  public Set<PublicKeyCredentialDescriptor> getCredentialIdsForUserHandle(ByteArray userHandle) {
+  public Set<PublicKeyCredentialDescriptor> getCredentialDescriptorsForUserHandle(
+      ByteArray userHandle) {
     return inner
         .getUsernameForUserHandle(userHandle)
         .map(inner::getCredentialIdsForUsername)

webauthn-server-core/src/main/java/com/yubico/webauthn/CredentialRepositoryV2.java

@@ -55,7 +55,7 @@ public interface CredentialRepositoryV2<C extends CredentialRecord> {
    *     before reaching a mature release.
    */
   @Deprecated
-  Set<PublicKeyCredentialDescriptor> getCredentialIdsForUserHandle(ByteArray userHandle);
+  Set<PublicKeyCredentialDescriptor> getCredentialDescriptorsForUserHandle(ByteArray userHandle);
 
   /**
    * Look up the public key, backup flags and current signature count for the given credential

webauthn-server-core/src/main/java/com/yubico/webauthn/RelyingPartyV2.java

@@ -431,7 +431,7 @@ public PublicKeyCredentialCreationOptions startRegistration(
             .challenge(generateChallenge())
             .pubKeyCredParams(preferredPubkeyParams)
             .excludeCredentials(
-                credentialRepository.getCredentialIdsForUserHandle(
+                credentialRepository.getCredentialDescriptorsForUserHandle(
                     startRegistrationOptions.getUser().getId()))
             .authenticatorSelection(startRegistrationOptions.getAuthenticatorSelection())
             .extensions(
@@ -487,7 +487,7 @@ public AssertionRequest startAssertion(StartAssertionOptions startAssertionOptio
                                         startAssertionOptions
                                             .getUsername()
                                             .flatMap(unr::getUserHandleForUsername)))
-                    .map(credentialRepository::getCredentialIdsForUserHandle)
+                    .map(credentialRepository::getCredentialDescriptorsForUserHandle)
                     .map(ArrayList::new))
             .extensions(
                 startAssertionOptions

webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyV2AssertionSpec.scala

@@ -357,7 +357,7 @@ class RelyingPartyV2AssertionSpec
                   cred3: PublicKeyCredentialDescriptor,
               ) =>
                 val credRepo = new CredentialRepositoryV2[CredentialRecord] {
-                  override def getCredentialIdsForUserHandle(
+                  override def getCredentialDescriptorsForUserHandle(
                       userHandle: ByteArray
                   ): java.util.Set[PublicKeyCredentialDescriptor] =
                     Set(

webauthn-server-core/src/test/scala/com/yubico/webauthn/test/Helpers.scala

@@ -108,7 +108,7 @@ object Helpers {
   object CredentialRepositoryV2 {
     def empty[C <: CredentialRecord] =
       new CredentialRepositoryV2[C] {
-        override def getCredentialIdsForUserHandle(
+        override def getCredentialDescriptorsForUserHandle(
             userHandle: ByteArray
         ): java.util.Set[PublicKeyCredentialDescriptor] = Set.empty.asJava
         override def lookup(
@@ -121,7 +121,7 @@ object Helpers {
       }
     def unimplemented[C <: CredentialRecord] =
       new CredentialRepositoryV2[C] {
-        override def getCredentialIdsForUserHandle(
+        override def getCredentialDescriptorsForUserHandle(
             userHandle: ByteArray
         ): java.util.Set[PublicKeyCredentialDescriptor] = ???
         override def lookup(
@@ -139,11 +139,11 @@ object Helpers {
       var lookupCount = 0
       var credentialIdExistsCount = 0
 
-      override def getCredentialIdsForUserHandle(
+      override def getCredentialDescriptorsForUserHandle(
           userHandle: ByteArray
       ): java.util.Set[PublicKeyCredentialDescriptor] = {
         getCredentialIdsCount += 1
-        inner.getCredentialIdsForUserHandle(userHandle)
+        inner.getCredentialDescriptorsForUserHandle(userHandle)
       }
 
       override def lookup(
@@ -164,7 +164,7 @@ object Helpers {
         users: (UserIdentity, C)*
     ): CredentialRepositoryV2[C] = {
       new CredentialRepositoryV2[C] {
-        override def getCredentialIdsForUserHandle(
+        override def getCredentialDescriptorsForUserHandle(
             userHandle: ByteArray
         ): java.util.Set[PublicKeyCredentialDescriptor] =
           users

webauthn-server-demo/src/main/java/demo/webauthn/InMemoryRegistrationStorage.java

@@ -56,7 +56,8 @@ public class InMemoryRegistrationStorage
   ////////////////////////////////////////////////////////////////////////////////
 
   @Override
-  public Set<PublicKeyCredentialDescriptor> getCredentialIdsForUserHandle(ByteArray userHandle) {
+  public Set<PublicKeyCredentialDescriptor> getCredentialDescriptorsForUserHandle(
+      ByteArray userHandle) {
     return getRegistrationsByUserHandle(userHandle).stream()
         .map(
             registration ->