[FAB-8684] Split IdentityManager and CA Client impl

Interfaces have been split in a separate push, to reduce the
size of the change. Now the implementations are split.

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

Makefile

@@ -327,7 +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/msp CAClient | 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

@@ -6,15 +6,6 @@ SPDX-License-Identifier: Apache-2.0
 
 package core
 
-import (
-	"errors"
-)
-
-var (
-	// ErrCARegistrarNotFound indicates the CA registrar was not found
-	ErrCARegistrarNotFound = errors.New("CA registrar not found")
-)
-
 // SigningIdentity is the identity object that encapsulates the user's private key for signing
 // and the user's enrollment certificate (identity)
 type SigningIdentity struct {

pkg/context/api/msp/client.go → pkg/context/api/msp/caclient.go

@@ -7,14 +7,19 @@ SPDX-License-Identifier: Apache-2.0
 package msp
 
 import (
-	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
+	"errors"
 )
 
-// Client provides management of identities in a Fabric network
-type Client interface {
+var (
+	// ErrCARegistrarNotFound indicates the CA registrar was not found
+	ErrCARegistrarNotFound = errors.New("CA registrar not found")
+)
+
+// CAClient provides management of identities in a Fabric network
+type CAClient interface {
 	CAName() string
 	Enroll(enrollmentID string, enrollmentSecret string) error
-	Reenroll(user core.User) error
+	Reenroll(enrollmentID string) error
 	Register(request *RegistrationRequest) (string, error)
 	Revoke(request *RevocationRequest) (*RevocationResponse, error)
 }

pkg/core/identitymgr/enrollment_test.go

@@ -104,7 +104,7 @@ func TestGetSigningIdentityWithEnrollment(t *testing.T) {
 
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
-	caClient := camocks.NewMockClient(ctrl)
+	caClient := camocks.NewMockCAClient(ctrl)
 	prepareForEnroll(t, caClient, cs)
 
 	err = caClient.Enroll(userToEnroll, "enrollmentSecret")
@@ -118,7 +118,7 @@ func TestGetSigningIdentityWithEnrollment(t *testing.T) {
 }
 
 // Simulate caClient.Enroll()
-func prepareForEnroll(t *testing.T, mc *camocks.MockClient, cs core.CryptoSuite) {
+func prepareForEnroll(t *testing.T, mc *camocks.MockCAClient, cs core.CryptoSuite) {
 	// A real caClient.Enroll() generates a CSR. In the process, a crypto suite generates
 	// a new key pair, and the private key is stored into crypto suite private key storage.
 

pkg/core/identitymgr/getsigid.go

@@ -19,7 +19,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func newUser(userData UserData, cryptoSuite core.CryptoSuite) (*user, error) {
+func newUser(userData UserData, cryptoSuite core.CryptoSuite) (*User, error) {
 	pubKey, err := cryptoutil.GetPublicKeyFromCert(userData.EnrollmentCertificate, cryptoSuite)
 	if err != nil {
 		return nil, errors.WithMessage(err, "fetching public key from cert failed")
@@ -28,7 +28,7 @@ func newUser(userData UserData, cryptoSuite core.CryptoSuite) (*user, error) {
 	if err != nil {
 		return nil, errors.WithMessage(err, "cryptoSuite GetKey failed")
 	}
-	u := &user{
+	u := &User{
 		mspID: userData.MspID,
 		name:  userData.Name,
 		enrollmentCertificate: userData.EnrollmentCertificate,
@@ -37,7 +37,8 @@ func newUser(userData UserData, cryptoSuite core.CryptoSuite) (*user, error) {
 	return u, nil
 }
 
-func (mgr *IdentityManager) newUser(userData UserData) (*user, error) {
+// NewUser creates a User instance
+func (mgr *IdentityManager) NewUser(userData UserData) (*User, error) {
 	return newUser(userData, mgr.cryptoSuite)
 }
 
@@ -50,7 +51,7 @@ func (mgr *IdentityManager) loadUserFromStore(userName string) (core.User, error
 	if err != nil {
 		return nil, err
 	}
-	user, err = mgr.newUser(userData)
+	user, err = mgr.NewUser(userData)
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +110,7 @@ func (mgr *IdentityManager) GetUser(userName string) (core.User, error) {
 		if err != nil {
 			return nil, errors.WithMessage(err, "MSP ID config read failed")
 		}
-		u = &user{
+		u = &User{
 			mspID: mspID,
 			name:  userName,
 			enrollmentCertificate: certBytes,