Skip to content

Commit

Permalink
Removed
Browse files Browse the repository at this point in the history
  • Loading branch information
@babisRoutis
babisRoutis committed Nov 18, 2024
1 parent 91156b7 commit 7c13f60
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 61 deletions.
1 change: 0 additions & 1 deletion src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/jose/EncryptResponseWithNimbus.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ class EncryptCredentialResponseNimbus(
credentialOrCredentials(plain.credential, plain.credentials)
transactionId?.let { claim("transaction_id", it) }
claim("c_nonce", nonce)
claim("c_nonce_expires_in", nonceExpiresIn)
notificationId?.let { claim("notification_id", it) }
}
}
Expand Down
59 changes: 17 additions & 42 deletions src/main/kotlin/eu/europa/ec/eudi/pidissuer/port/input/IssueCredential.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ enum class CredentialErrorTypeTo {
@SerialName("invalid_request")
INVALID_REQUEST,

@SerialName("invalid_token")
INVALID_TOKEN,

@SerialName("unsupported_credential_type")
UNSUPPORTED_CREDENTIAL_TYPE,

Expand Down Expand Up @@ -201,7 +198,6 @@ sealed interface IssueCredentialResponse {
val credentials: JsonArray? = null,
@SerialName("transaction_id") val transactionId: String? = null,
@SerialName("c_nonce") val nonce: String? = null,
@SerialName("c_nonce_expires_in") val nonceExpiresIn: Long? = null,
@SerialName("notification_id") val notificationId: String? = null,
) : IssueCredentialResponse {
init {
Expand Down Expand Up @@ -237,12 +233,10 @@ sealed interface IssueCredentialResponse {
fun single(
credential: JsonElement,
nonce: String,
nonceExpiresIn: Long,
notificationId: String? = null,
): PlainTO = PlainTO(
credential = credential,
nonce = nonce,
nonceExpiresIn = nonceExpiresIn,
notificationId = notificationId,
)

Expand All @@ -252,27 +246,16 @@ sealed interface IssueCredentialResponse {
fun multiple(
credentials: JsonArray,
nonce: String,
nonceExpiresIn: Long,
notificationId: String? = null,
): PlainTO = PlainTO(
credentials = credentials,
nonce = nonce,
nonceExpiresIn = nonceExpiresIn,
notificationId = notificationId,
)
): PlainTO = PlainTO(credentials = credentials, nonce = nonce, notificationId = notificationId)

/**
* Credential issuance has been deferred.
*/
fun deferred(
transactionId: String,
nonce: String,
nonceExpiresIn: Long,
): PlainTO = PlainTO(
transactionId = transactionId,
nonce = nonce,
nonceExpiresIn = nonceExpiresIn,
)
): PlainTO = PlainTO(transactionId = transactionId, nonce = nonce)
}
}

Expand All @@ -291,7 +274,7 @@ sealed interface IssueCredentialResponse {
@SerialName("error") @Required val type: CredentialErrorTypeTo,
@SerialName("error_description") val errorDescription: String? = null,
@SerialName("c_nonce") val nonce: String? = null,
@SerialName("c_nonce_expires_in") val nonceExpiresIn: Long? = null,

) : IssueCredentialResponse
}

