From c2fe2c9410fc55b9cba36b087172f791d5ca781f Mon Sep 17 00:00:00 2001 From: Ilya Date: Fri, 21 Jun 2024 11:20:30 +0300 Subject: [PATCH] remove auth publishing flag --- cmd/issuer_initializer/main.go | 2 +- cmd/notifications/main.go | 2 +- cmd/pending_publisher/main.go | 2 +- cmd/platform/main.go | 2 +- cmd/platform_ui/main.go | 2 +- internal/api/main_test.go | 3 -- internal/api/server_test.go | 16 +++--- internal/api_ui/main_test.go | 3 -- internal/api_ui/server_test.go | 46 ++++++++--------- internal/config/config.go | 8 --- internal/core/services/identity.go | 50 +++++++++---------- internal/core/services/tests/identity_test.go | 4 +- internal/core/services/tests/link_test.go | 2 +- internal/core/services/tests/main_test.go | 2 - .../core/services/tests/notification_test.go | 2 +- 15 files changed, 64 insertions(+), 82 deletions(-) diff --git a/cmd/issuer_initializer/main.go b/cmd/issuer_initializer/main.go index 53dbe12fb..6ca778004 100644 --- a/cmd/issuer_initializer/main.go +++ b/cmd/issuer_initializer/main.go @@ -147,7 +147,7 @@ func main() { rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), ethConn, common.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) cfg.CredentialStatus.SingleIssuer = true - identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, nil, claimsRepository, nil, nil, storage, nil, nil, nil, cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, nil, claimsRepository, nil, nil, storage, nil, nil, nil, cfg.CredentialStatus, rhsFactory, revocationStatusResolver) didCreationOptions := &ports.DIDCreationOptions{ Method: core.DIDMethod(cfg.APIUI.IdentityMethod), diff --git a/cmd/notifications/main.go b/cmd/notifications/main.go index d55ada7ce..0dbb299cf 100644 --- a/cmd/notifications/main.go +++ b/cmd/notifications/main.go @@ -190,7 +190,7 @@ func newCredentialsService(ctx context.Context, cfg *config.Configuration, stora *cfg.MediaTypeManager.Enabled, ) - identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, nil, storage, nil, nil, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, nil, storage, nil, nil, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver) claimsService := services.NewClaim(claimsRepository, identityService, qrService, mtService, identityStateRepository, schemaLoader, storage, cfg.APIUI.ServerURL, ps, cfg.IPFS.GatewayURL, revocationStatusResolver, mediaTypeManager) return claimsService, nil diff --git a/cmd/pending_publisher/main.go b/cmd/pending_publisher/main.go index 2490b5a23..9f6eff001 100644 --- a/cmd/pending_publisher/main.go +++ b/cmd/pending_publisher/main.go @@ -171,7 +171,7 @@ func main() { *cfg.MediaTypeManager.Enabled, ) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) claimsService := services.NewClaim(claimsRepo, identityService, qrService, mtService, identityStateRepo, schemaLoader, storage, cfg.APIUI.ServerURL, ps, cfg.IPFS.GatewayURL, revocationStatusResolver, mediaTypeManager) circuitsLoaderService := circuitLoaders.NewCircuits(cfg.Circuit.Path) diff --git a/cmd/platform/main.go b/cmd/platform/main.go index ed432fc13..e08f1d9c6 100644 --- a/cmd/platform/main.go +++ b/cmd/platform/main.go @@ -154,7 +154,7 @@ func main() { ) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, nil, storage, nil, nil, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, nil, storage, nil, nil, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver) claimsService := services.NewClaim(claimsRepository, identityService, qrService, mtService, identityStateRepository, schemaLoader, storage, cfg.ServerUrl, ps, cfg.IPFS.GatewayURL, revocationStatusResolver, mediaTypeManager) proofService := gateways.NewProver(ctx, cfg, circuitsLoaderService) diff --git a/cmd/platform_ui/main.go b/cmd/platform_ui/main.go index 1f1a91c85..2d8eb1948 100644 --- a/cmd/platform_ui/main.go +++ b/cmd/platform_ui/main.go @@ -186,7 +186,7 @@ func main() { ) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, connectionsRepository, storage, verifier, sessionRepository, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepository, mtRepository, identityStateRepository, mtService, qrService, claimsRepository, revocationRepository, connectionsRepository, storage, verifier, sessionRepository, ps, cfg.CredentialStatus, rhsFactory, revocationStatusResolver) schemaService := services.NewSchema(schemaRepository, schemaLoader) claimsService := services.NewClaim(claimsRepository, identityService, qrService, mtService, identityStateRepository, schemaLoader, storage, cfg.APIUI.ServerURL, ps, cfg.IPFS.GatewayURL, revocationStatusResolver, mediaTypeManager) connectionsService := services.NewConnection(connectionsRepository, claimsRepository, storage) diff --git a/internal/api/main_test.go b/internal/api/main_test.go index ac1bad0d2..fd59a0d4a 100644 --- a/internal/api/main_test.go +++ b/internal/api/main_test.go @@ -12,7 +12,6 @@ import ( "github.com/iden3/iden3comm/v2" "github.com/piprate/json-gold/ld" - "github.com/polygonid/sh-id-platform/internal/common" "github.com/polygonid/sh-id-platform/internal/config" "github.com/polygonid/sh-id-platform/internal/core/ports" "github.com/polygonid/sh-id-platform/internal/db" @@ -108,8 +107,6 @@ func TestMain(m *testing.M) { URL: "http://localhost:3001", }, } - cfg.AutoPublishingToOnChainRHS = common.ToPointer[bool](true) - m.Run() } diff --git a/internal/api/server_test.go b/internal/api/server_test.go index 29243219f..769efbd38 100644 --- a/internal/api/server_test.go +++ b/internal/api/server_test.go @@ -53,7 +53,7 @@ func TestServer_CreateIdentity(t *testing.T) { rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -257,7 +257,7 @@ func TestServer_RevokeClaim(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -423,7 +423,7 @@ func TestServer_CreateClaim(t *testing.T) { rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) pubSub := pubsub.NewMock() claimsService := services.NewClaim(claimsRepo, identityService, nil, mtService, identityStateRepo, schemaLoader, storage, cfg.CredentialStatus.Iden3CommAgentStatus.GetURL(), pubSub, ipfsGatewayURL, revocationStatusResolver, mediaTypeManager) accountService := services.NewAccountService(cfg.Ethereum, keyStore) @@ -601,7 +601,7 @@ func TestServer_GetIdentities(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -681,7 +681,7 @@ func TestServer_GetClaimQrCode(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) idStr := "did:polygonid:polygon:mumbai:2qPrv5Yx8s1qAmEnPym68LfT7gTbASGampiGU7TseL" idNoClaims := "did:polygonid:polygon:mumbai:2qGjTUuxZKqKS4Q8UmxHUPw55g15QgEVGnj6Wkq8Vk" @@ -834,7 +834,7 @@ func TestServer_GetClaim(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1017,7 +1017,7 @@ func TestServer_GetClaims(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1372,7 +1372,7 @@ func TestServer_GetRevocationStatus(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.GetURL(), nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) identity, err := identityService.Create(ctx, "http://localhost:3001", &ports.DIDCreationOptions{Method: method, Blockchain: blockchain, Network: network, KeyType: BJJ}) assert.NoError(t, err) diff --git a/internal/api_ui/main_test.go b/internal/api_ui/main_test.go index fc8a053a6..d93c596ea 100644 --- a/internal/api_ui/main_test.go +++ b/internal/api_ui/main_test.go @@ -15,7 +15,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/polygonid/sh-id-platform/internal/common" "github.com/polygonid/sh-id-platform/internal/config" "github.com/polygonid/sh-id-platform/internal/core/ports" "github.com/polygonid/sh-id-platform/internal/db" @@ -93,8 +92,6 @@ func TestMain(m *testing.M) { URL: "http://localhost:3001", }, } - cfg.AutoPublishingToOnChainRHS = common.ToPointer[bool](true) - schemaLoader = loader.NewDocumentLoader(ipfsGatewayURL) m.Run() diff --git a/internal/api_ui/server_test.go b/internal/api_ui/server_test.go index 43162084d..dbc945847 100644 --- a/internal/api_ui/server_test.go +++ b/internal/api_ui/server_test.go @@ -49,7 +49,7 @@ func TestServer_CheckStatus(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) schemaService := services.NewSchema(repositories.NewSchema(*storage), schemaLoader) mediaTypeManager := services.NewMediaTypeManager( @@ -241,7 +241,7 @@ func TestServer_AuthQRCode(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, sessionRepository, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, sessionRepository, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) server := NewServer(&cfg, identityService, NewClaimsMock(), NewSchemaMock(), NewConnectionsMock(), NewLinkMock(), qrService, NewPublisherMock(), NewPackageManagerMock(), nil) issuerDID, err := w3c.ParseDID("did:polygonid:polygon:mumbai:2qE1BZ7gcmEoP2KppvFPCZqyzyb5tK9T6Gec5HFANQ") require.NoError(t, err) @@ -815,7 +815,7 @@ func TestServer_DeleteConnection(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1074,7 +1074,7 @@ func TestServer_RevokeConnectionCredentials(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1194,7 +1194,7 @@ func TestServer_CreateCredential(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) pubSub := pubsub.NewMock() mediaTypeManager := services.NewMediaTypeManager( @@ -1380,7 +1380,7 @@ func TestServer_DeleteCredential(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1492,7 +1492,7 @@ func TestServer_GetCredential(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -1693,7 +1693,7 @@ func TestServer_GetCredentials(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -2170,7 +2170,7 @@ func TestServer_GetCredentialQrCode(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -2333,7 +2333,7 @@ func TestServer_GetConnection(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -2527,7 +2527,7 @@ func TestServer_GetConnections(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -3214,7 +3214,7 @@ func TestServer_RevokeCredential(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(&KMSMock{}, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -3363,7 +3363,7 @@ func TestServer_CreateLink(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) pubSub := pubsub.NewMock() mediaTypeManager := services.NewMediaTypeManager( @@ -3598,7 +3598,7 @@ func TestServer_ActivateLink(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -3756,7 +3756,7 @@ func TestServer_GetLink(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -3941,7 +3941,7 @@ func TestServer_GetAllLinks(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4184,7 +4184,7 @@ func TestServer_DeleteLink(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4308,7 +4308,7 @@ func TestServer_DeleteLinkForDifferentDID(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4430,7 +4430,7 @@ func TestServer_CreateLinkQRCode(t *testing.T) { sessionRepository := repositories.NewSessionCached(cachex) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4592,7 +4592,7 @@ func TestServer_GetLinkQRCode(t *testing.T) { revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) qrService := services.NewQrStoreService(cachex) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, qrService, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4782,7 +4782,7 @@ func TestServer_GetStateStatus(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -4940,7 +4940,7 @@ func TestServer_GetStateTransactions(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -5035,7 +5035,7 @@ func TestServer_GetRevocationStatus(t *testing.T) { connectionsRepository := repositories.NewConnections() revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) pubSub := pubsub.NewMock() mediaTypeManager := services.NewMediaTypeManager( diff --git a/internal/config/config.go b/internal/config/config.go index 700f73bfb..f4945c844 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -50,7 +50,6 @@ type Configuration struct { VaultUserPassAuthPassword string CredentialStatus CredentialStatus `mapstructure:"CredentialStatus"` CustomDIDMethods []CustomDIDMethods `mapstructure:"-"` - AutoPublishingToOnChainRHS *bool `mapstructure:"AutoPublishingToOnChainRHS"` MediaTypeManager MediaTypeManager `mapstructure:"MediaTypeManager"` } @@ -514,8 +513,6 @@ func bindEnv() { _ = viper.BindEnv("ISSUER_CUSTOM_DID_METHODS") - _ = viper.BindEnv("AutoPublishingToOnChainRHS", "ISSUER_AUTO_PUBLISHING_TO_ON_CHAIN_RHS") - _ = viper.BindEnv("MediaTypeManager.Enabled", "ISSUER_MEDIA_TYPE_MANAGER_ENABLED") viper.AutomaticEnv() @@ -637,11 +634,6 @@ func checkEnvVars(ctx context.Context, cfg *Configuration) { cfg.SchemaCache = common.ToPointer(false) } - if cfg.AutoPublishingToOnChainRHS == nil { - log.Info(ctx, "AutoPublishingToOnChainRHS is missing and the server set up it as true") - cfg.AutoPublishingToOnChainRHS = common.ToPointer(true) - } - if cfg.MediaTypeManager.Enabled == nil { log.Info(ctx, "ISSUER_MEDIA_TYPE_MANAGER_ENABLED is missing and the server set up it as true") cfg.MediaTypeManager.Enabled = common.ToPointer(true) diff --git a/internal/core/services/identity.go b/internal/core/services/identity.go index bbfde530d..ced8c10d5 100644 --- a/internal/core/services/identity.go +++ b/internal/core/services/identity.go @@ -73,36 +73,34 @@ type identity struct { kms kms.KMSType verifier *auth.Verifier - ignoreRHSErrors bool - pubsub pubsub.Publisher - revocationStatusResolver *revocation_status.RevocationStatusResolver - credentialStatusSettings config.CredentialStatus - rhsFactory reverse_hash.Factory - autoPublishingToOnChainRHS bool + ignoreRHSErrors bool + pubsub pubsub.Publisher + revocationStatusResolver *revocation_status.RevocationStatusResolver + credentialStatusSettings config.CredentialStatus + rhsFactory reverse_hash.Factory } // NewIdentity creates a new identity // nolint -func NewIdentity(kms kms.KMSType, identityRepository ports.IndentityRepository, imtRepository ports.IdentityMerkleTreeRepository, identityStateRepository ports.IdentityStateRepository, mtservice ports.MtService, qrService ports.QrStoreService, claimsRepository ports.ClaimsRepository, revocationRepository ports.RevocationRepository, connectionsRepository ports.ConnectionsRepository, storage *db.Storage, verifier *auth.Verifier, sessionRepository ports.SessionRepository, ps pubsub.Client, credentialStatusSettings config.CredentialStatus, rhsFactory reverse_hash.Factory, revocationStatusResolver *revocation_status.RevocationStatusResolver, autoPublishingToOnChainRHS bool) ports.IdentityService { +func NewIdentity(kms kms.KMSType, identityRepository ports.IndentityRepository, imtRepository ports.IdentityMerkleTreeRepository, identityStateRepository ports.IdentityStateRepository, mtservice ports.MtService, qrService ports.QrStoreService, claimsRepository ports.ClaimsRepository, revocationRepository ports.RevocationRepository, connectionsRepository ports.ConnectionsRepository, storage *db.Storage, verifier *auth.Verifier, sessionRepository ports.SessionRepository, ps pubsub.Client, credentialStatusSettings config.CredentialStatus, rhsFactory reverse_hash.Factory, revocationStatusResolver *revocation_status.RevocationStatusResolver) ports.IdentityService { return &identity{ - identityRepository: identityRepository, - imtRepository: imtRepository, - identityStateRepository: identityStateRepository, - claimsRepository: claimsRepository, - revocationRepository: revocationRepository, - connectionsRepository: connectionsRepository, - sessionManager: sessionRepository, - storage: storage, - mtService: mtservice, - qrService: qrService, - kms: kms, - ignoreRHSErrors: false, - verifier: verifier, - pubsub: ps, - credentialStatusSettings: credentialStatusSettings, - rhsFactory: rhsFactory, - revocationStatusResolver: revocationStatusResolver, - autoPublishingToOnChainRHS: autoPublishingToOnChainRHS, + identityRepository: identityRepository, + imtRepository: imtRepository, + identityStateRepository: identityStateRepository, + claimsRepository: claimsRepository, + revocationRepository: revocationRepository, + connectionsRepository: connectionsRepository, + sessionManager: sessionRepository, + storage: storage, + mtService: mtservice, + qrService: qrService, + kms: kms, + ignoreRHSErrors: false, + verifier: verifier, + pubsub: ps, + credentialStatusSettings: credentialStatusSettings, + rhsFactory: rhsFactory, + revocationStatusResolver: revocationStatusResolver, } } @@ -749,7 +747,7 @@ func (i *identity) createIdentity(ctx context.Context, tx db.Querier, hostURL st return nil, nil, fmt.Errorf("can't create RHS publisher: %w", err) } - if len(rhsPublishers) > 0 && !(rhsMode == reverse_hash.RHSModeOnChain && !i.autoPublishingToOnChainRHS) { + if len(rhsPublishers) > 0 { log.Info(ctx, "publishing state to RHS", "publishers", len(rhsPublishers)) for _, rhsPublisher := range rhsPublishers { err := rhsPublisher.PublishNodesToRHS(ctx, []mtproof.Node{ diff --git a/internal/core/services/tests/identity_test.go b/internal/core/services/tests/identity_test.go index 011f3f0ec..598aa7e08 100644 --- a/internal/core/services/tests/identity_test.go +++ b/internal/core/services/tests/identity_test.go @@ -43,7 +43,7 @@ func Test_identity_UpdateState(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{ @@ -231,7 +231,7 @@ func Test_identity_GetByDID(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) identity, err := identityService.Create(ctx, "polygon-test", &ports.DIDCreationOptions{Method: method, Blockchain: blockchain, Network: network, KeyType: BJJ}) assert.NoError(t, err) diff --git a/internal/core/services/tests/link_test.go b/internal/core/services/tests/link_test.go index 3a7c5adb8..be3c8b606 100644 --- a/internal/core/services/tests/link_test.go +++ b/internal/core/services/tests/link_test.go @@ -39,7 +39,7 @@ func Test_link_issueClaim(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) sessionRepository := repositories.NewSessionCached(cachex) schemaService := services.NewSchema(schemaRepository, docLoader) diff --git a/internal/core/services/tests/main_test.go b/internal/core/services/tests/main_test.go index 3e9be27c7..a0bac0440 100644 --- a/internal/core/services/tests/main_test.go +++ b/internal/core/services/tests/main_test.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/vault/api" - "github.com/polygonid/sh-id-platform/internal/common" "github.com/polygonid/sh-id-platform/internal/config" "github.com/polygonid/sh-id-platform/internal/db" "github.com/polygonid/sh-id-platform/internal/db/tests" @@ -93,7 +92,6 @@ func TestMain(m *testing.M) { docLoader = loader.NewDocumentLoader(ipfsGatewayURL) - cfg.AutoPublishingToOnChainRHS = common.ToPointer[bool](true) cfg.CredentialStatus = config.CredentialStatus{ RHSMode: "None", Iden3CommAgentStatus: config.Iden3CommAgentStatus{ diff --git a/internal/core/services/tests/notification_test.go b/internal/core/services/tests/notification_test.go index a128c4459..4e221ddce 100644 --- a/internal/core/services/tests/notification_test.go +++ b/internal/core/services/tests/notification_test.go @@ -43,7 +43,7 @@ func TestNotification_SendNotification(t *testing.T) { connectionsRepository := repositories.NewConnections() rhsFactory := reverse_hash.NewFactory(cfg.CredentialStatus.RHS.URL, nil, commonEth.HexToAddress(cfg.CredentialStatus.OnchainTreeStore.SupportedTreeStoreContract), reverse_hash.DefaultRHSTimeOut) revocationStatusResolver := revocation_status.NewRevocationStatusResolver(cfg.CredentialStatus) - identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver, *cfg.AutoPublishingToOnChainRHS) + identityService := services.NewIdentity(keyStore, identityRepo, mtRepo, identityStateRepo, mtService, nil, claimsRepo, revocationRepository, connectionsRepository, storage, nil, nil, pubsub.NewMock(), cfg.CredentialStatus, rhsFactory, revocationStatusResolver) mediaTypeManager := services.NewMediaTypeManager( map[iden3comm.ProtocolMessage][]string{