Skip to content

Commit

Permalink
public config fields
Browse files Browse the repository at this point in the history
  • Loading branch information
volodymyr-basiuk committed Jan 12, 2024
1 parent 588f5e2 commit 1ae002a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
14 changes: 7 additions & 7 deletions verifiable/credential.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (vc *W3CCredential) VerifyProof(proofType ProofType, opts ...W3CProofVerifi
o(&verifyConfig)
}

if verifyConfig.resolverURL == "" {
if verifyConfig.ResolverURL == "" {
return false, errors.New("resolver URL is empty")
}

Expand Down Expand Up @@ -76,7 +76,7 @@ func (vc *W3CCredential) VerifyProof(proofType ProofType, opts ...W3CProofVerifi

usedDID := vc.CredentialSubject["id"]

return verifyBJJSignatureProof(proof, coreClaim, fmt.Sprintf("%v", usedDID), verifyConfig.resolverURL, verifyConfig.credentialStatusOpts...)
return verifyBJJSignatureProof(proof, coreClaim, fmt.Sprintf("%v", usedDID), verifyConfig.ResolverURL, verifyConfig.CredentialStatusOpts...)
case Iden3SparseMerkleTreeProofType:
var proof Iden3SparseMerkleTreeProof
credProofJ, err := json.Marshal(credProof)
Expand All @@ -87,7 +87,7 @@ func (vc *W3CCredential) VerifyProof(proofType ProofType, opts ...W3CProofVerifi
if err != nil {
return false, err
}
return verifyIden3SparseMerkleTreeProof(proof, coreClaim, verifyConfig.resolverURL)
return verifyIden3SparseMerkleTreeProof(proof, coreClaim, verifyConfig.ResolverURL)
default:
return false, ErrProofNotFound
}
Expand Down Expand Up @@ -380,14 +380,14 @@ type Issuer struct {
// WithStatusOpts return new options
func WithStatusOpts(credentialStatusOpts []CredentialStatusOpt) W3CProofVerificationOpt {
return func(opts *W3CProofVerificationConfig) {
opts.credentialStatusOpts = credentialStatusOpts
opts.CredentialStatusOpts = credentialStatusOpts
}
}

// WithResolverURL return new options
func WithResolverURL(resolverURL string) W3CProofVerificationOpt {
return func(opts *W3CProofVerificationConfig) {
opts.resolverURL = resolverURL
opts.ResolverURL = resolverURL
}
}

Expand All @@ -396,6 +396,6 @@ type W3CProofVerificationOpt func(opts *W3CProofVerificationConfig)

// W3CProofVerificationConfig options for W3C proof verification
type W3CProofVerificationConfig struct {
credentialStatusOpts []CredentialStatusOpt
resolverURL string
CredentialStatusOpts []CredentialStatusOpt
ResolverURL string
}
22 changes: 11 additions & 11 deletions verifiable/credential_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,35 @@ type CredStatusStateResolver interface {
// WithStatusResolverRegistry return new options
func WithStatusResolverRegistry(registry *CredentialStatusResolverRegistry) CredentialStatusOpt {
return func(opts *CredentialStatusConfig) {
opts.statusResolverRegistry = registry
opts.StatusResolverRegistry = registry
}
}

// WithStateResolver return new options
func WithStateResolver(resolver CredStatusStateResolver) CredentialStatusOpt {
return func(opts *CredentialStatusConfig) {
opts.stateResolver = resolver
opts.StateResolver = resolver
}
}

// WithPackageManager return new options
func WithPackageManager(pm *iden3comm.PackageManager) CredentialStatusOpt {
return func(opts *CredentialStatusConfig) {
opts.packageManager = pm
opts.PackageManager = pm
}
}

// WithUserDID return new options
func WithUserDID(userDID *string) CredentialStatusOpt {
return func(opts *CredentialStatusConfig) {
opts.userDID = userDID
opts.UserDID = userDID
}
}

// WithIssuerDID return new options
func WithIssuerDID(issuerDID *string) CredentialStatusOpt {
return func(opts *CredentialStatusConfig) {
opts.issuerDID = issuerDID
opts.IssuerDID = issuerDID
}
}

Expand All @@ -69,11 +69,11 @@ type CredentialStatusOpt func(opts *CredentialStatusConfig)

// CredentialStatusConfig options for credential status verification
type CredentialStatusConfig struct {
statusResolverRegistry *CredentialStatusResolverRegistry
stateResolver CredStatusStateResolver
packageManager *iden3comm.PackageManager
userDID *string
issuerDID *string
StatusResolverRegistry *CredentialStatusResolverRegistry
StateResolver CredStatusStateResolver
PackageManager *iden3comm.PackageManager
UserDID *string
IssuerDID *string
}

var idsInStateContract = map[core.ID]bool{}
Expand Down Expand Up @@ -174,7 +174,7 @@ func resolveRevStatus(status interface{}, config CredentialStatusConfig) (out Re
errors.New("unknown credential status format")
}

resolver, err := config.statusResolverRegistry.Get(statusType)
resolver, err := config.StatusResolverRegistry.Get(statusType)
if err != nil {
return out, err
}
Expand Down
8 changes: 4 additions & 4 deletions verifiable/status_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func (AgentResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig
msg := iden3comm.BasicMessage{
ID: uuid.New().String(),
ThreadID: uuid.New().String(),
From: *cfg.userDID,
To: *cfg.issuerDID,
From: *cfg.UserDID,
To: *cfg.IssuerDID,
Type: revocationStatusRequestMessageType,
Body: rawBody,
}
Expand All @@ -56,7 +56,7 @@ func (AgentResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig
return out, errors.WithStack(err)
}

iden3commMsg, err := cfg.packageManager.Pack(mediaTypePlainMessage, bytesMsg, nil)
iden3commMsg, err := cfg.PackageManager.Pack(mediaTypePlainMessage, bytesMsg, nil)
if err != nil {
return out, errors.WithStack(err)
}
Expand All @@ -81,7 +81,7 @@ func (AgentResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig
return out, errors.WithStack(err)
}

basicMessage, _, err := cfg.packageManager.Unpack(b)
basicMessage, _, err := cfg.PackageManager.Unpack(b)
if err != nil {
return out, errors.WithStack(err)
}
Expand Down
9 changes: 4 additions & 5 deletions verifiable/status_on_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type OnChainResolver struct {
}

func (*OnChainResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig) (out RevocationStatus, err error) {
parsedIssuerDID, err := w3c.ParseDID(*cfg.issuerDID)
parsedIssuerDID, err := w3c.ParseDID(*cfg.IssuerDID)
if err != nil {
return out, err
}
Expand All @@ -45,15 +45,14 @@ func (*OnChainResolver) Resolve(status CredentialStatus, cfg CredentialStatusCon
onchainRevStatus.revNonce, status.RevocationNonce)
}

isStateContractHasID, err := stateContractHasID(&issuerID, cfg.stateResolver)
isStateContractHasID, err := stateContractHasID(&issuerID, cfg.StateResolver)
if err != nil {
return out, err
}

var resp RevocationStatus
if isStateContractHasID {
// TODO: it is not finial version of contract GetRevocationProof must accept issuer id as parameter
resp, err = cfg.stateResolver.GetRevocationStatus(issuerID.BigInt(),
resp, err = cfg.StateResolver.GetRevocationStatus(issuerID.BigInt(),
onchainRevStatus.revNonce)
if err != nil {
msg := err.Error()
Expand All @@ -69,7 +68,7 @@ func (*OnChainResolver) Resolve(status CredentialStatus, cfg CredentialStatusCon
return out, errors.New(
"genesis state is not specified in OnChainCredentialStatus ID")
}
resp, err = cfg.stateResolver.GetRevocationStatusByIDAndState(
resp, err = cfg.StateResolver.GetRevocationStatusByIDAndState(
issuerID.BigInt(), onchainRevStatus.genesisState,
onchainRevStatus.revNonce)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions verifiable/status_rhs.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type RHSResolver struct {
}

func (RHSResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig) (out RevocationStatus, err error) {
parsedIssuerDID, err := w3c.ParseDID(*cfg.issuerDID)
parsedIssuerDID, err := w3c.ParseDID(*cfg.IssuerDID)
if err != nil {
return out, err
}
Expand All @@ -36,7 +36,7 @@ func (RHSResolver) Resolve(status CredentialStatus, cfg CredentialStatusConfig)
return out, err
}

state, err := identityStateForRHS(cfg.stateResolver, &issuerID, genesisState)
state, err := identityStateForRHS(cfg.StateResolver, &issuerID, genesisState)
if err != nil {
return out, err
}
Expand Down

0 comments on commit 1ae002a

Please sign in to comment.