Expand All @@ -305,7 +288,7 @@ class IssueCredential(
private val credentialIssuerMetadata: CredentialIssuerMetaData,
private val resolveCredentialRequestByCredentialIdentifier: ResolveCredentialRequestByCredentialIdentifier,
private val generateCNonce: GenerateCNonce,
private val cnonceExpiresIn: Duration = Duration.ofMinutes(5L),
private val cNonceDuration: Duration = Duration.ofMinutes(5L),
private val encryptCredentialResponse: EncryptCredentialResponse,
) {

Expand Down Expand Up @@ -380,8 +363,8 @@ class IssueCredential(
request: CredentialRequest,
credential: CredentialResponse,
): IssueCredentialResponse {
val newCNonce = generateCNonce(clock.instant(), cnonceExpiresIn)
val plain = credential.toTO(newCNonce, cnonceExpiresIn)
val newCNonce = generateCNonce(clock.instant(), cNonceDuration)
val plain = credential.toTO(newCNonce)
return when (val encryption = request.credentialResponseEncryption) {
RequestedResponseEncryption.NotRequired -> plain
is RequestedResponseEncryption.Required -> encryptCredentialResponse(plain, encryption).getOrThrow()
Expand All @@ -392,8 +375,8 @@ class IssueCredential(
error: IssueCredentialError,
): IssueCredentialResponse {
log.warn("Issuance failed: $error")
val newCNonce = generateCNonce(clock.instant(), cnonceExpiresIn)
return error.toTO(newCNonce, cnonceExpiresIn)
val newCNonce = generateCNonce(clock.instant(), cNonceDuration)
return error.toTO(newCNonce)
}
}
//
Expand Down Expand Up @@ -446,7 +429,7 @@ private fun CredentialRequestTO.toDomain(
proof == null && proofs != null -> {
val jwtProofs = proofs.jwtProofs?.map { UnvalidatedProof.Jwt(it) }
val ldpVpProofs = proofs.ldpVpProofs?.map { UnvalidatedProof.LdpVp(it) }
// proofs object contains exactly one parameter named as the proof type
// Proof object contains exactly one parameter named as the proof type
ensure(jwtProofs == null || ldpVpProofs == null) {
InvalidProof("Only a single proof type is allowed")
}
Expand Down Expand Up @@ -608,20 +591,18 @@ private fun CredentialResponseEncryptionTO.toDomain(): RequestedResponseEncrypti
method,
).getOrElse { raise(InvalidEncryptionParameters(it)) }

fun CredentialResponse.toTO(cnonce: String, cnonceExpiresIn: Duration): IssueCredentialResponse.PlainTO = when (this) {
fun CredentialResponse.toTO(cNonce: String): IssueCredentialResponse.PlainTO = when (this) {
is CredentialResponse.Issued -> {
when (credentials.size) {
1 -> IssueCredentialResponse.PlainTO.single(
credential = credentials.head,
nonce = cnonce,
nonceExpiresIn = cnonceExpiresIn.toSeconds(),
nonce = cNonce,
notificationId = notificationId?.value,
)

else -> IssueCredentialResponse.PlainTO.multiple(
credentials = JsonArray(credentials),
nonce = cnonce,
nonceExpiresIn = cnonceExpiresIn.toSeconds(),
nonce = cNonce,
notificationId = notificationId?.value,
)
}
Expand All @@ -630,15 +611,14 @@ fun CredentialResponse.toTO(cnonce: String, cnonceExpiresIn: Duration): IssueCre
is CredentialResponse.Deferred ->
IssueCredentialResponse.PlainTO.deferred(
transactionId = transactionId.value,
nonce = cnonce,
nonceExpiresIn = cnonceExpiresIn.toSeconds(),
nonce = cNonce,
)
}

/**
* Creates a new [IssueCredentialResponse.FailedTO] from the provided [error] and [nonce].
* Creates a new [IssueCredentialResponse.FailedTO] from the provided [error] and [cNonce].
*/
private fun IssueCredentialError.toTO(cnonce: String, cnonceExpiresIn: Duration): IssueCredentialResponse.FailedTO {
private fun IssueCredentialError.toTO(cNonce: String): IssueCredentialResponse.FailedTO {
val (type, description) = when (this) {
is UnsupportedCredentialFormat ->
CredentialErrorTypeTo.UNSUPPORTED_CREDENTIAL_FORMAT to "Unsupported '${format?.value}'"
Expand All @@ -650,7 +630,7 @@ private fun IssueCredentialError.toTO(cnonce: String, cnonceExpiresIn: Duration)
CredentialErrorTypeTo.INVALID_PROOF to "The Credential Request must include Proof of Possession"

is InvalidProof ->
(CredentialErrorTypeTo.INVALID_PROOF to msg).also { println(this@toTO.cause) }
(CredentialErrorTypeTo.INVALID_PROOF to msg)

is InvalidEncryptionParameters ->
CredentialErrorTypeTo.INVALID_ENCRYPTION_PARAMETERS to "Invalid Credential Response Encryption Parameters"
Expand All @@ -677,10 +657,5 @@ private fun IssueCredentialError.toTO(cnonce: String, cnonceExpiresIn: Duration)
is InvalidClaims ->
CredentialErrorTypeTo.INVALID_REQUEST to "'claims' does not have the expected structure${error.message?.let { " : $it" } ?: ""}"
}
return IssueCredentialResponse.FailedTO(
type,
description,
cnonce,
cnonceExpiresIn.toSeconds(),
)
return IssueCredentialResponse.FailedTO(type, description, cNonce)
}
14 changes: 0 additions & 14 deletions src/test/kotlin/eu/europa/ec/eudi/pidissuer/adapter/input/web/WalletApiTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals(CredentialErrorTypeTo.INVALID_PROOF, error.type)
assertEquals("The Credential Request must include Proof of Possession", error.errorDescription)
assertNotNull(error.nonce)
assertNotNull(error.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -279,7 +278,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals(CredentialErrorTypeTo.INVALID_REQUEST, error.type)
assertEquals("Wrong scope. Expecting $PidMsoMdocScope", error.errorDescription)
assertNotNull(error.nonce)
assertNotNull(error.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -315,7 +313,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals("Only one of `proof` or `proofs` is allowed", response.errorDescription)
val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

@Test
Expand All @@ -340,7 +337,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals(CredentialErrorTypeTo.INVALID_PROOF, response.type)
assertEquals("Only a single proof type is allowed", response.errorDescription)
assertNotNull(response.nonce)
assertNotNull(response.nonceExpiresIn)
}

@Test
Expand Down Expand Up @@ -372,7 +368,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals("You can provide at most '3' proofs", response.errorDescription)
val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

@Test
Expand Down Expand Up @@ -402,7 +397,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertEquals(CredentialErrorTypeTo.INVALID_PROOF, response.type)
assertEquals("CNonce is not valid", response.errorDescription)
assertNotNull(response.nonce)
assertNotNull(response.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -441,7 +435,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -487,7 +480,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -525,7 +517,6 @@ internal class WalletApiEncryptionOptionalTest : BaseWalletApiTest() {
assertNull(response.transactionId)
val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}
}

Expand Down Expand Up @@ -576,7 +567,6 @@ internal class WalletApiEncryptionRequiredTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -627,7 +617,6 @@ internal class WalletApiEncryptionRequiredTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(claims.getStringClaim("c_nonce"))
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(claims.getLongClaim("c_nonce_expires_in"))
}

/**
Expand Down Expand Up @@ -685,7 +674,6 @@ internal class WalletApiEncryptionRequiredTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(claims.getStringClaim("c_nonce"))
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(claims.getLongClaim("c_nonce_expires_in"))
}

/**
Expand Down Expand Up @@ -723,7 +711,6 @@ internal class WalletApiEncryptionRequiredTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(response.nonce)
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(response.nonceExpiresIn)
}

/**
Expand Down Expand Up @@ -779,7 +766,6 @@ internal class WalletApiEncryptionRequiredTest : BaseWalletApiTest() {

val newCNonce = assertNotNull(claims.getStringClaim("c_nonce"))
assertNotEquals(previousCNonce, newCNonce)
assertNotNull(claims.getLongClaim("c_nonce_expires_in"))
}
}

Expand Down
4 changes: 0 additions & 4 deletions ...n/eu/europa/ec/eudi/pidissuer/adapter/out/jose/EncryptCredentialResponseWithNimbusTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonPrimitive
import java.time.Clock
import java.time.Duration
import java.util.*
import kotlin.test.Test
import kotlin.test.assertEquals
Expand All @@ -63,7 +62,6 @@ internal class EncryptCredentialResponseWithNimbusTest {
credentials = null,
transactionId = null,
nonce = "nonce",
Duration.ofMinutes(5L).seconds,
UUID.randomUUID().toString(),
)

Expand All @@ -83,7 +81,6 @@ internal class EncryptCredentialResponseWithNimbusTest {
credentials = null,
transactionId = null,
nonce = "nonce",
Duration.ofMinutes(5L).seconds,
UUID.randomUUID().toString(),
)

Expand All @@ -110,7 +107,6 @@ internal class EncryptCredentialResponseWithNimbusTest {
.apply {
unencrypted.transactionId?.let { claim("transaction_id", it) }
unencrypted.nonce?.let { claim("c_nonce", it) }
unencrypted.nonceExpiresIn?.let { claim("c_nonce_expires_in", it) }
unencrypted.notificationId?.let { claim("notification_id", it) }
}
.build(),
Expand Down

0 comments on commit 7c13f60

Please sign in to comment.