Adjusting query constraints: msp is not defined after the transfer operation

chaincode/controller/operations.go

@@ -223,7 +223,7 @@ func ContextOperations(m shared.AbstractChaincodeOperationManager) error {
 					m2.RejectIfNotSidenor,
 				},
 				nil,
-				assetController.OnlySameOrg(bidDecisionController.RejectBid),
+				assetController.OnlySameMsp(bidDecisionController.RejectBid),
 			).
 			AddOperationWithoutDefaults(
 				"hypercog-accept-asset",
@@ -235,7 +235,7 @@ func ContextOperations(m shared.AbstractChaincodeOperationManager) error {
 					m2.RejectIfNotSidenor,
 				},
 				nil,
-				assetController.OnlySameOrg(bidDecisionController.AcceptBid),
+				assetController.OnlySameMsp(bidDecisionController.AcceptBid),
 			).
 			Build(m)
 

chaincode/go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	git.code.tecnalia.com/ledgerbuilder/sdk v1.4.1
-	git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211110143004-41d906ebb98e
+	git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211124172358-1ee969d8ae77
 	github.com/mitchellh/mapstructure v1.4.2
 	github.com/stretchr/testify v1.7.0
 )

chaincode/go.sum

 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 git.code.tecnalia.com/ledgerbuilder/sdk v1.4.1 h1:XK0VH1OWqv9G1XeTM3NMvuxJYTBFStSJ6FLlcp3lhO0=
 git.code.tecnalia.com/ledgerbuilder/sdk v1.4.1/go.mod h1:lzlMPHixE7XouwzF3UY21z40uQNxeBGhzmjd3KZk2cQ=
-git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211110143004-41d906ebb98e h1:UVJSTeq4mT/aIGnCLHFPylqVSn2ZOc6I4adU3o9U2Xo=
-git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211110143004-41d906ebb98e/go.mod h1:uzEfDKIa+Kb6FIRSQlD4bKcbUhvvXDZ3SKDVIl9COJA=
+git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211124172358-1ee969d8ae77 h1:8TtD+1kNDiN3YpO19pEXYwc3WocQlrcDRC4XBMZMeZQ=
+git.code.tecnalia.com/traceblock/sdk v1.0.1-0.20211124172358-1ee969d8ae77/go.mod h1:uzEfDKIa+Kb6FIRSQlD4bKcbUhvvXDZ3SKDVIl9COJA=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/RoaringBitmap/roaring v0.5.1/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

chaincode/middleware/selector.go

@@ -12,12 +12,13 @@ import (
 )
 
 var (
+	InjectMspConstraint	 = shared.NewMiddlewareFunction("inject-selector-msp", addMspConstraint)
 	InjectOrgConstraint	 = shared.NewMiddlewareFunction("inject-selector-org", addOrgConstraint)
 	InjectStockedAssetConstraint = shared.NewMiddlewareFunction("inject-stocked-asset-query", addStockedStatusConstraint)
 	InjectSidenorMspConstraint = shared.NewMiddlewareFunction("inject-sidenor-msp", addSidenorMspConstraint)
 )
 
-func addOrgConstraint(stub shared.LedgerBuildrStubInterface, ctl shared.ControllerInterface, req shared.TXRequestInterface, request shared.LedgerBuildrAsset) (shared.LedgerBuildrAsset, error) {
+func addMspConstraint(stub shared.LedgerBuildrStubInterface, ctl shared.ControllerInterface, req shared.TXRequestInterface, request shared.LedgerBuildrAsset) (shared.LedgerBuildrAsset, error) {
 	mspId := stub.GetMSPId()
 
 	if (mspId == "public-administration-com") {
@@ -29,6 +30,22 @@ func addOrgConstraint(stub shared.LedgerBuildrStubInterface, ctl shared.Controll
 	return middleware.AlterSelector(request, "selector.owner.msp", mspId)
 }
 
+func addOrgConstraint(stub shared.LedgerBuildrStubInterface, ctl shared.ControllerInterface, req shared.TXRequestInterface, request shared.LedgerBuildrAsset) (shared.LedgerBuildrAsset, error) {
+	mspId := stub.GetMSPId()
+
+	if (mspId == "public-administration-com") {
+		// If public administration => do not alter the query (full-access)
+		return request, nil
+	}
+
+	org, err := stub.GetOrganization()
+	if err != nil {
+		return nil, err
+	}
+
+	return middleware.AlterSelector(request, "selector.owner.org", org)
+}
+
 func addStockedStatusConstraint(stub shared.LedgerBuildrStubInterface, ctl shared.ControllerInterface, req shared.TXRequestInterface, request shared.LedgerBuildrAsset) (shared.LedgerBuildrAsset, error) {
 	return middleware.AlterSelector(
 		query.NewQueryStringWithContent("{}"),