From 9998333bc39d4b1808c15517fcbf8733f2ddf4c8 Mon Sep 17 00:00:00 2001
From: Jakub Wojnowski <29680262+jwojnowski@users.noreply.github.com>
Date: Wed, 29 Nov 2023 11:43:25 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=20Deprecate=20not=20needed=20IdTok?=
 =?UTF-8?q?enVerifierMock=20Traverse=20requirements.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oidc4s/testkit/IdTokenVerifierMock.scala  | 44 ++++++++++++++++---
 .../testkit/IdTokenVerifierMockTest.scala     |  1 -
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/testkit/src/main/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMock.scala b/testkit/src/main/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMock.scala
index 9ed4806..2af069b 100644
--- a/testkit/src/main/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMock.scala
+++ b/testkit/src/main/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMock.scala
@@ -86,24 +86,42 @@ object IdTokenVerifierMock {
 
   }
 
+  @deprecated("Use version with explicit client ID")
   def constSubject[F[_]: Applicative: Traverse: Clock](subject: IdTokenClaims.Subject): IdTokenVerifier[F] =
-    constSubjectEither[F](Right(subject))
+    constSubject[F](subject, ClientId("https://example.com"))
 
-  def constSubjectEither[F[_]: Applicative: Traverse: Clock](errorOrSubject: Either[IdTokenVerifier.Error, IdTokenClaims.Subject])
+  def constSubject[F[_]: Applicative: Clock](subject: IdTokenClaims.Subject, clientId: ClientId = ClientId("https://example.com"))
     : IdTokenVerifier[F] =
-    constSubjectPF[F]((_: String) => errorOrSubject)
+    constSubjectEither[F](Right(subject), clientId)
+
+  @deprecated("Use version with explicit client ID")
+  def constSubjectEither[F[_]: Applicative: Traverse: Clock](errorOrSubject: Either[IdTokenVerifier.Error, IdTokenClaims.Subject])
+    : IdTokenVerifier[F] = constSubjectEither[F](errorOrSubject, ClientId("https://example.com"))
 
+  def constSubjectEither[F[_]: Applicative: Clock](
+    errorOrSubject: Either[IdTokenVerifier.Error, IdTokenClaims.Subject],
+    clientId: ClientId = ClientId("https://example.com")
+  ): IdTokenVerifier[F] =
+    constSubjectPF[F]((_: String) => errorOrSubject, clientId)
+
+  @deprecated("Use version with explicit client ID")
   def constSubjectPF[F[_]: Applicative: Traverse: Clock](
     rawTokenToSubjectPF: PartialFunction[String, Either[IdTokenVerifier.Error, IdTokenClaims.Subject]]
   ): IdTokenVerifier[F] =
-    constStandardClaimsEitherPF(
+    constSubjectPF[F](rawTokenToSubjectPF, ClientId("https://example.com"))
+
+  def constSubjectPF[F[_]: Applicative: Clock](
+    rawTokenToSubjectPF: PartialFunction[String, Either[IdTokenVerifier.Error, IdTokenClaims.Subject]],
+    clientId: ClientId = ClientId("https://example.com")
+  ): IdTokenVerifier[F] =
+    constClaimsEitherPF(
       rawTokenToSubjectPF.map { errorOrSubject =>
         Applicative[F].map(Clock[F].realTimeInstant) { now =>
           errorOrSubject.map(subject =>
             IdTokenClaims(
               Issuer("https://example.com"),
               subject,
-              NonEmptySet.of(Audience("https://example.com")),
+              NonEmptySet.of(Audience(clientId.value)),
               expiration = now.plusSeconds(600),
               issuedAt = now
             )
@@ -112,14 +130,26 @@ object IdTokenVerifierMock {
       }
     )
 
-  def constStandardClaims[F[_]: Applicative: Traverse](claims: IdTokenClaims): IdTokenVerifier[F] = constStandardClaimsEither(Right(claims))
+  @deprecated("Use constClaims", "0.12.2")
+  def constStandardClaims[F[_]: Applicative: Traverse](claims: IdTokenClaims): IdTokenVerifier[F] = constClaims(claims)
 
+  @deprecated("Use constClaimsEither", "0.12.2")
   def constStandardClaimsEither[F[_]: Applicative: Traverse](claimsEither: Either[IdTokenVerifier.Error, IdTokenClaims])
     : IdTokenVerifier[F] =
-    constStandardClaimsEitherPF[F](_ => claimsEither.pure[F])
+    constClaimsEither(claimsEither)
 
+  @deprecated("Use constClaimsEitherPF", "0.12.2")
   def constStandardClaimsEitherPF[F[_]: Applicative: Traverse](
     rawTokenToClaimsPF: PartialFunction[String, F[Either[IdTokenVerifier.Error, IdTokenClaims]]]
+  ): IdTokenVerifier[F] = constClaimsEitherPF(rawTokenToClaimsPF)
+
+  def constClaims[F[_]: Applicative](claims: IdTokenClaims): IdTokenVerifier[F] = constClaimsEither(Right(claims))
+
+  def constClaimsEither[F[_]: Applicative](claimsEither: Either[IdTokenVerifier.Error, IdTokenClaims]): IdTokenVerifier[F] =
+    constClaimsEitherPF[F](_ => claimsEither.pure[F])
+
+  def constClaimsEitherPF[F[_]: Applicative](
+    rawTokenToClaimsPF: PartialFunction[String, F[Either[IdTokenVerifier.Error, IdTokenClaims]]]
   ): IdTokenVerifier[F] = new IdTokenVerifier[F] {
 
     override def verifyAndDecode(rawToken: String): F[Either[IdTokenVerifier.Error, IdTokenClaims]] =
diff --git a/testkit/src/test/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMockTest.scala b/testkit/src/test/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMockTest.scala
index 5c4e97c..f554bcc 100644
--- a/testkit/src/test/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMockTest.scala
+++ b/testkit/src/test/scala/me/wojnowski/oidc4s/testkit/IdTokenVerifierMockTest.scala
@@ -14,7 +14,6 @@ import munit.FunSuite
 import java.time.Instant
 import CirceJsonSupport._
 import cats.data.NonEmptySet
-import cats.data.NonEmptySetImpl
 import cats.effect.Clock
 import me.wojnowski.oidc4s.IdTokenClaims.Audience
 import me.wojnowski.oidc4s.IdTokenClaims.Subject