Merge pull request #6 from decentralized-cloud/fixed-bug

Fixed bug
decentralized-cloud · Feb 15, 2021 · d23a88d · d23a88d
2 parents 8735c3f + 87c3e21
commit d23a88d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/services/endpoint/service.go b/services/endpoint/service.go
@@ -4,6 +4,7 @@ package endpoint
 import (
 	"context"
 
+	"github.com/decentralized-cloud/user/models"
 	"github.com/decentralized-cloud/user/services/business"
 	"github.com/go-kit/kit/endpoint"
 	commonErrors "github.com/micro-business/go-core/system/errors"
@@ -44,6 +45,9 @@ func (service *endpointCreatorService) CreateUserEndpoint() endpoint.Endpoint {
 		}
 
 		castedRequest := request.(*business.CreateUserRequest)
+		parsedToken := ctx.Value(models.ContextKeyParsedToken).(models.ParsedToken)
+		castedRequest.Email = parsedToken.Email
+
 		if err := castedRequest.Validate(); err != nil {
 			return &business.CreateUserResponse{
 				Err: commonErrors.NewArgumentErrorWithError("request", "", err),

diff --git a/services/endpoint/service_test.go b/services/endpoint/service_test.go
@@ -41,7 +41,7 @@ var _ = Describe("Endpoint Creator Service Tests", func() {
 
 		mockBusinessService = businessMock.NewMockBusinessContract(mockCtrl)
 		sut, _ = endpoint.NewEndpointCreatorService(mockBusinessService)
-		ctx = context.Background()
+		ctx = context.WithValue(context.Background(), models.ContextKeyParsedToken, models.ParsedToken{Email: cuid.New() + "@test.com"})
 	})
 
 	AfterEach(func() {
@@ -117,6 +117,8 @@ var _ = Describe("Endpoint Creator Service Tests", func() {
 
 				When("endpoint is called with invalid request", func() {
 					It("should return ArgumentNilError", func() {
+						ctx = context.WithValue(context.Background(), models.ContextKeyParsedToken, models.ParsedToken{Email: ""})
+
 						invalidRequest := business.CreateUserRequest{
 							Email: "",
 							User:  models.User{}}

diff --git a/services/transport/grpc/encoder-decoder.go b/services/transport/grpc/encoder-decoder.go
@@ -17,11 +17,8 @@ import (
 func decodeCreateUserRequest(
 	ctx context.Context,
 	request interface{}) (interface{}, error) {
-	parsedToken := ctx.Value(models.ContextKeyParsedToken).(models.ParsedToken)
-
 	return &business.CreateUserRequest{
-		Email: parsedToken.Email,
-		User:  models.User{}}, nil
+		User: models.User{}}, nil
 }
 
 // encodeCreateUserResponse encodes CreateUser response from business object to GRPC object