From 0fbd5e9a658b7ec1f356181d78234551dfaff1f8 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 2 Nov 2025 00:24:36 +0000 Subject: [PATCH 1/6] Update munit to 1.2.1 in main Signed-off-by: Hyperledger Bot --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9610da5c14..968b7e3be0 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ inThisBuild( ) lazy val V = new { - val munit = "1.2.0" // "0.7.29" + val munit = "1.2.1" // "0.7.29" val munitZio = "0.4.0" // https://mvnrepository.com/artifact/dev.zio/zio From 68a204ae5dee65a04ccdb681537de9b8bc0b202f Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 2 Nov 2025 00:24:37 +0000 Subject: [PATCH 2/6] Update sbt-scalafmt to 2.5.6 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d60518f55f..8a244ccc31 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4") From 991dea4058e4e657dc49e88d917c77cc372a1961 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 2 Nov 2025 00:24:38 +0000 Subject: [PATCH 3/6] Update scalafmt-core to 3.9.10 in main Signed-off-by: Hyperledger Bot --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5d28e4f3bc..bc3f570c54 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.6 +version = 3.9.10 runner.dialect = scala3 maxColumn = 120 From 2141fc14c257a1f024cd94aeb4b723e3d6194600 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 2 Nov 2025 00:24:38 +0000 Subject: [PATCH 4/6] Update sbt-scoverage to 2.4.0 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8a244ccc31..cbaaac274b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.8") addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.9.0") From d14a93abd076291a767ac6928c31c8118dd921a4 Mon Sep 17 00:00:00 2001 From: Pat Losoponkul Date: Thu, 8 Jan 2026 14:22:18 +0700 Subject: [PATCH 5/6] chore: reformat code with scalafmt Signed-off-by: Pat Losoponkul --- .../identus/castor/core/model/ProtoModelHelper.scala | 2 +- .../identus/castor/core/model/did/PrismDID.scala | 4 ++-- .../castor/core/model/did/w3c/W3CModelHelper.scala | 2 +- .../identus/castor/core/service/NeoPrismClient.scala | 6 +++--- .../castor/core/service/PrismNodeDIDService.scala | 2 +- .../hyperledger/identus/agent/server/Modules.scala | 2 +- .../agent/server/http/CustomServerInterceptors.scala | 2 +- .../agent/server/jobs/BackgroundJobsHelper.scala | 4 ++-- .../agent/server/jobs/PresentBackgroundJobs.scala | 2 +- .../identus/api/http/codec/OrderCodec.scala | 6 +++--- .../identus/castor/controller/http/Service.scala | 2 +- .../admin/AdminApiKeyAuthenticator.scala | 2 +- .../authentication/apikey/ApiKeyAuthenticator.scala | 2 +- .../authentication/oidc/KeycloakAuthenticator.scala | 4 ++-- .../oidc/KeycloakAuthenticatorImpl.scala | 6 +++--- .../http/controller/WalletManagementController.scala | 2 +- .../CredentialDefinitionControllerImpl.scala | 2 +- .../controller/CredentialSchemaControllerImpl.scala | 2 +- .../controller/PresentProofControllerImpl.scala | 2 +- .../controller/http/VcVerification.scala | 4 ++-- .../walletapi/service/ManagedDIDServiceImpl.scala | 2 +- .../service/WalletManagementServiceImpl.scala | 2 +- .../walletapi/sql/JdbcDIDNonSecretStorage.scala | 2 +- .../agent/walletapi/sql/JdbcDIDSecretStorage.scala | 2 +- .../walletapi/sql/JdbcWalletSecretStorage.scala | 2 +- .../agent/walletapi/util/OperationFactory.scala | 8 ++++---- .../identus/agent/walletapi/vault/VaultClient.scala | 4 ++-- .../identus/agent/walletapi/vault/package.scala | 2 +- .../identus/mercury/MessagingService.scala | 4 ++-- .../identus/mercury/model/Conversions.scala | 12 ++++++------ .../identus/mercury/model/JsonUtilsForDidCommx.scala | 10 +++++----- .../mercury/CoordinateMediationPrograms.scala | 2 +- .../protocol/issuecredential/IssueCredential.scala | 4 ++-- .../protocol/issuecredential/OfferCredential.scala | 4 ++-- .../protocol/issuecredential/ProposeCredential.scala | 4 ++-- .../protocol/issuecredential/RequestCredential.scala | 4 ++-- .../anotherclasspath/UtilsCredentialSpec.scala | 6 +++--- .../RevocationNotification.scala | 4 ++-- .../pollux/core/service/CredentialService.scala | 2 +- .../pollux/core/service/CredentialServiceImpl.scala | 6 +++--- .../pollux/core/service/LinkSecretServiceImpl.scala | 2 +- .../core/service/PresentationServiceImpl.scala | 12 ++++++------ .../core/service/PresentationServiceNotifier.scala | 2 +- .../core/service/uriResolvers/DidUrlResolver.scala | 2 +- .../verification/VcVerificationServiceImpl.scala | 2 +- .../repository/PresentationRepositoryInMemory.scala | 2 +- .../identus/pollux/sdjwt/QueryUtils.scala | 2 +- .../org/hyperledger/identus/pollux/sdjwt/SDJWT.scala | 4 ++-- .../identus/pollux/vc/jwt/JWTVerification.scala | 4 ++-- .../messaging/kafka/InMemoryMessagingService.scala | 4 ++-- .../identus/shared/validation/ValidationUtils.scala | 2 +- 51 files changed, 92 insertions(+), 92 deletions(-) diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelper.scala b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelper.scala index b265358d23..af9ac8fa2a 100644 --- a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelper.scala +++ b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/ProtoModelHelper.scala @@ -313,7 +313,7 @@ private[castor] trait ProtoModelHelper { extension (publicKeyData: node_models.PublicKey.KeyData) { def toDomain: Either[String, PublicKeyData] = { publicKeyData match { - case KeyData.Empty => Left(s"unable to convert KeyData.Emtpy to PublicKeyData") + case KeyData.Empty => Left(s"unable to convert KeyData.Emtpy to PublicKeyData") case KeyData.EcKeyData(ecKeyData) => for { curve <- EllipticCurve diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDID.scala b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDID.scala index fe6b00c885..531a5d9cf4 100644 --- a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDID.scala +++ b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/PrismDID.scala @@ -50,7 +50,7 @@ object PrismDID extends ProtoModelHelper { def buildLongFormFromAtalaOperation(atalaOperation: node_models.AtalaOperation): Either[String, LongFormPrismDID] = atalaOperation.operation match { case _: Operation.CreateDid => Right(LongFormPrismDID(atalaOperation)) - case operation => + case operation => Left(s"Provided initial state of long form Prism DID is ${operation.value}, CreateDid Atala operation expected") } @@ -121,7 +121,7 @@ final case class LongFormPrismDID private[did] (atalaOperation: node_models.Atal import ProtoModelHelper.* atalaOperation.operation match { case Operation.CreateDid(op) => op.toDomain - case operation => + case operation => Left(s"Provided initial state of long form Prism DID is ${operation.value}, CreateDid Atala operation expected") } } diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelper.scala b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelper.scala index d3a483d93c..9f1da5a01f 100644 --- a/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelper.scala +++ b/castor/src/main/scala/org/hyperledger/identus/castor/core/model/did/w3c/W3CModelHelper.scala @@ -148,7 +148,7 @@ private[castor] trait W3CModelHelper { private def secp256k1Repr(pk: PublicKeyData): PublicKeyJwk = { val (x, y) = pk match { - case PublicKeyData.ECKeyData(_, x, y) => (x, y) + case PublicKeyData.ECKeyData(_, x, y) => (x, y) case PublicKeyData.ECCompressedKeyData(_, data) => val point = Apollo.default.secp256k1.publicKeyFromEncoded(data.toByteArray).get.getECPoint val x = Base64UrlString.fromByteArray(point.x) diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/service/NeoPrismClient.scala b/castor/src/main/scala/org/hyperledger/identus/castor/core/service/NeoPrismClient.scala index 87475e4350..b0fe0b5baa 100644 --- a/castor/src/main/scala/org/hyperledger/identus/castor/core/service/NeoPrismClient.scala +++ b/castor/src/main/scala/org/hyperledger/identus/castor/core/service/NeoPrismClient.scala @@ -57,7 +57,7 @@ private class NeoPrismClientImpl(client: Client, config: NeoPrismConfig) extends .get(s"api/dids/$did") metadataOpt <- resp.status match case Status.NotFound => ZIO.none - case _ => + case _ => resp.body.asString .flatMap { body => ZIO @@ -126,8 +126,8 @@ private class NeoPrismClientImpl(client: Client, config: NeoPrismConfig) extends for resp <- baseClient.batched.get(s"api/operations/$operationId") found <- resp.status match - case Status.Ok => ZIO.succeed(true) - case Status.NotFound => ZIO.succeed(false) + case Status.Ok => ZIO.succeed(true) + case Status.NotFound => ZIO.succeed(false) case Status.BadRequest => resp.body.asString.flatMap { body => ZIO.fail(new RuntimeException(s"Invalid operation ID: $body")) diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/service/PrismNodeDIDService.scala b/castor/src/main/scala/org/hyperledger/identus/castor/core/service/PrismNodeDIDService.scala index 9c81e9ef4f..8c16f373a5 100644 --- a/castor/src/main/scala/org/hyperledger/identus/castor/core/service/PrismNodeDIDService.scala +++ b/castor/src/main/scala/org/hyperledger/identus/castor/core/service/PrismNodeDIDService.scala @@ -52,7 +52,7 @@ private class PrismNodeDIDService(didOpValidator: DIDOperationValidator, nodeCli operationId <- ZIO.fromEither { operationOutput.operationMaybe match { case OperationMaybe.OperationId(id) => Right(id.toByteArray) - case OperationMaybe.Empty => + case OperationMaybe.Empty => Left(DIDOperationError.UnexpectedDLTResult("operation result does not contain operation detail")) case OperationMaybe.Error(e) => Left(DIDOperationError.UnexpectedDLTResult(s"operation result was not successful: $e")) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/Modules.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/Modules.scala index 5fca8046dc..9ed04501b4 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/Modules.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/Modules.scala @@ -184,7 +184,7 @@ object AppModule { ZIO.serviceWith[AppConfig](_.didNode.neoprism.baseUrl).flatMap { javaUrl => zio.http.URL.fromURI(javaUrl.toURI()) match { case Some(url) => ZIO.succeed(NeoPrismConfig(baseUrl = url)) - case None => + case None => ZIO.fail( new IllegalArgumentException( s"Invalid NeoPrism base URL '$javaUrl': could not convert to zio.http.URL" diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/http/CustomServerInterceptors.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/http/CustomServerInterceptors.scala index 8da72798ec..9564101b1b 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/http/CustomServerInterceptors.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/http/CustomServerInterceptors.scala @@ -36,7 +36,7 @@ object CustomServerInterceptors { def tapirExceptionHandler[F[_]]: ExceptionHandler[F] = ExceptionHandler.pure[F](ctx => ctx.e match case UnmanagedFailureException(failure: Failure) => Some(tapirDefectHandler(failure)) - case e => + case e => Some( tapirDefectHandler( ErrorResponse( diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala index 1fbccb0e8a..5e93e7bf8f 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala @@ -50,7 +50,7 @@ trait BackgroundJobsHelper { .someOrFail(BackgroundJobError.InvalidState(s"Issuer DID does not exist in the wallet: $did")) .flatMap { case s @ ManagedDIDState(_, _, PublicationState.Published(_)) => ZIO.succeed(s) - case s => + case s => ZIO.cond( allowUnpublishedIssuingDID, s, @@ -236,7 +236,7 @@ trait BackgroundJobsHelper { def retryStepsFromConfig(topicName: String, jobConfig: ConsumerJobConfig): Seq[RetryStep] = { val retryTopics = jobConfig.retryStrategy match - case None => Seq.empty + case None => Seq.empty case Some(rs) => (1 to rs.maxRetries).map(i => ( diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala index 3b9f51b5d6..bef5540ab8 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/jobs/PresentBackgroundJobs.scala @@ -745,7 +745,7 @@ object PresentBackgroundJobs extends BackgroundJobsHelper { mediaType = attachment.media_type, format = attachment.format.map { case PresentCredentialRequestFormat.JWT.name => PresentCredentialFormat.JWT.name - case format => + case format => throw throw RuntimeException( s"Unexpected PresentCredentialRequestFormat=$format. Expecting: ${PresentCredentialRequestFormat.JWT.name}" ) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/api/http/codec/OrderCodec.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/api/http/codec/OrderCodec.scala index 8a55a3a7f5..d004770a3e 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/api/http/codec/OrderCodec.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/api/http/codec/OrderCodec.scala @@ -13,9 +13,9 @@ object OrderCodec { try { val s2 = new String(Base64.getDecoder.decode(s)) val order = s2.split(".", 2) match { - case Array() => Order.empty - case Array(field) => Order(field) - case Array(field, "") => Order(field) + case Array() => Order.empty + case Array(field) => Order(field) + case Array(field, "") => Order(field) case Array(field, direction) => Order(field, Some(Direction.valueOf(direction))) case _ => sys.error("impossible") diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala index a58ed658ea..a7e5169adc 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala @@ -125,7 +125,7 @@ object ServiceType { castorDomain.ServiceType.Name.fromString(value).map(castorDomain.ServiceType.Single.apply) case Multiple(values) => values.toList match { - case Nil => Left("serviceType cannot be empty") + case Nil => Left("serviceType cannot be empty") case head :: tail => for { parsedHead <- castorDomain.ServiceType.Name.fromString(head) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/admin/AdminApiKeyAuthenticator.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/admin/AdminApiKeyAuthenticator.scala index 4b29a1e2fb..9b3a4d994d 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/admin/AdminApiKeyAuthenticator.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/admin/AdminApiKeyAuthenticator.scala @@ -14,7 +14,7 @@ trait AdminApiKeyAuthenticator extends AuthenticatorWithAuthZ[Entity], EntityAut def authenticate(credentials: Credentials): IO[AuthenticationError, Entity] = { credentials match { case AdminApiKeyCredentials(Some(apiKey)) => authenticate(apiKey) - case AdminApiKeyCredentials(None) => + case AdminApiKeyCredentials(None) => ZIO.logDebug(s"AdminApiKey API authentication is enabled, but `x-admin-api-key` token is empty") *> ZIO.fail(AdminApiKeyAuthenticationError.emptyAdminApiKey) } diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticator.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticator.scala index 8d421c994b..d8c05292d7 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticator.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/apikey/ApiKeyAuthenticator.scala @@ -20,7 +20,7 @@ trait ApiKeyAuthenticator extends AuthenticatorWithAuthZ[Entity], EntityAuthoriz case ApiKeyCredentials(apiKey) => apiKey match { case Some(value) if value.nonEmpty => authenticate(value) - case Some(value) => + case Some(value) => ZIO.logDebug(s"ApiKey API authentication is enabled, but `apikey` token is empty") *> ZIO.fail(ApiKeyAuthenticationError.emptyApiKey) case None => diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticator.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticator.scala index 29c92ba154..7c53c85b55 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticator.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticator.scala @@ -41,7 +41,7 @@ final class AccessToken private (token: String, claims: JwtClaim, rolesClaimPath acc.flatMap(_.asObject).flatMap(_.get(pathSegment)) } rolesJson match { - case None => Right(None) + case None => Right(None) case Some(json) => json.asArray .toRight("Roles claim is not a JSON array of strings.") @@ -80,7 +80,7 @@ trait KeycloakAuthenticator extends AuthenticatorWithAuthZ[KeycloakEntity] { if (isEnabled) { credentials match { case JwtCredentials(Some(token)) if token.nonEmpty => authenticate(token) - case JwtCredentials(Some(_)) => + case JwtCredentials(Some(_)) => ZIO.logDebug(s"Keycloak authentication is enabled, but bearer token is empty") *> ZIO.fail(JwtAuthenticationError.emptyToken) case JwtCredentials(None) => diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticatorImpl.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticatorImpl.scala index 6f3426ecb4..d461f4f826 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticatorImpl.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/authentication/oidc/KeycloakAuthenticatorImpl.scala @@ -52,7 +52,7 @@ class KeycloakAuthenticatorImpl( } .flatMap { case head +: Nil => ZIO.succeed(head) - case Nil => + case Nil => ZIO.fail(AuthenticationError.ResourceNotPermitted("No wallet permissions found.")) case ls => ZIO.fail( @@ -79,8 +79,8 @@ class KeycloakAuthenticatorImpl( .map(_.role.left.map(AuthenticationError.InvalidCredentials(_))) .absolve ctx <- role match { - case EntityRole.Admin => ZIO.succeed(WalletAdministrationContext.Admin()) - case EntityRole.Tenant => selfServiceCtx + case EntityRole.Admin => ZIO.succeed(WalletAdministrationContext.Admin()) + case EntityRole.Tenant => selfServiceCtx case EntityRole.ExternalParty => ZIO.fail(AuthenticationError.InvalidRole("External party cannot access the wallet.")) } diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala index ed271ffc85..3aa20710d1 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/iam/wallet/http/controller/WalletManagementController.scala @@ -80,7 +80,7 @@ class WalletManagementControllerImpl( me: BaseEntity )(implicit rc: RequestContext): ZIO[WalletAdministrationContext, ErrorResponse, WalletDetail] = { ZIO.serviceWithZIO[WalletAdministrationContext] { - case WalletAdministrationContext.Admin() => doCreateWallet(request).map(i => i) + case WalletAdministrationContext.Admin() => doCreateWallet(request).map(i => i) case WalletAdministrationContext.SelfService(_) => for { wallet <- doCreateWallet(request) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialdefinition/controller/CredentialDefinitionControllerImpl.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialdefinition/controller/CredentialDefinitionControllerImpl.scala index 3051efe7b9..0d4553c562 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialdefinition/controller/CredentialDefinitionControllerImpl.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialdefinition/controller/CredentialDefinitionControllerImpl.scala @@ -185,7 +185,7 @@ class CredentialDefinitionControllerImpl(service: CredentialDefinitionService, m .someOrFail(ErrorResponse.notFound(detail = Some(s"Issuer DID does not exist in the wallet: $did"))) .flatMap { case s @ ManagedDIDState(_, _, _: PublicationState.Published) => ZIO.succeed(s) - case s => + case s => ZIO.cond( allowUnpublishedIssuingDID, s, diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaControllerImpl.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaControllerImpl.scala index 91e66f97d8..861831f52e 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaControllerImpl.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaControllerImpl.scala @@ -214,7 +214,7 @@ class CredentialSchemaControllerImpl(service: CredentialSchemaService, managedDI .someOrFail(ErrorResponse.notFound(detail = Some(s"Issuer DID does not exist in the wallet: $did"))) .flatMap { case s @ ManagedDIDState(_, _, _: PublicationState.Published) => ZIO.succeed(s) - case s => + case s => ZIO.cond( allowUnpublishedIssuingDID, s, diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala index c6486d445f..8aeb7a8d4b 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/presentproof/controller/PresentProofControllerImpl.scala @@ -250,7 +250,7 @@ class PresentProofControllerImpl( case "request-reject" => presentationService.rejectRequestPresentation(didCommId) case "presentation-accept" => presentationService.acceptPresentation(didCommId) case "presentation-reject" => presentationService.rejectPresentation(didCommId) - case a => + case a => ZIO.fail( ErrorResponse.badRequest( detail = Some( diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala index 5d4b060f13..e06cf1fd18 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/verification/controller/http/VcVerification.scala @@ -51,7 +51,7 @@ object VcVerification { maybeParameter: Option[VcVerificationParameter] ): IO[ErrorResponse, ServiceVcVerification] = { (verification, maybeParameter) match { - case (SignatureVerification, None) => ZIO.succeed(ServiceVcVerification.SignatureVerification) + case (SignatureVerification, None) => ZIO.succeed(ServiceVcVerification.SignatureVerification) case (IssuerIdentification, Some(DidParameter(iss))) => ZIO.succeed(ServiceVcVerification.IssuerIdentification(iss)) case (ExpirationCheck, Some(DateTimeParameter(dateTime))) => @@ -66,7 +66,7 @@ object VcVerification { case (AlgorithmVerification, None) => ZIO.succeed(ServiceVcVerification.AlgorithmVerification) case (SchemaCheck, None) => ZIO.succeed(ServiceVcVerification.SchemaCheck) case (SemanticCheckOfClaims, None) => ZIO.succeed(ServiceVcVerification.SemanticCheckOfClaims) - case _ => + case _ => ZIO.fail( ErrorResponse.badRequest(detail = Some(s"Unsupported Verification:$verification and Parameters:$maybeParameter") diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/ManagedDIDServiceImpl.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/ManagedDIDServiceImpl.scala index c739130644..5529347a9b 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/ManagedDIDServiceImpl.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/ManagedDIDServiceImpl.scala @@ -110,7 +110,7 @@ class ManagedDIDServiceImpl private[walletapi] ( .mapError(PublishManagedDIDError.WalletStorageError.apply) .someOrFail(PublishManagedDIDError.DIDNotFound(did)) outcome <- didState.publicationState match { - case PublicationState.Created() => doPublish(didState) + case PublicationState.Created() => doPublish(didState) case PublicationState.PublicationPending(publishOperationId) => ZIO.succeed(ScheduleDIDOperationOutcome(did, didState.createOperation, publishOperationId)) case PublicationState.Published(publishOperationId) => diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/WalletManagementServiceImpl.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/WalletManagementServiceImpl.scala index b355230fdd..1c26b44b2a 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/WalletManagementServiceImpl.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/WalletManagementServiceImpl.scala @@ -31,7 +31,7 @@ class WalletManagementServiceImpl( _ <- ZIO.serviceWithZIO[WalletAdministrationContext] { case WalletAdministrationContext.Admin() => ZIO.unit case WalletAdministrationContext.SelfService(permittedWallets) if permittedWallets.isEmpty => ZIO.unit - case WalletAdministrationContext.SelfService(_) => + case WalletAdministrationContext.SelfService(_) => ZIO.fail(TooManyPermittedWallet()) } seed <- seed.fold( diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala index 5177d48e53..f526f4b346 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala @@ -202,7 +202,7 @@ class JdbcDIDNonSecretStorage(xa: Transactor[ContextAwareTask], xb: Transactor[T getManagedDIDState(did) .map(_.map(_.didIndex)) .flatMap { - case None => ZIO.none + case None => ZIO.none case Some(didIndex) => for { keyUsageIndex <- cxnIO.transactWallet(xa) diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDSecretStorage.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDSecretStorage.scala index 7ff1e935b7..3ffb978468 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDSecretStorage.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDSecretStorage.scala @@ -109,7 +109,7 @@ class JdbcDIDSecretStorage(xa: Transactor[ContextAwareTask]) extends DIDSecretSt cxnIO .transactWallet(xa) .flatMap { - case None => ZIO.none + case None => ZIO.none case Some(jwk) => ZIO .fromEither(c.from(jwk)) diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcWalletSecretStorage.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcWalletSecretStorage.scala index 824b64b73d..0410fa4d22 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcWalletSecretStorage.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcWalletSecretStorage.scala @@ -48,7 +48,7 @@ class JdbcWalletSecretStorage(xa: Transactor[ContextAwareTask]) extends WalletSe cxnIO .transactWallet(xa) .flatMap { - case None => ZIO.none + case None => ZIO.none case Some(bytes) => ZIO .fromEither(WalletSeed.fromByteArray(bytes)) diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/util/OperationFactory.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/util/OperationFactory.scala index 9cf16b6a42..549c1ec3b1 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/util/OperationFactory.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/util/OperationFactory.scala @@ -142,9 +142,9 @@ class OperationFactory(apollo: Apollo) { // should be impossible otherwise it's a defect ZIO.dieMessage("addKey update DID action must have a generated a key-pair") } - case UpdateManagedDIDAction.RemoveKey(id) => ZIO.succeed(UpdateDIDAction.RemoveKey(id)) - case UpdateManagedDIDAction.AddService(service) => ZIO.succeed(UpdateDIDAction.AddService(service)) - case UpdateManagedDIDAction.RemoveService(id) => ZIO.succeed(UpdateDIDAction.RemoveService(id)) + case UpdateManagedDIDAction.RemoveKey(id) => ZIO.succeed(UpdateDIDAction.RemoveKey(id)) + case UpdateManagedDIDAction.AddService(service) => ZIO.succeed(UpdateDIDAction.AddService(service)) + case UpdateManagedDIDAction.RemoveService(id) => ZIO.succeed(UpdateDIDAction.RemoveService(id)) case UpdateManagedDIDAction.UpdateService(patch) => ZIO.succeed(UpdateDIDAction.UpdateService(patch.id, patch.serviceType, patch.serviceEndpoints)) case UpdateManagedDIDAction.PatchContext(context) => ZIO.succeed(UpdateDIDAction.PatchContext(context)) @@ -155,7 +155,7 @@ class OperationFactory(apollo: Apollo) { ZIO.attempt { val (publicKeyData, keyPair) = template.curve match { case EllipticCurve.SECP256K1 => throw Exception("secp256k1 key must be derived, not randomly generated") - case EllipticCurve.ED25519 => + case EllipticCurve.ED25519 => val kp = apollo.ed25519.generateKeyPair toPublicKeyData(kp.publicKey) -> kp case EllipticCurve.X25519 => diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/VaultClient.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/VaultClient.scala index dca470d707..99b45faa95 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/VaultClient.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/VaultClient.scala @@ -129,7 +129,7 @@ object VaultKVClientImpl { status match { case 200 => ZIO.some(resp) case 404 => ZIO.none - case _ => + case _ => ZIO .fail(Exception(s"$message - Got response status code $status, expected 200")) .tapError(_ => ZIO.logError(s"$message - Response status: $status. Response body: $body")) @@ -146,7 +146,7 @@ object VaultKVClientImpl { val body = new String(bytes, StandardCharsets.UTF_8) status match { case 200 => ZIO.succeed(resp) - case _ => + case _ => ZIO .fail(Exception(s"$message - Got response status code $status, expected 200")) .tapError(_ => ZIO.logError(s"$message - Response status: $status. Response body: $body")) diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/package.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/package.scala index cbdd343258..5b414f35cb 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/package.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/vault/package.scala @@ -32,7 +32,7 @@ package object vault { override def decode(kv: Map[String, String]): Try[WalletSeed] = { kv.get("value") match { - case None => Failure(Exception("A property 'value' is missing from vault KV data")) + case None => Failure(Exception("A property 'value' is missing from vault KV data")) case Some(encodedSeed) => HexString .fromString(encodedSeed) diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala index 6847ea68a2..9c4fd9a7a2 100644 --- a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala +++ b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/MessagingService.scala @@ -121,8 +121,8 @@ object MessagingService { MessageAndAddress(finalMessage, serviceEndpoint) = auxFinalMessage didCommService <- ZIO.service[DidOps] to <- finalMessage.to match { - case Seq() => ZIO.fail(SendMessageError(new RuntimeException("Message must have a recipient"))) - case firstTo +: Seq() => ZIO.succeed(firstTo) + case Seq() => ZIO.fail(SendMessageError(new RuntimeException("Message must have a recipient"))) + case firstTo +: Seq() => ZIO.succeed(firstTo) case all @ (firstTo +: _) => ZIO.logWarning(s"Message have multi recipients: $all") *> ZIO.succeed(firstTo) } diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala index ef1d96dd4b..899d205d7e 100644 --- a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala +++ b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala @@ -56,12 +56,12 @@ def json2Map(json: Json): Any = json match { def mapValueToJson(obj: java.lang.Object): Json = { obj match { - case null => Json.Null - case b: java.lang.Boolean => Json.Bool(b) - case i: java.lang.Integer => Json.Num(i) - case d: java.lang.Double => Json.Num(d) - case l: java.lang.Long => Json.Num(l) - case s: java.lang.String => Json.Str(String.valueOf(s)) + case null => Json.Null + case b: java.lang.Boolean => Json.Bool(b) + case i: java.lang.Integer => Json.Num(i) + case d: java.lang.Double => Json.Num(d) + case l: java.lang.Long => Json.Num(l) + case s: java.lang.String => Json.Str(String.valueOf(s)) case array: com.nimbusds.jose.shaded.json.JSONArray => { Json.Arr(array.iterator().asScala.map(mapValueToJson).toList: _*) } diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/JsonUtilsForDidCommx.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/JsonUtilsForDidCommx.scala index 233e4f9d27..ea8c5af6c7 100644 --- a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/JsonUtilsForDidCommx.scala +++ b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/JsonUtilsForDidCommx.scala @@ -38,11 +38,11 @@ object JsonUtilsForDidCommx { def toJson(json: MyJsonTop): Json.Obj = { def myJsonToJson(f: MyJson): Json = f match { - case FixJson(value: Json.Null) => value // TEST - case FixJson(value: Boolean) => Json.Bool(value) - case FixJson(value: BigDecimal) => Json.Num(value) - case FixJson(value: String) => Json.Str(value) - case FixJson(elements: Seq[MyJson] @unchecked) => Json.Arr(elements.map(myJsonToJson): _*) + case FixJson(value: Json.Null) => value // TEST + case FixJson(value: Boolean) => Json.Bool(value) + case FixJson(value: BigDecimal) => Json.Num(value) + case FixJson(value: String) => Json.Str(value) + case FixJson(elements: Seq[MyJson] @unchecked) => Json.Arr(elements.map(myJsonToJson): _*) case FixJson(items: Map[String, MyJson] @unchecked) => Json.Obj(items.map { case (s, fixJson) => (s, myJsonToJson(fixJson)) }.toSeq: _*) } diff --git a/mercury/agent/src/main/scala/org/hyperledger/identus/mercury/CoordinateMediationPrograms.scala b/mercury/agent/src/main/scala/org/hyperledger/identus/mercury/CoordinateMediationPrograms.scala index 2b92f126b0..c71670003f 100644 --- a/mercury/agent/src/main/scala/org/hyperledger/identus/mercury/CoordinateMediationPrograms.scala +++ b/mercury/agent/src/main/scala/org/hyperledger/identus/mercury/CoordinateMediationPrograms.scala @@ -60,7 +60,7 @@ object CoordinateMediationPrograms { .flatMap { json => json.as[MediateGrant] match { case Right(mediateGrant) => ZIO.succeed(mediateGrant) - case Left(_) => + case Left(_) => json.as[MediateDeny] match { case Right(mediateDeny) => ZIO.succeed(mediateDeny) case Left(ex) => ZIO.fail(ex) diff --git a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredential.scala b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredential.scala index 958f0540e8..05ffff2ce1 100644 --- a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredential.scala +++ b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/IssueCredential.scala @@ -89,10 +89,10 @@ object IssueCredential { def readFromMessage(message: Message): Either[String, IssueCredential] = { message.body.as[IssueCredential.Body] match - case Left(err) => Left("Fail to parse IssueCredential's body: " + err) + case Left(err) => Left("Fail to parse IssueCredential's body: " + err) case Right(body) => message.from match - case None => Left("IssueCredential MUST have the sender explicit") + case None => Left("IssueCredential MUST have the sender explicit") case Some(from) => message.to match case firstTo +: Seq() => diff --git a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/OfferCredential.scala b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/OfferCredential.scala index 1e2f1d84ef..355864551e 100644 --- a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/OfferCredential.scala +++ b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/OfferCredential.scala @@ -103,10 +103,10 @@ object OfferCredential { def readFromMessage(message: Message): Either[String, OfferCredential] = { message.body.as[OfferCredential.Body] match - case Left(err) => Left("Fail to parse OfferCredential's body: " + err) + case Left(err) => Left("Fail to parse OfferCredential's body: " + err) case Right(body) => message.from match - case None => Left("OfferCredential MUST have the sender explicit") + case None => Left("OfferCredential MUST have the sender explicit") case Some(from) => message.to match case firstTo +: Seq() => diff --git a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/ProposeCredential.scala b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/ProposeCredential.scala index 5ae101e0c4..99b210f6ff 100644 --- a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/ProposeCredential.scala +++ b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/ProposeCredential.scala @@ -79,10 +79,10 @@ object ProposeCredential { def readFromMessage(message: Message): Either[String, ProposeCredential] = { message.body.as[ProposeCredential.Body] match - case Left(err) => Left("Fail to parse ProposeCredential's body: " + err) + case Left(err) => Left("Fail to parse ProposeCredential's body: " + err) case Right(body) => message.from match - case None => Left("ProposeCredential MUST have the sender explicit") + case None => Left("ProposeCredential MUST have the sender explicit") case Some(from) => message.to match case firstTo +: Seq() => diff --git a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/RequestCredential.scala b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/RequestCredential.scala index c8a8420fd0..41371e4de5 100644 --- a/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/RequestCredential.scala +++ b/mercury/protocol-issue-credential/src/main/scala/org/hyperledger/identus/mercury/protocol/issuecredential/RequestCredential.scala @@ -71,10 +71,10 @@ object RequestCredential { def readFromMessage(message: Message): Either[String, RequestCredential] = { message.body.as[RequestCredential.Body] match - case Left(err) => Left("Fail to parse RequestCredential's body: " + err) + case Left(err) => Left("Fail to parse RequestCredential's body: " + err) case Right(body) => message.from match - case None => Left("RequestCredential MUST have the sender explicit") + case None => Left("RequestCredential MUST have the sender explicit") case Some(from) => message.to match case firstTo +: Seq() => diff --git a/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/anotherclasspath/UtilsCredentialSpec.scala b/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/anotherclasspath/UtilsCredentialSpec.scala index 7dfdb4f4e4..eb1486df49 100644 --- a/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/anotherclasspath/UtilsCredentialSpec.scala +++ b/mercury/protocol-issue-credential/src/test/scala/org/hyperledger/identus/mercury/protocol/anotherclasspath/UtilsCredentialSpec.scala @@ -53,7 +53,7 @@ class UtilsCredentialSpec extends ZSuite { IssueCredential.readFromMessage(msg) match case Left(value) => fail("Must Have not error reading message") - case Right(obj) => { + case Right(obj) => { assertEquals(obj.getCredentialFormatAndCredential.size, 1) assertEquals( obj.getCredentialFormatAndCredential.map(_._2), @@ -76,7 +76,7 @@ class UtilsCredentialSpec extends ZSuite { OfferCredential.readFromMessage(msg) match case Left(value) => fail("Must Have not error reading message") - case Right(obj) => { + case Right(obj) => { assertEquals(obj.getCredentialFormatAndCredential.size, 1) assertEquals( obj.getCredentialFormatAndCredential.map(_._2), @@ -120,7 +120,7 @@ class UtilsCredentialSpec extends ZSuite { RequestCredential.readFromMessage(msg) match case Left(value) => fail("Must Have not error reading message") - case Right(obj) => { + case Right(obj) => { assertEquals(obj.getCredentialFormatAndCredential.size, 1) assertEquals( obj.getCredentialFormatAndCredential.map(_._2), diff --git a/mercury/protocol-revocation-notification/src/main/scala/org/hyperledger/identus/mercury/protocol/revocationnotificaiton/RevocationNotification.scala b/mercury/protocol-revocation-notification/src/main/scala/org/hyperledger/identus/mercury/protocol/revocationnotificaiton/RevocationNotification.scala index 72c134847f..551882f0e0 100644 --- a/mercury/protocol-revocation-notification/src/main/scala/org/hyperledger/identus/mercury/protocol/revocationnotificaiton/RevocationNotification.scala +++ b/mercury/protocol-revocation-notification/src/main/scala/org/hyperledger/identus/mercury/protocol/revocationnotificaiton/RevocationNotification.scala @@ -58,10 +58,10 @@ object RevocationNotification { def readFromMessage(message: Message): Either[String, RevocationNotification] = message.body.as[RevocationNotification.Body] match - case Left(err) => Left("Fail to parse RevocationNotification's body: " + err) + case Left(err) => Left("Fail to parse RevocationNotification's body: " + err) case Right(body) => message.from match - case None => Left("OfferCredential MUST have the sender explicit") + case None => Left("OfferCredential MUST have the sender explicit") case Some(from) => message.to match case firstTo +: Seq() => diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala index ff465e506f..ec138fcc5c 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialService.scala @@ -193,7 +193,7 @@ object CredentialService { fields <- ZIO.succeed(claims.asObject.map(_.toMap).getOrElse(Map.empty).toList) res <- ZIO.foreach(fields) { case (k, Json.Str(v)) => ZIO.succeed(Attribute(name = k, value = v)) - case (k, v) => + case (k, v) => ZIO.succeed { val jsonValue = v.toJson Attribute( diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala index e1d7f0f4c8..dd58b3fe2b 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala @@ -1166,7 +1166,7 @@ class CredentialServiceImpl( for { record <- credentialRepository.getById(id) updatedRecord <- record.protocolState match - case currentState if currentState == to => ZIO.succeed(record) // Idempotent behaviour + case currentState if currentState == to => ZIO.succeed(record) // Idempotent behaviour case currentState if currentState == from => credentialRepository.updateProtocolState(id, from, to) *> credentialRepository.getById(id) case _ => ZIO.fail(InvalidStateForOperation(record.protocolState)) @@ -1270,7 +1270,7 @@ class CredentialServiceImpl( ) .orDieAsUnmanagedFailure jwtHeader <- JWTVerification.extractJwtHeader(requestJwt) match - case ZValidation.Success(log, header) => ZIO.succeed(header) + case ZValidation.Success(log, header) => ZIO.succeed(header) case ZValidation.Failure(log, failure) => ZIO.fail(VCJwtHeaderParsingError(s"Extraction of JwtHeader failed ${failure.toChunk.toString}")) ed25519KeyPair <- getEd25519SigningKeyPair( @@ -1487,7 +1487,7 @@ class CredentialServiceImpl( ): IO[CredentialRequestValidationFailed, JwtPresentationPayload] = { for { _ <- maybeOptions match - case None => ZIO.unit + case None => ZIO.unit case Some(options) => JwtPresentation.validatePresentation(jwt, options.domain, options.challenge) match case ZValidation.Success(log, value) => ZIO.unit diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/LinkSecretServiceImpl.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/LinkSecretServiceImpl.scala index c379f4695e..f4432cfae3 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/LinkSecretServiceImpl.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/LinkSecretServiceImpl.scala @@ -20,7 +20,7 @@ class LinkSecretServiceImpl(genericSecretStorage: GenericSecretStorage) extends .get[String, AnoncredLinkSecret](LinkSecretServiceImpl.defaultLinkSecretId) .flatMap { case Some(secret) => ZIO.succeed(secret) - case None => + case None => val linkSecret = AnoncredLinkSecret() genericSecretStorage .set[String, AnoncredLinkSecret](LinkSecretServiceImpl.defaultLinkSecretId, linkSecret) diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala index 443995ad80..761800fc78 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceImpl.scala @@ -199,7 +199,7 @@ private class PresentationServiceImpl( mediaType = attachment.media_type, format = attachment.format.map { case PresentCredentialRequestFormat.SDJWT.name => PresentCredentialFormat.SDJWT.name - case format => + case format => throw throw RuntimeException( s"Unexpected PresentCredentialRequestFormat=$format. Expecting: ${PresentCredentialRequestFormat.SDJWT.name}" ) @@ -276,7 +276,7 @@ private class PresentationServiceImpl( mediaType = attachment.media_type, format = attachment.format.map { case PresentCredentialRequestFormat.Anoncred.name => PresentCredentialFormat.Anoncred.name - case format => + case format => throw throw RuntimeException( s"Unexpected PresentCredentialRequestFormat=$format. Expecting: ${PresentCredentialRequestFormat.Anoncred.name}" ) @@ -492,16 +492,16 @@ private class PresentationServiceImpl( ): ZIO[WalletAccessContext, PresentationError, PresentationRecord] = { for { format <- request.attachments match { - case Seq() => ZIO.fail(PresentationError.MissingCredential) + case Seq() => ZIO.fail(PresentationError.MissingCredential) case Seq(head) => val jsonF = PresentCredentialRequestFormat.JWT.name // stable identifier val anoncredF = PresentCredentialRequestFormat.Anoncred.name // stable identifier val sdjwtF = PresentCredentialRequestFormat.SDJWT.name // stable identifier head.format match - case None => ZIO.fail(PresentationError.MissingCredentialFormat) - case Some(`jsonF`) => ZIO.succeed(CredentialFormat.JWT) - case Some(`sdjwtF`) => ZIO.succeed(CredentialFormat.SDJWT) + case None => ZIO.fail(PresentationError.MissingCredentialFormat) + case Some(`jsonF`) => ZIO.succeed(CredentialFormat.JWT) + case Some(`sdjwtF`) => ZIO.succeed(CredentialFormat.SDJWT) case Some(`anoncredF`) => head.data match case Base64(data) => diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala index 70e6521da8..6d3a300b04 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/PresentationServiceNotifier.scala @@ -317,7 +317,7 @@ class PresentationServiceNotifier( ret <- svc.reportProcessingFailure(recordId, failReason) mRecordAfterFail <- presentationRepository.getPresentationRecordByDIDCommID(recordId) _ <- mRecordAfterFail match { - case None => ZIO.unit + case None => ZIO.unit case Some(recordAfterFail) => notifyOnFail(recordAfterFail, recordAfterFail.walletId) } diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/uriResolvers/DidUrlResolver.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/uriResolvers/DidUrlResolver.scala index 212ca7927d..6ddbaa22e9 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/uriResolvers/DidUrlResolver.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/uriResolvers/DidUrlResolver.scala @@ -57,7 +57,7 @@ class DidUrlResolver(httpUrlResolver: HttpUrlResolver, didResolver: DidResolver) validatedResult <- result.fromJson[PrismEnvelopeData] match { case Right(env) => validateResourceIntegrity(env, maybeResourceHash) - case Left(err) => + case Left(err) => ZIO.logDebug("Error parsing response as PrismEnvelope. Falling back to plain json") *> ZIO.succeed(result) } diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala index 53258b6ef5..bf4f40fb5a 100644 --- a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala +++ b/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/verification/VcVerificationServiceImpl.scala @@ -40,7 +40,7 @@ class VcVerificationServiceImpl(didResolver: DidResolver, uriResolver: UriResolv case VcVerification.SubjectVerification => verifySubjectVerification(credential) case VcVerification.SemanticCheckOfClaims => verifySemanticCheckOfClaims(credential) case VcVerification.AudienceCheck(aud) => verifyAudienceCheck(credential, aud) - case _ => + case _ => ZIO.fail( VcVerificationServiceError.UnexpectedError( s"Unsupported Verification:$verification" diff --git a/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala index 2fc7dccc2a..db9cf480e8 100644 --- a/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala +++ b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/repository/PresentationRepositoryInMemory.scala @@ -381,7 +381,7 @@ class PresentationRepositoryInMemory( ): UIO[Unit] = anyWalletStoreRefBy(recordId).flatMap { mStoreRef => mStoreRef match - case None => ZIO.succeed(0) + case None => ZIO.succeed(0) case Some(storeRef) => for { maybeRecord <- storeRef.get.map(store => store.get(recordId)) diff --git a/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/QueryUtils.scala b/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/QueryUtils.scala index 93a9ac0cfd..4282ed4838 100644 --- a/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/QueryUtils.scala +++ b/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/QueryUtils.scala @@ -14,7 +14,7 @@ private[sdjwt] object QueryUtils { case value: Str => Seq((cursor, value)) case value: Num => Seq((cursor, value)) case Json.Null => Seq((cursor, Json.Null)) - case Arr(elements) => + case Arr(elements) => elements.zipWithIndex.flatMap { case (json, index) => val nextCursor = cursor.isArray.element(index) getCursors(json, nextCursor) diff --git a/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/SDJWT.scala b/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/SDJWT.scala index 4fb19e0dbb..d80c515bd6 100644 --- a/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/SDJWT.scala +++ b/pollux/sd-jwt/src/main/scala/org/hyperledger/identus/pollux/sdjwt/SDJWT.scala @@ -148,7 +148,7 @@ object SDJWT { case Failure(ex: SdjwtException.Unspecified) if ex.getMessage() == "invalid state: Requested claim doesn't exist" => InvalidToken - case Failure(ex) => InvalidError(ex.getMessage()) + case Failure(ex) => InvalidError(ex.getMessage()) case Success(claims) => claims.fromJson[Json] match case Left(value) => InvalidClaimsIsNotJsonObj @@ -179,7 +179,7 @@ object SDJWT { InvalidSignature case Failure(ex: SdjwtException.Unspecified) if ex.getMessage() == "invalid input: InvalidToken" => InvalidToken - case Failure(ex) => InvalidError(ex.getMessage()) + case Failure(ex) => InvalidError(ex.getMessage()) case Success(claims) => claims.fromJson[Json] match case Left(value) => InvalidClaimsIsNotJsonObj diff --git a/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/JWTVerification.scala b/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/JWTVerification.scala index 3899575ac1..a875e3e5ee 100644 --- a/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/JWTVerification.scala +++ b/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/JWTVerification.scala @@ -134,7 +134,7 @@ object JWTVerification { def toECDSAVerifier(publicKey: PublicKey): JWSVerifier = { val verifier: JWSVerifier = publicKey match { - case key: ECPublicKey => ECDSAVerifier(key) + case key: ECPublicKey => ECDSAVerifier(key) case key: EdECPublicKey => val octetKeyPair = Ed25519PublicKey.toPublicKeyOctetKeyPair(key) Ed25519Verifier(octetKeyPair) @@ -152,7 +152,7 @@ object JWTVerification { parsedJwt.verify(verifier) } match { case Failure(exception) => Validation.fail(s"Jwt[$jwt] verification pre-process failed: ${exception.getMessage}") - case Success(isValid) => + case Success(isValid) => if isValid then Validation.unit else Validation.fail(s"Jwt[$jwt] not singed by $publicKey") } } diff --git a/shared/core/src/main/scala/org/hyperledger/identus/shared/messaging/kafka/InMemoryMessagingService.scala b/shared/core/src/main/scala/org/hyperledger/identus/shared/messaging/kafka/InMemoryMessagingService.scala index e523cf2bfa..f93f1f15aa 100644 --- a/shared/core/src/main/scala/org/hyperledger/identus/shared/messaging/kafka/InMemoryMessagingService.scala +++ b/shared/core/src/main/scala/org/hyperledger/identus/shared/messaging/kafka/InMemoryMessagingService.scala @@ -57,7 +57,7 @@ class InMemoryConsumer[K, V]( key = ConsumerGroupKey(groupId, topic) topicProcessedMessages <- processedMessagesMap.get(key).flatMap { case Some(map) => ZIO.succeed(map) - case None => + case None => for { newMap <- ConcurrentMap.empty[Offset, TimeStamp] _ <- processedMessagesMap.put(key, newMap) @@ -81,7 +81,7 @@ class InMemoryProducer[K, V]( override def produce(topic: String, key: K, value: V): Task[Unit] = for { queueAndOffsetRef <- topicQueues.get(topic).flatMap { case Some(qAndOffSetRef) => ZIO.succeed(qAndOffSetRef) - case None => + case None => for { newQueue <- Queue.sliding[Message[_, _]](queueCapacity) newOffSetRef <- Ref.make(Offset(0L)) diff --git a/shared/core/src/main/scala/org/hyperledger/identus/shared/validation/ValidationUtils.scala b/shared/core/src/main/scala/org/hyperledger/identus/shared/validation/ValidationUtils.scala index 455ef82e88..a71ad7c919 100644 --- a/shared/core/src/main/scala/org/hyperledger/identus/shared/validation/ValidationUtils.scala +++ b/shared/core/src/main/scala/org/hyperledger/identus/shared/validation/ValidationUtils.scala @@ -11,7 +11,7 @@ object ValidationUtils { max: Int ): Validation[String, Option[String]] = { value match - case None => Validation.succeed(value) + case None => Validation.succeed(value) case Some(v) => val len = v.length if (min <= len && max >= len) Validation.succeed(value) From 7f1584280234372ee708279edbff750ba0696ad5 Mon Sep 17 00:00:00 2001 From: Pat Losoponkul Date: Thu, 8 Jan 2026 14:55:45 +0700 Subject: [PATCH 6/6] chore: downgrade sbt-scalafmt plugin to 2.5.5 Signed-off-by: Pat Losoponkul --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cbaaac274b..cf4347b188 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4")