Skip to content

Commit 8834c47

Browse files
committed
Generate PublicKeyCredentialHints using all three setters
1 parent 89e78ff commit 8834c47

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

webauthn-server-core/src/test/scala/com/yubico/webauthn/data/Generators.scala

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,9 @@ object Generators {
10721072
rp <- arbitrary[RelyingPartyIdentity]
10731073
timeout <- arbitrary[Optional[java.lang.Long]]
10741074
hints <-
1075-
arbitrary[Option[Either[List[String], List[PublicKeyCredentialHint]]]]
1075+
arbitrary[Option[Either[Either[List[String], Array[String]], List[
1076+
PublicKeyCredentialHint
1077+
]]]]
10761078
user <- arbitrary[UserIdentity]
10771079
} yield {
10781080
val b = PublicKeyCredentialCreationOptions
@@ -1088,8 +1090,9 @@ object Generators {
10881090
.timeout(timeout)
10891091

10901092
hints.foreach {
1091-
case Left(h) => b.hints(h.asJava)
1092-
case Right(h) => b.hints(h: _*)
1093+
case Left(Left(h: List[String])) => b.hints(h.asJava)
1094+
case Left(Right(h: Array[String])) => b.hints(h: _*)
1095+
case Right(h: List[PublicKeyCredentialHint]) => b.hints(h: _*)
10931096
}
10941097

10951098
b.build()
@@ -1146,7 +1149,9 @@ object Generators {
11461149
rpId <- arbitrary[Optional[String]]
11471150
timeout <- arbitrary[Optional[java.lang.Long]]
11481151
hints <-
1149-
arbitrary[Option[Either[List[String], List[PublicKeyCredentialHint]]]]
1152+
arbitrary[Option[Either[Either[List[String], Array[String]], List[
1153+
PublicKeyCredentialHint
1154+
]]]]
11501155
userVerification <- arbitrary[UserVerificationRequirement]
11511156
} yield {
11521157
val b = PublicKeyCredentialRequestOptions
@@ -1159,8 +1164,9 @@ object Generators {
11591164
.userVerification(userVerification)
11601165

11611166
hints.foreach {
1162-
case Left(h) => b.hints(h.asJava)
1163-
case Right(h) => b.hints(h: _*)
1167+
case Left(Left(h: List[String])) => b.hints(h.asJava)
1168+
case Left(Right(h: Array[String])) => b.hints(h: _*)
1169+
case Right(h: List[PublicKeyCredentialHint]) => b.hints(h: _*)
11641170
}
11651171

11661172
b.build()

0 commit comments

Comments
 (0)