Skip to content

Commit

Permalink
Merge branch 'main' into fix/tmp_fix_license_in_apollo
Browse files Browse the repository at this point in the history
  • Loading branch information
@FabioPinheiro
FabioPinheiro authored Sep 2, 2024
2 parents 7b5ef57 + 5a7b950 commit 7a0e6e3
Show file tree
Hide file tree
Showing 34 changed files with 372 additions and 191 deletions.
7 changes: 5 additions & 2 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ inThisBuild(
Seq(
organization := "org.hyperledger",
scalaVersion := "3.3.3",
licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
fork := true,
run / connectInput := true,
releaseUseGlobalVersion := false,
Expand Down Expand Up @@ -69,7 +70,7 @@ lazy val V = new {
val testContainersJavaKeycloak = "3.2.0" // scala-steward:off

val doobie = "1.0.0-RC5"
val quill = "4.8.4"
val quill = "4.8.5"
val flyway = "9.22.3"
val postgresDriver = "42.7.3"
val logback = "1.4.14"
Expand Down Expand Up @@ -124,6 +125,7 @@ lazy val D = new {
val jakartaJson: ModuleID = "org.glassfish" % "jakarta.json" % "2.0.1"
val ironVC: ModuleID = "com.apicatalog" % "iron-verifiable-credentials" % "0.14.0"
val scodecBits: ModuleID = "org.scodec" %% "scodec-bits" % "1.1.38"
val jaywayJsonPath: ModuleID = "com.jayway.jsonpath" % "json-path" % "2.9.0"

// https://mvnrepository.com/artifact/org.didcommx/didcomm/0.3.2
val didcommx: ModuleID = "org.didcommx" % "didcomm" % "0.3.2"
Expand Down Expand Up @@ -203,7 +205,8 @@ lazy val D_SharedJson = new {
D.jakartaJson,
D.ironVC,
D.scodecBits,
D.networkntJsonSchemaValidator
D.networkntJsonSchemaValidator,
D.jaywayJsonPath
)
}

Expand Down
3 changes: 1 addition & 2 deletions ...erver/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import org.hyperledger.identus.castor.core.service.DIDService
import org.hyperledger.identus.mercury.{AgentPeerService, DidAgent}
import org.hyperledger.identus.mercury.model.DidId
import org.hyperledger.identus.mercury.protocol.invitation.v2.Invitation
import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
import org.hyperledger.identus.pollux.core.model.error.PresentationError
import org.hyperledger.identus.pollux.core.model.error.{CredentialServiceError, PresentationError}
import org.hyperledger.identus.pollux.core.model.DidCommID
import org.hyperledger.identus.pollux.core.service.CredentialService
import org.hyperledger.identus.pollux.sdjwt.SDJWT.*
Expand Down
33 changes: 7 additions & 26 deletions ...rver/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
InvitationGenerated,
_,
_,
Expand All @@ -124,15 +123,15 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_
) =>
ZIO.unit
case PresentationRecord(_, _, _, _, _, _, _, _, InvitationExpired, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(_, _, _, _, _, _, _, InvitationExpired, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalPending, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, ProposalPending, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, ProposalSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalReceived, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, ProposalReceived, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalRejected, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, ProposalRejected, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.fail(NotImplemented)
case PresentationRecord(
id,
Expand All @@ -142,7 +141,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
RequestPending,
_,
_,
Expand All @@ -168,7 +166,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
RequestPending,
_,
_,
Expand All @@ -194,7 +191,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
RequestSent,
_,
_,
Expand All @@ -220,7 +216,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
RequestReceived,
_,
_,
Expand All @@ -246,7 +241,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
RequestRejected,
_,
_,
Expand All @@ -272,7 +266,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
ProblemReportPending,
_,
_,
Expand All @@ -290,7 +283,7 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_
) =>
ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, ProblemReportSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.fail(NotImplemented)
case PresentationRecord(
id,
Expand All @@ -300,7 +293,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
ProblemReportReceived,
_,
_,
Expand All @@ -326,7 +318,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationPending,
_,
_,
Expand All @@ -353,7 +344,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationPending,
credentialFormat,
_,
Expand Down Expand Up @@ -386,7 +376,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationGenerated,
_,
_,
Expand All @@ -413,7 +402,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationGenerated,
_,
_,
Expand All @@ -433,7 +421,7 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
ZIO.logDebug("PresentationRecord: PresentationGenerated") *> ZIO.unit
Prover.handlePresentationGenerated(id, presentation)

case PresentationRecord(id, _, _, _, _, _, _, _, PresentationSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, PresentationSent, _, _, _, _, _, _, _, _, _, _, _, _, _, _) =>
ZIO.logDebug("PresentationRecord: PresentationSent") *> ZIO.unit
case PresentationRecord(
id,
Expand All @@ -443,7 +431,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationReceived,
_,
_,
Expand All @@ -469,7 +456,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationReceived,
_,
_,
Expand All @@ -495,7 +481,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationReceived,
credentialFormat,
invitation,
Expand Down Expand Up @@ -523,7 +508,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationVerificationFailed,
_,
_,
Expand All @@ -549,7 +533,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationAccepted,
_,
_,
Expand All @@ -575,7 +558,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationVerified,
_,
_,
Expand All @@ -601,7 +583,6 @@ object PresentBackgroundJobs extends BackgroundJobsHelper {
_,
_,
_,
_,
PresentationRejected,
_,
_,
Expand Down
3 changes: 1 addition & 2 deletions .../server/src/main/scala/org/hyperledger/identus/issue/controller/IssueControllerImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ import org.hyperledger.identus.pollux.core.model.CredentialFormat.{AnonCreds, JW
import org.hyperledger.identus.pollux.core.model.IssueCredentialRecord.Role
import org.hyperledger.identus.pollux.core.service.CredentialService
import org.hyperledger.identus.shared.models.{KeyId, WalletAccessContext}
import zio.{URLayer, ZIO, ZLayer}
import zio.Duration
import zio.{Duration, URLayer, ZIO, ZLayer}

import scala.language.implicitConversions
class IssueControllerImpl(
Expand Down
2 changes: 1 addition & 1 deletion .../scala/org/hyperledger/identus/issue/controller/http/IssueCredentialOfferInvitation.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ object IssueCredentialOfferInvitation {
description =
"The invitation message encoded as a URL. This URL follows the Out of [Band 2.0 protocol](https://identity.foundation/didcomm-messaging/spec/v2.0/#out-of-band-messages) and can be used to generate a QR code for example.",
example =
"https://my.domain.com/path?_oob=eyJAaWQiOiIzZmE4NWY2NC01NzE3LTQ1NjItYjNmYy0yYzk2M2Y2NmFmYTYiLCJAdHlwZSI6Imh0dHBzOi8vZGlkY29tbS5vcmcvbXktZmFtaWx5LzEuMC9teS1tZXNzYWdlLXR5cGUiLCJkaWQiOiJXZ1d4cXp0ck5vb0c5MlJYdnhTVFd2IiwiaW1hZ2VVcmwiOiJodHRwOi8vMTkyLjE2OC41Ni4xMDEvaW1nL2xvZ28uanBnIiwibGFiZWwiOiJCb2IiLCJyZWNpcGllbnRLZXlzIjpbIkgzQzJBVnZMTXY2Z21NTmFtM3VWQWpacGZrY0pDd0R3blpuNnozd1htcVBWIl0sInJvdXRpbmdLZXlzIjpbIkgzQzJBVnZMTXY2Z21NTmFtM3VWQWpacGZrY0pDd0R3blpuNnozd1htcVBWIl0sInNlcnZpY2VFbmRwb2ludCI6Imh0dHA6Ly8xOTIuMTY4LjU2LjEwMTo4MDIwIn0="
"https://my.domain.com/path?_oob=eyJpZCI6ImY5NmUzNjk5LTU5MWMtNGFlNy1iNWU2LTZlZmU2ZDI2MjU1YiIsInR5cGUiOiJodHRwczovL2RpZGNvbW0ub3JnL291dC1vZi1iYW5kLzIuMC9pbnZpdGF0aW9uIiwiZnJvbSI6ImRpZDpwZWVyOjIuRXo2TFNmc0tNZTh2U1NXa1lkWkNwbjRZVmlQRVJmZEdBaGRMQUdIZ3gyTEdKd2ZtQS5WejZNa3B3MWtTYWJCTXprQTN2NTl0UUZuaDNGdGtLeTZ4TGhMeGQ5UzZCQW9hQmcyLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW1oMGRIQTZMeTh4T1RJdU1UWTRMakV1TXpjNk9EQTRNQzlrYVdSamIyMXRJaXdpY2lJNlcxMHNJbUVpT2xzaVpHbGtZMjl0YlM5Mk1pSmRmWDAiLCJib2R5Ijp7ImdvYWxfY29kZSI6Imlzc3VlLXZjIiwiZ29hbCI6IlRvIGlzc3VlIGEgRmFiZXIgQ29sbGVnZSBHcmFkdWF0ZSBjcmVkZW50aWFsIiwiYWNjZXB0IjpbImRpZGNvbW0vdjIiXX0sImF0dGFjaG1lbnRzIjpbeyJpZCI6IjcwY2RjOTBjLTlhOTktNGNkYS04N2ZlLTRmNGIyNTk1MTEyYSIsIm1lZGlhX3R5cGUiOiJhcHBsaWNhdGlvbi9qc29uIiwiZGF0YSI6eyJqc29uIjp7ImlkIjoiNjU1ZTlhMmMtNDhlZC00NTliLWIzZGEtNmIzNjg2NjU1NTY0IiwidHlwZSI6Imh0dHBzOi8vZGlkY29tbS5vcmcvaXNzdWUtY3JlZGVudGlhbC8zLjAvb2ZmZXItY3JlZGVudGlhbCIsImJvZHkiOnsiZ29hbF9jb2RlIjoiT2ZmZXIgQ3JlZGVudGlhbCIsImNyZWRlbnRpYWxfcHJldmlldyI6eyJ0eXBlIjoiaHR0cHM6Ly9kaWRjb21tLm9yZy9pc3N1ZS1jcmVkZW50aWFsLzMuMC9jcmVkZW50aWFsLWNyZWRlbnRpYWwiLCJib2R5Ijp7ImF0dHJpYnV0ZXMiOlt7Im5hbWUiOiJmYW1pbHlOYW1lIiwidmFsdWUiOiJXb25kZXJsYW5kIn0seyJuYW1lIjoiZ2l2ZW5OYW1lIiwidmFsdWUiOiJBbGljZSJ9LHsibmFtZSI6ImRyaXZpbmdDbGFzcyIsInZhbHVlIjoiTXc9PSIsIm1lZGlhX3R5cGUiOiJhcHBsaWNhdGlvbi9qc29uIn0seyJuYW1lIjoiZGF0ZU9mSXNzdWFuY2UiLCJ2YWx1ZSI6IjIwMjAtMTEtMTNUMjA6MjA6MzkrMDA6MDAifSx7Im5hbWUiOiJlbWFpbEFkZHJlc3MiLCJ2YWx1ZSI6ImFsaWNlQHdvbmRlcmxhbmQuY29tIn0seyJuYW1lIjoiZHJpdmluZ0xpY2Vuc2VJRCIsInZhbHVlIjoiMTIzNDUifV19fX0sImF0dGFjaG1lbnRzIjpbeyJpZCI6Ijg0MDQ2NzhiLTlhMzYtNDk4OS1hZjFkLTBmNDQ1MzQ3ZTBlMyIsIm1lZGlhX3R5cGUiOiJhcHBsaWNhdGlvbi9qc29uIiwiZGF0YSI6eyJqc29uIjp7Im9wdGlvbnMiOnsiY2hhbGxlbmdlIjoiYWQwZjQzYWQtODUzOC00MWQ0LTljYjgtMjA5NjdiYzY4NWJjIiwiZG9tYWluIjoiZG9tYWluIn0sInByZXNlbnRhdGlvbl9kZWZpbml0aW9uIjp7ImlkIjoiNzQ4ZWZhNTgtMmJjZS00NDBkLTkyMWYtMjUyMGE4NDQ2NjYzIiwiaW5wdXRfZGVzY3JpcHRvcnMiOltdLCJmb3JtYXQiOnsiand0Ijp7ImFsZyI6WyJFUzI1NksiXSwicHJvb2ZfdHlwZSI6W119fX19fSwiZm9ybWF0IjoicHJpc20vand0In1dLCJ0aGlkIjoiZjk2ZTM2OTktNTkxYy00YWU3LWI1ZTYtNmVmZTZkMjYyNTViIiwiZnJvbSI6ImRpZDpwZWVyOjIuRXo2TFNmc0tNZTh2U1NXa1lkWkNwbjRZVmlQRVJmZEdBaGRMQUdIZ3gyTEdKd2ZtQS5WejZNa3B3MWtTYWJCTXprQTN2NTl0UUZuaDNGdGtLeTZ4TGhMeGQ5UzZCQW9hQmcyLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW1oMGRIQTZMeTh4T1RJdU1UWTRMakV1TXpjNk9EQTRNQzlrYVdSamIyMXRJaXdpY2lJNlcxMHNJbUVpT2xzaVpHbGtZMjl0YlM5Mk1pSmRmWDAifX19XSwiY3JlYXRlZF90aW1lIjoxNzI0ODUxMTM5LCJleHBpcmVzX3RpbWUiOjE3MjQ4NTE0Mzl9="
)
}

Expand Down
2 changes: 1 addition & 1 deletion ...cala/org/hyperledger/identus/presentproof/controller/http/OOBPresentationInvitation.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ object OOBPresentationInvitation {
description =
"The invitation message encoded as a URL. This URL follows the Out of [Band 2.0 protocol](https://identity.foundation/didcomm-messaging/spec/v2.0/#out-of-band-messages) and can be used to generate a QR code for example.",
example =
"https://my.domain.com/path?_oob=eyJAaWQiOiIzZmE4NWY2NC01NzE3LTQ1NjItYjNmYy0yYzk2M2Y2NmFmYTYiLCJAdHlwZSI6Imh0dHBzOi8vZGlkY29tbS5vcmcvbXktZmFtaWx5LzEuMC9teS1tZXNzYWdlLXR5cGUiLCJkaWQiOiJXZ1d4cXp0ck5vb0c5MlJYdnhTVFd2IiwiaW1hZ2VVcmwiOiJodHRwOi8vMTkyLjE2OC41Ni4xMDEvaW1nL2xvZ28uanBnIiwibGFiZWwiOiJCb2IiLCJyZWNpcGllbnRLZXlzIjpbIkgzQzJBVnZMTXY2Z21NTmFtM3VWQWpacGZrY0pDd0R3blpuNnozd1htcVBWIl0sInJvdXRpbmdLZXlzIjpbIkgzQzJBVnZMTXY2Z21NTmFtM3VWQWpacGZrY0pDd0R3blpuNnozd1htcVBWIl0sInNlcnZpY2VFbmRwb2ludCI6Imh0dHA6Ly8xOTIuMTY4LjU2LjEwMTo4MDIwIn0="
"https://my.domain.com/path?_oob=eyJpZCI6IjViMjUwMjIzLWExNDItNDRmYi1hOWJkLWU1MjBlNGI0ZjQzMiIsInR5cGUiOiJodHRwczovL2RpZGNvbW0ub3JnL291dC1vZi1iYW5kLzIuMC9pbnZpdGF0aW9uIiwiZnJvbSI6ImRpZDpwZWVyOjIuRXo2TFNkV0hWQ1BFOHc0NWZETjM4aUh0ZFJ6WGkyTFNqQmRSUjRGTmNOUm12VkNKcy5WejZNa2Z2aUI5S1F1OGlnNVZpeG1HZHM3dmdMNmoyUXNOUGFybkZaanBNQ0E5aHpQLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW1oMGRIQTZMeTh4T1RJdU1UWTRMakV1TXpjNk9EQTNNQzlrYVdSamIyMXRJaXdpY2lJNlcxMHNJbUVpT2xzaVpHbGtZMjl0YlM5Mk1pSmRmWDAiLCJib2R5Ijp7ImdvYWxfY29kZSI6InByZXNlbnQtdnAiLCJnb2FsIjoiUmVxdWVzdCBwcm9vZiBvZiB2YWNjaW5hdGlvbiBpbmZvcm1hdGlvbiIsImFjY2VwdCI6W119LCJhdHRhY2htZW50cyI6W3siaWQiOiIyYTZmOGM4NS05ZGE3LTRkMjQtOGRhNS0wYzliZDY5ZTBiMDEiLCJtZWRpYV90eXBlIjoiYXBwbGljYXRpb24vanNvbiIsImRhdGEiOnsianNvbiI6eyJpZCI6IjI1NTI5MTBiLWI0NmMtNDM3Yy1hNDdhLTlmODQ5OWI5ZTg0ZiIsInR5cGUiOiJodHRwczovL2RpZGNvbW0uYXRhbGFwcmlzbS5pby9wcmVzZW50LXByb29mLzMuMC9yZXF1ZXN0LXByZXNlbnRhdGlvbiIsImJvZHkiOnsiZ29hbF9jb2RlIjoiUmVxdWVzdCBQcm9vZiBQcmVzZW50YXRpb24iLCJ3aWxsX2NvbmZpcm0iOmZhbHNlLCJwcm9vZl90eXBlcyI6W119LCJhdHRhY2htZW50cyI6W3siaWQiOiJiYWJiNTJmMS05NDUyLTQzOGYtYjk3MC0yZDJjOTFmZTAyNGYiLCJtZWRpYV90eXBlIjoiYXBwbGljYXRpb24vanNvbiIsImRhdGEiOnsianNvbiI6eyJvcHRpb25zIjp7ImNoYWxsZW5nZSI6IjExYzkxNDkzLTAxYjMtNGM0ZC1hYzM2LWIzMzZiYWI1YmRkZiIsImRvbWFpbiI6Imh0dHBzOi8vcHJpc20tdmVyaWZpZXIuY29tIn0sInByZXNlbnRhdGlvbl9kZWZpbml0aW9uIjp7ImlkIjoiMGNmMzQ2ZDItYWY1Ny00Y2E1LTg2Y2EtYTA1NTE1NjZlYzZmIiwiaW5wdXRfZGVzY3JpcHRvcnMiOltdfX19LCJmb3JtYXQiOiJwcmlzbS9qd3QifV0sInRoaWQiOiI1YjI1MDIyMy1hMTQyLTQ0ZmItYTliZC1lNTIwZTRiNGY0MzIiLCJmcm9tIjoiZGlkOnBlZXI6Mi5FejZMU2RXSFZDUEU4dzQ1ZkROMzhpSHRkUnpYaTJMU2pCZFJSNEZOY05SbXZWQ0pzLlZ6Nk1rZnZpQjlLUXU4aWc1Vml4bUdkczd2Z0w2ajJRc05QYXJuRlpqcE1DQTloelAuU2V5SjBJam9pWkcwaUxDSnpJanA3SW5WeWFTSTZJbWgwZEhBNkx5OHhPVEl1TVRZNExqRXVNemM2T0RBM01DOWthV1JqYjIxdElpd2ljaUk2VzEwc0ltRWlPbHNpWkdsa1kyOXRiUzkyTWlKZGZYMCJ9fX1dLCJjcmVhdGVkX3RpbWUiOjE3MjQzMzkxNDQsImV4cGlyZXNfdGltZSI6MTcyNDMzOTQ0NH0="
)
}

Expand Down
7 changes: 3 additions & 4 deletions ...est/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticatorSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,11 @@ object KeycloakAuthenticatorSpec

suite("KeycloakAuthenticatorSpec")(
basicSpec
.provide(
.provideSome[KeycloakContainerCustom](
KeycloakAuthenticatorImpl.layer,
ZLayer.fromZIO(initializeClient) >>> KeycloakClientImpl.authzClientLayer >+> KeycloakClientImpl.layer,
keycloakConfigLayer(),
keycloakAdminClientLayer,
keycloakContainerLayer,
Client.default,
KeycloakPermissionManagementService.layer,
WalletManagementServiceImpl.layer,
Expand All @@ -100,12 +99,11 @@ object KeycloakAuthenticatorSpec
ZLayer.succeed(WalletAdministrationContext.Admin())
),
disabledAutoRptSpec
.provide(
.provideSome[KeycloakContainerCustom](
KeycloakAuthenticatorImpl.layer,
ZLayer.fromZIO(initializeClient) >>> KeycloakClientImpl.authzClientLayer >+> KeycloakClientImpl.layer,
keycloakConfigLayer(authUpgradeToRPT = false),
keycloakAdminClientLayer,
keycloakContainerLayer,
Client.default,
KeycloakPermissionManagementService.layer,
WalletManagementServiceImpl.layer,
Expand All @@ -117,6 +115,7 @@ object KeycloakAuthenticatorSpec
ZLayer.succeed(WalletAdministrationContext.Admin())
)
)
.provideLayerShared(keycloakContainerLayer)
.provide(Runtime.removeDefaultLoggers) @@ TestAspect.sequential
}

Expand Down
34 changes: 18 additions & 16 deletions ...er/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,24 @@ object KeycloakPermissionManagementServiceSpec
multitenantSuite
) @@ sequential @@ TestAspect.before(DBTestUtils.runMigrationAgentDB)

s.provide(
Client.default,
keycloakContainerLayer,
keycloakAdminConfigLayer,
KeycloakAdmin.layer,
KeycloakPermissionManagementService.layer,
KeycloakAuthenticatorImpl.layer,
ZLayer.fromZIO(initializeClient) >>> KeycloakClientImpl.authzClientLayer >+> KeycloakClientImpl.layer,
keycloakConfigLayer(),
WalletManagementServiceImpl.layer,
JdbcWalletNonSecretStorage.layer,
JdbcWalletSecretStorage.layer,
contextAwareTransactorLayer,
pgContainerLayer,
apolloLayer
).provide(Runtime.removeDefaultLoggers)
s
.provideSome[KeycloakContainerCustom](
Client.default,
keycloakAdminConfigLayer,
KeycloakAdmin.layer,
KeycloakPermissionManagementService.layer,
KeycloakAuthenticatorImpl.layer,
ZLayer.fromZIO(initializeClient) >>> KeycloakClientImpl.authzClientLayer >+> KeycloakClientImpl.layer,
keycloakConfigLayer(),
WalletManagementServiceImpl.layer,
JdbcWalletNonSecretStorage.layer,
JdbcWalletSecretStorage.layer,
contextAwareTransactorLayer,
pgContainerLayer,
apolloLayer
)
.provideLayerShared(keycloakContainerLayer)
.provide(Runtime.removeDefaultLoggers)
}

private val successfulCasesSuite = suite("Successful Cases")(
Expand Down
3 changes: 1 addition & 2 deletions ...c/test/scala/org/hyperledger/identus/oid4vci/domain/OIDCCredentialIssuerServiceSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object OIDCCredentialIssuerServiceSpec
MockDIDService.resolveDIDExpectation(issuerDidMetadata, issuerDidData)

private val issuerManagedDIDServiceExpectations =
MockManagedDIDService.javaKeyPairWithDIDExpectation(issuerKp)
MockManagedDIDService.findDIDKeyPairExpectation(issuerKp)

private val getIssuerPrismDidWalletIdExpectations =
MockDIDNonSecretStorage.getPrismDidWalletIdExpectation(issuerDidData.id, WalletId.default)
Expand Down Expand Up @@ -139,7 +139,6 @@ object OIDCCredentialIssuerServiceSpec
None,
credentialDefinition
)
_ <- zio.Console.printLine(jwt)
jwtObject <- ZIO.fromTry(Try(JWSObject.parse(jwt.value)))
payload <- ZIO.fromEither(Json.decoder.decodeJson(jwtObject.getPayload.toString).flatMap(_.as[Json.Obj]))
vc <- ZIO.fromEither(payload.get("vc").get.as[Json.Obj])
Expand Down
2 changes: 1 addition & 1 deletion ...ger/identus/pollux/credentialdefinition/CredentialDefinitionLookupAndPaginationSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object CredentialDefinitionLookupAndPaginationSpec
)
).provideSomeLayerShared(
mockManagedDIDServiceLayer.exactly(20).toLayer >+> testEnvironmentLayer
)
).provide(Runtime.removeDefaultLoggers)

private val credentialDefinitionPaginationSpec = suite("credential-definition-registry pagination logic")(
test("pagination of the first page with the empty query params") {
Expand Down
Loading

0 comments on commit 7a0e6e3

Please sign in to comment.