Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rqes module #147

Open
wants to merge 4 commits into
base: feature/signatureServices
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dif-data-classes/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ kotlin {
dependencies {
implementation(project.napier())
implementation(project.ktor("http"))
api(project(":rqes-data-classes"))
api("com.benasher44:uuid:${VcLibVersions.uuid}")
api("at.asitplus.signum:indispensable-cosef:${VcLibVersions.signum}")
api("at.asitplus.signum:indispensable-josef:${VcLibVersions.signum}")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package at.asitplus.dif

import com.benasher44.uuid.uuid4
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

/**
* Data class for
* [DIF Presentation Exchange v2.1.1](https://identity.foundation/presentation-exchange/spec/v2.1.1/#term:presentation-definition)
*/
@Serializable
data class DifInputDescriptor(
@SerialName("id")
override val id: String,
@SerialName("group")
override val group: String? = null,
@SerialName("name")
override val name: String? = null,
@SerialName("purpose")
override val purpose: String? = null,
@SerialName("format")
override val format: FormatHolder? = null,
@SerialName("constraints")
override val constraints: Constraint? = null,
) : InputDescriptorInterface() {
constructor(name: String, constraints: Constraint? = null) : this(
id = uuid4().toString(),
name = name,
constraints = constraints,
)
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package at.asitplus.dif

import kotlinx.serialization.Serializable

@Serializable(with = InputDescriptorSerializer::class)
sealed class InputDescriptorInterface {
abstract val id: String
abstract val group: String?
abstract val name: String?
abstract val purpose: String?
abstract val format: FormatHolder?
abstract val constraints: Constraint?
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import kotlinx.serialization.json.JsonContentPolymorphicSerializer
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.jsonObject


object InputDescriptorSerializer : JsonContentPolymorphicSerializer<InputDescriptor>(InputDescriptor::class) {
object InputDescriptorSerializer : JsonContentPolymorphicSerializer<InputDescriptorInterface>(InputDescriptorInterface::class) {
override fun selectDeserializer(element: JsonElement) = when {
"transaction_data" in element.jsonObject -> QesInputDescriptor.serializer()
else -> DifInputDescriptor.serializer()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ data class PresentationDefinition(
@SerialName("purpose")
val purpose: String? = null,
@SerialName("input_descriptors")
val inputDescriptors: Collection<InputDescriptor>,
val inputDescriptors: Collection<InputDescriptorInterface>,
@Deprecated(message = "Removed in DIF Presentation Exchange 2.0.0", ReplaceWith("inputDescriptors.format"))
@SerialName("format")
val formats: FormatHolder? = null,
Expand All @@ -28,7 +28,7 @@ data class PresentationDefinition(
) {
@Deprecated(message = "Removed in DIF Presentation Exchange 2.0.0")
constructor(
inputDescriptors: Collection<InputDescriptor>,
inputDescriptors: Collection<InputDescriptorInterface>,
formats: FormatHolder
) : this(id = uuid4().toString(), inputDescriptors = inputDescriptors, formats = formats)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package at.asitplus.dif

import at.asitplus.rqes.collection_entries.TransactionData
import at.asitplus.rqes.serializers.Base64URLTransactionDataSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class QesInputDescriptor(
@SerialName("id")
override val id: String,
@SerialName("group")
override val group: String? = null,
@SerialName("name")
override val name: String? = null,
@SerialName("purpose")
override val purpose: String? = null,
@SerialName("format")
override val format: FormatHolder? = null,
@SerialName("constraints")
override val constraints: Constraint? = null,
@SerialName("transaction_data")
val transactionData: List<@Serializable(Base64URLTransactionDataSerializer::class) TransactionData>,
) : InputDescriptorInterface()
2 changes: 2 additions & 0 deletions openid-data-classes/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ kotlin {
commonMain {
dependencies {
api(project(":dif-data-classes"))
api(project(":rqes-data-classes"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't seem to be really needed

implementation(project.ktor("http"))
implementation(project.napier())
api(serialization("json"))
api(serialization("cbor"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package at.asitplus.wallet.lib.oidc
package at.asitplus.openid


import at.asitplus.catching
import at.asitplus.dif.rqes.serializers.UrlSerializer
import at.asitplus.openid.AuthenticationRequestParameters
import at.asitplus.openid.JwsSignedSerializer
import at.asitplus.rqes.serializers.UrlSerializer
import io.ktor.http.*
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.encodeToString


@Serializable
sealed class AuthenticationRequestParametersFrom : RequestParametersFrom {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package at.asitplus.openid

import at.asitplus.KmmResult.Companion.wrap
import at.asitplus.dif.PresentationDefinition
import at.asitplus.dif.rqes.enums.SignatureQualifierEnum
import at.asitplus.dif.rqes.serializers.HashesSerializer
import at.asitplus.rqes.enums.SignatureQualifierEnum
import at.asitplus.rqes.serializers.HashesSerializer
import at.asitplus.signum.indispensable.asn1.ObjectIdentifier
import at.asitplus.signum.indispensable.io.ByteArrayBase64UrlSerializer
import at.asitplus.signum.indispensable.josef.JsonWebToken
Expand Down Expand Up @@ -339,7 +339,7 @@ data class AuthenticationRequestParameters(
*/
@SerialName("clientData")
val clientData: String? = null,
): RequestParameters {
) : RequestParameters {

override fun equals(other: Any?): Boolean {
if (this === other) return true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package at.asitplus.openid

import at.asitplus.dif.rqes.collection_entries.DocumentDigestEntries.OAuthDocumentDigest
import at.asitplus.dif.rqes.collection_entries.DocumentLocation
import at.asitplus.dif.rqes.enums.SignatureQualifierEnum
import at.asitplus.rqes.collection_entries.DocumentLocation
import at.asitplus.rqes.collection_entries.OAuthDocumentDigest
import at.asitplus.rqes.enums.SignatureQualifierEnum
import at.asitplus.signum.indispensable.asn1.ObjectIdSerializer
import at.asitplus.signum.indispensable.asn1.ObjectIdentifier
import kotlinx.serialization.SerialName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package at.asitplus.wallet.lib.oidc
package at.asitplus.openid

import at.asitplus.openid.RequestParameters
import at.asitplus.openid.RequestParametersSerializer
import kotlinx.serialization.Serializable

@Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package at.asitplus.wallet.lib.oidc
package at.asitplus.openid

import at.asitplus.catching
import at.asitplus.dif.rqes.serializers.UrlSerializer
import at.asitplus.openid.JwsSignedSerializer
import at.asitplus.openid.SignatureRequestParameters
import at.asitplus.rqes.serializers.UrlSerializer
import io.ktor.http.*
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package at.asitplus.openid

import at.asitplus.dif.rqes.collection_entries.DocumentDigestEntries.CscDocumentDigest
import at.asitplus.dif.rqes.collection_entries.DocumentDigestEntries.OAuthDocumentDigest
import at.asitplus.dif.rqes.collection_entries.DocumentLocation
import at.asitplus.dif.rqes.enums.ConformanceLevelEnum
import at.asitplus.dif.rqes.enums.SignatureFormat
import at.asitplus.dif.rqes.enums.SignatureQualifierEnum
import at.asitplus.dif.rqes.enums.SignedEnvelopeProperty
import at.asitplus.dif.rqes.getHashAlgorithm
import at.asitplus.rqes.collection_entries.CscDocumentDigest
import at.asitplus.rqes.collection_entries.DocumentLocation
import at.asitplus.rqes.collection_entries.OAuthDocumentDigest
import at.asitplus.rqes.enums.ConformanceLevelEnum
import at.asitplus.rqes.enums.SignatureFormat
import at.asitplus.rqes.enums.SignatureQualifierEnum
import at.asitplus.rqes.enums.SignedEnvelopeProperty
import at.asitplus.rqes.getHashAlgorithm
import at.asitplus.signum.indispensable.Digest
import at.asitplus.signum.indispensable.X509SignatureAlgorithm
import at.asitplus.signum.indispensable.asn1.Asn1Element
Expand Down
Loading
Loading