[FAB-8683] Split IdentityManager and CAClient

CA Client interface is separated from IdentityManager.

Change-Id: Iafcccac078171b343bb0305de6aba929559ca7e9
Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>

Makefile

@@ -327,6 +327,7 @@ dockerenv-latest-up: clean
 .PHONY: mock-gen
 mock-gen:
 	mockgen -build_flags '$(GO_LDFLAGS_ARG)' github.com/hyperledger/fabric-sdk-go/pkg/context/api/core Config,Providers,IdentityManager | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g" | goimports > pkg/context/api/core/mocks/mockcoreapi.gen.go
+	mockgen -build_flags '$(GO_LDFLAGS_ARG)' github.com/hyperledger/fabric-sdk-go/pkg/context/api/msp Client | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g" | goimports > pkg/context/api/msp/mocks/mockmspapi.gen.go
 	mockgen -build_flags '$(GO_LDFLAGS_ARG)' github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab ProposalProcessor,Providers | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g" | goimports > pkg/context/api/fab/mocks/mockfabapi.gen.go
 	mockgen -build_flags '$(GO_LDFLAGS_ARG)' github.com/hyperledger/fabric-sdk-go/pkg/common/context Providers,Client | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g" | goimports > pkg/common/context/mocks/mockcontext.gen.go
 	mockgen -build_flags '$(GO_LDFLAGS_ARG)' github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api CoreProviderFactory,ServiceProviderFactory | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g" | goimports > pkg/fabsdk/mocks/mockfabsdkapi.gen.go

pkg/context/api/core/identitymgr.go

@@ -27,76 +27,4 @@ type SigningIdentity struct {
 type IdentityManager interface {
 	GetSigningIdentity(name string) (*SigningIdentity, error)
 	GetUser(name string) (User, error)
-	Enroll(enrollmentID string, enrollmentSecret string) error
-	Reenroll(user User) error
-	Register(request *RegistrationRequest) (string, error)
-	Revoke(request *RevocationRequest) (*RevocationResponse, error)
-	CAName() string
-}
-
-// AttributeRequest is a request for an attribute.
-type AttributeRequest struct {
-	Name     string
-	Optional bool
-}
-
-// RegistrationRequest defines the attributes required to register a user with the CA
-type RegistrationRequest struct {
-	// Name is the unique name of the identity
-	Name string
-	// Type of identity being registered (e.g. "peer, app, user")
-	Type string
-	// MaxEnrollments is the number of times the secret can  be reused to enroll.
-	// if omitted, this defaults to max_enrollments configured on the server
-	MaxEnrollments int
-	// The identity's affiliation e.g. org1.department1
-	Affiliation string
-	// Optional attributes associated with this identity
-	Attributes []Attribute
-	// CAName is the name of the CA to connect to
-	CAName string
-	// Secret is an optional password.  If not specified,
-	// a random secret is generated.  In both cases, the secret
-	// is returned from registration.
-	Secret string
-}
-
-// Attribute defines additional attributes that may be passed along during registration
-type Attribute struct {
-	Name  string
-	Key   string
-	Value string
-}
-
-// RevocationRequest defines the attributes required to revoke credentials with the CA
-type RevocationRequest struct {
-	// Name of the identity whose certificates should be revoked
-	// If this field is omitted, then Serial and AKI must be specified.
-	Name string
-	// Serial number of the certificate to be revoked
-	// If this is omitted, then Name must be specified
-	Serial string
-	// AKI (Authority Key Identifier) of the certificate to be revoked
-	AKI string
-	// Reason is the reason for revocation. See https://godoc.org/golang.org/x/crypto/ocsp
-	// for valid values. The default value is 0 (ocsp.Unspecified).
-	Reason string
-	// CAName is the name of the CA to connect to
-	CAName string
-}
-
-// RevocationResponse represents response from the server for a revocation request
-type RevocationResponse struct {
-	// RevokedCerts is an array of certificates that were revoked
-	RevokedCerts []RevokedCert
-	// CRL is PEM-encoded certificate revocation list (CRL) that contains all unexpired revoked certificates
-	CRL []byte
-}
-
-// RevokedCert represents a revoked certificate
-type RevokedCert struct {
-	// Serial number of the revoked certificate
-	Serial string
-	// AKI of the revoked certificate
-	AKI string
 }

pkg/context/api/msp/client.go

@@ -0,0 +1,87 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package msp
+
+import (
+	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
+)
+
+// Client provides management of identities in a Fabric network
+type Client interface {
+	CAName() string
+	Enroll(enrollmentID string, enrollmentSecret string) error
+	Reenroll(user core.User) error
+	Register(request *RegistrationRequest) (string, error)
+	Revoke(request *RevocationRequest) (*RevocationResponse, error)
+}
+
+// AttributeRequest is a request for an attribute.
+type AttributeRequest struct {
+	Name     string
+	Optional bool
+}
+
+// RegistrationRequest defines the attributes required to register a user with the CA
+type RegistrationRequest struct {
+	// Name is the unique name of the identity
+	Name string
+	// Type of identity being registered (e.g. "peer, app, user")
+	Type string
+	// MaxEnrollments is the number of times the secret can  be reused to enroll.
+	// if omitted, this defaults to max_enrollments configured on the server
+	MaxEnrollments int
+	// The identity's affiliation e.g. org1.department1
+	Affiliation string
+	// Optional attributes associated with this identity
+	Attributes []Attribute
+	// CAName is the name of the CA to connect to
+	CAName string
+	// Secret is an optional password.  If not specified,
+	// a random secret is generated.  In both cases, the secret
+	// is returned from registration.
+	Secret string
+}
+
+// Attribute defines additional attributes that may be passed along during registration
+type Attribute struct {
+	Name  string
+	Key   string
+	Value string
+}
+
+// RevocationRequest defines the attributes required to revoke credentials with the CA
+type RevocationRequest struct {
+	// Name of the identity whose certificates should be revoked
+	// If this field is omitted, then Serial and AKI must be specified.
+	Name string
+	// Serial number of the certificate to be revoked
+	// If this is omitted, then Name must be specified
+	Serial string
+	// AKI (Authority Key Identifier) of the certificate to be revoked
+	AKI string
+	// Reason is the reason for revocation. See https://godoc.org/golang.org/x/crypto/ocsp
+	// for valid values. The default value is 0 (ocsp.Unspecified).
+	Reason string
+	// CAName is the name of the CA to connect to
+	CAName string
+}
+
+// RevocationResponse represents response from the server for a revocation request
+type RevocationResponse struct {
+	// RevokedCerts is an array of certificates that were revoked
+	RevokedCerts []RevokedCert
+	// CRL is PEM-encoded certificate revocation list (CRL) that contains all unexpired revoked certificates
+	CRL []byte
+}
+
+// RevokedCert represents a revoked certificate
+type RevokedCert struct {
+	// Serial number of the revoked certificate
+	Serial string
+	// AKI of the revoked certificate
+	AKI string
+}