Feature/MZ-559

common/net/http/httputils.go

@@ -127,3 +127,13 @@ func GetFileFromHeader(ctx *fiber.Ctx) (string, error) {
 
 	return fileString, nil
 }
+
+// GetTokenHeader func that get token from header
+func GetTokenHeader(c *fiber.Ctx) string {
+	splitToken := strings.Split(c.Get(fiber.HeaderAuthorization), "Bearer")
+	if len(splitToken) == 2 {
+		return strings.TrimSpace(splitToken[1])
+	}
+
+	return ""
+}

common/net/http/withJWT.go

@@ -111,15 +111,6 @@ func convertGroups(groups []any) []string {
 	return newGroups
 }
 
-func getTokenHeader(c *fiber.Ctx) string {
-	splitToken := strings.Split(c.Get(fiber.HeaderAuthorization), "Bearer")
-	if len(splitToken) == 2 {
-		return strings.TrimSpace(splitToken[1])
-	}
-
-	return ""
-}
-
 func getTokenHeaderFromContext(ctx context.Context) string {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
@@ -234,9 +225,9 @@ func (jwtm *JWTMiddleware) ProtectHTTP() fiber.Handler {
 
 		l.Debug("Read token from header")
 
-		tokenString := getTokenHeader(c)
+		tokenString := GetTokenHeader(c)
 
-		if len(tokenString) == 0 {
+		if common.IsNilOrEmpty(&tokenString) {
 			msg := errors.Wrap(errors.New("token not found in context"), "No token found in context")
 			l.Error(msg.Error())
 
@@ -245,7 +236,7 @@ func (jwtm *JWTMiddleware) ProtectHTTP() fiber.Handler {
 
 		l.Debugf("Get JWK keys using %s", jwtm.JWK.URI)
 
-		keySet, err := jwtm.JWK.Fetch(context.Background())
+		keySet, err := jwtm.JWK.Fetch(c.Context())
 		if err != nil {
 			msg := errors.Wrap(err, "Couldn't load JWK keys from source")
 			l.Error(msg.Error())

components/auth/docker-compose.yml

@@ -5,7 +5,7 @@ x-postgres-common:
   env_file:
     - .env
   networks:
-    - app-tier
+    - midaz_network
 
 services:
   casdoor:
@@ -21,7 +21,7 @@ services:
       casdoor-db:
         condition: service_healthy
     networks:
-      - app-tier
+      - midaz_network
 
   casdoor-db:
     <<: *postgres-common
@@ -43,6 +43,6 @@ services:
       retries: 5
 
 networks:
-  app-tier:
-    driver: bridge
-    name: app-tier
+  midaz_network:
+    name: midaz_network
+    driver: bridge

components/ledger/docker-compose.yml

@@ -9,7 +9,7 @@ x-postgres-ledger-common:
     timeout: 5s
     retries: 5
   networks:
-    - app-tier
+    - midaz_network
 
 x-mongodb-common:
   &mongodb-common
@@ -21,15 +21,15 @@ x-mongodb-common:
     timeout: 5s
     retries: 5
   networks:
-    - app-tier
+    - midaz_network
 
 x-redis-common:
   &redis-common
   image: redis:latest
   env_file:
     - .env
   networks:
-    - app-tier
+    - midaz_network
 
 services:
   ledger:
@@ -59,7 +59,7 @@ services:
       replica-ledger:
         condition: service_healthy
     networks:
-      - app-tier
+      - midaz_network
 
   mongodb:
     <<: *mongodb-common
@@ -135,6 +135,6 @@ volumes:
   mongodb_data_container:
 
 networks:
-  app-tier:
-    driver: bridge
-    name: app-tier
+  midaz_network:
+    name: midaz_network
+    driver: bridge

components/ledger/internal/gen/inject.go

@@ -5,10 +5,10 @@ package gen
 
 import (
 	"fmt"
-	"github.com/LerianStudio/midaz/common/mcasdoor"
 	"sync"
 
 	"github.com/LerianStudio/midaz/common"
+	"github.com/LerianStudio/midaz/common/mcasdoor"
 	"github.com/LerianStudio/midaz/common/mmongo"
 	"github.com/LerianStudio/midaz/common/mpostgres"
 	"github.com/LerianStudio/midaz/common/mzap"

components/transaction/docker-compose.yml

@@ -9,7 +9,7 @@ x-postgres-transaction-common:
     timeout: 5s
     retries: 5
   networks:
-    - app-tier
+    - midaz_network
 
 x-mongodb-common:
   &mongodb-common
@@ -21,7 +21,7 @@ x-mongodb-common:
     timeout: 5s
     retries: 5
   networks:
-    - app-tier
+    - midaz_network
 
 services:
   transaction:
@@ -47,7 +47,7 @@ services:
       replica-transaction:
         condition: service_healthy
     networks:
-      - app-tier
+      - midaz_network
 
   mongodb:
     <<: *mongodb-common
@@ -175,6 +175,6 @@ volumes:
   mongodb_data_container:
 
 networks:
-  app-tier:
-    driver: bridge
-    name: app-tier
+  midaz_network:
+    name: midaz_network
+    driver: bridge

components/transaction/internal/adapters/grpc/account.grpc.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/LerianStudio/midaz/common/mgrpc"
 	proto "github.com/LerianStudio/midaz/common/mgrpc/account"
+	gmtdt "google.golang.org/grpc/metadata"
 )
 
 // AccountGRPCRepository is a gRPC implementation of the account.proto
@@ -27,7 +28,7 @@ func NewAccountGRPC(c *mgrpc.GRPCConnection) *AccountGRPCRepository {
 }
 
 // GetAccountsByIds returns a grpc accounts on ledger bi given ids.
-func (a *AccountGRPCRepository) GetAccountsByIds(ctx context.Context, ids []string) (*proto.AccountsResponse, error) {
+func (a *AccountGRPCRepository) GetAccountsByIds(ctx context.Context, token string, ids []string) (*proto.AccountsResponse, error) {
 	conn, err := a.conn.GetNewClient()
 	if err != nil {
 		return nil, err
@@ -39,6 +40,9 @@ func (a *AccountGRPCRepository) GetAccountsByIds(ctx context.Context, ids []stri
 		Ids: ids,
 	}
 
+	md := gmtdt.Pairs("authorization", "Bearer "+token)
+	ctx = gmtdt.NewOutgoingContext(ctx, md)
+
 	accountsResponse, err := client.GetAccountsByIds(ctx, accountsID)
 	if err != nil {
 		return nil, err
@@ -48,7 +52,7 @@ func (a *AccountGRPCRepository) GetAccountsByIds(ctx context.Context, ids []stri
 }
 
 // GetAccountsByAlias returns a grpc accounts on ledger bi given aliases.
-func (a *AccountGRPCRepository) GetAccountsByAlias(ctx context.Context, aliases []string) (*proto.AccountsResponse, error) {
+func (a *AccountGRPCRepository) GetAccountsByAlias(ctx context.Context, token string, aliases []string) (*proto.AccountsResponse, error) {
 	conn, err := a.conn.GetNewClient()
 	if err != nil {
 		return nil, err
@@ -60,6 +64,9 @@ func (a *AccountGRPCRepository) GetAccountsByAlias(ctx context.Context, aliases
 		Aliases: aliases,
 	}
 
+	md := gmtdt.Pairs("authorization", "Bearer "+token)
+	ctx = gmtdt.NewOutgoingContext(ctx, md)
+
 	accountsResponse, err := client.GetAccountsByAliases(ctx, accountsAlias)
 	if err != nil {
 		return nil, err
@@ -69,7 +76,7 @@ func (a *AccountGRPCRepository) GetAccountsByAlias(ctx context.Context, aliases
 }
 
 // UpdateAccounts update a grpc accounts on ledger.
-func (a *AccountGRPCRepository) UpdateAccounts(ctx context.Context, accounts []*proto.Account) (*proto.AccountsResponse, error) {
+func (a *AccountGRPCRepository) UpdateAccounts(ctx context.Context, token string, accounts []*proto.Account) (*proto.AccountsResponse, error) {
 	conn, err := a.conn.GetNewClient()
 	if err != nil {
 		return nil, err
@@ -81,6 +88,9 @@ func (a *AccountGRPCRepository) UpdateAccounts(ctx context.Context, accounts []*
 		Accounts: accounts,
 	}
 
+	md := gmtdt.Pairs("authorization", "Bearer "+token)
+	ctx = gmtdt.NewOutgoingContext(ctx, md)
+
 	accountsResponse, err := client.UpdateAccounts(ctx, accountsRequest)
 	if err != nil {
 		return nil, err

components/transaction/internal/domain/account/account_repository.go

@@ -10,7 +10,7 @@ import (
 //
 //go:generate mockgen --destination=../../gen/mock/account/account_mock.go --package=mock . Repository
 type Repository interface {
-	GetAccountsByIds(ctx context.Context, ids []string) (*proto.AccountsResponse, error)
-	GetAccountsByAlias(ctx context.Context, aliases []string) (*proto.AccountsResponse, error)
-	UpdateAccounts(ctx context.Context, accounts []*proto.Account) (*proto.AccountsResponse, error)
+	GetAccountsByIds(ctx context.Context, token string, ids []string) (*proto.AccountsResponse, error)
+	GetAccountsByAlias(ctx context.Context, token string, aliases []string) (*proto.AccountsResponse, error)
+	UpdateAccounts(ctx context.Context, token string, accounts []*proto.Account) (*proto.AccountsResponse, error)
 }

components/transaction/internal/domain/account/validations.go

@@ -32,7 +32,7 @@ type Responses struct {
 // ValidateAccounts function with some validates in accounts and DSL operations
 func ValidateAccounts(validate Responses, accounts []*a.Account) error {
 	for _, acc := range accounts {
-		if acc.Balance.Available == 0 {
+		if acc.Balance.Available <= 0 && !strings.Contains(acc.Alias, "@external") {
 			return common.ValidationError{
 				Code:    "0025",
 				Title:   "Insuficient balance",

components/transaction/internal/gen/inject.go

@@ -5,10 +5,10 @@ package gen
 
 import (
 	"fmt"
-	"github.com/LerianStudio/midaz/components/transaction/internal/ports"
 	"sync"
 
 	"github.com/LerianStudio/midaz/common"
+	"github.com/LerianStudio/midaz/common/mcasdoor"
 	"github.com/LerianStudio/midaz/common/mgrpc"
 	"github.com/LerianStudio/midaz/common/mmongo"
 	"github.com/LerianStudio/midaz/common/mpostgres"
@@ -58,6 +58,20 @@ func setupMongoDBConnection(cfg *service.Config) *mmongo.MongoConnection {
 	}
 }
 
+func setupCasdoorConnection(cfg *service.Config) *mcasdoor.CasdoorConnection {
+	casdoor := &mcasdoor.CasdoorConnection{
+		JWKUri:           cfg.JWKAddress,
+		Endpoint:         cfg.CasdoorAddress,
+		ClientID:         cfg.CasdoorClientID,
+		ClientSecret:     cfg.CasdoorClientSecret,
+		OrganizationName: cfg.CasdoorOrganizationName,
+		ApplicationName:  cfg.CasdoorApplicationName,
+		EnforcerName:     cfg.CasdoorEnforcerName,
+	}
+
+	return casdoor
+}
+
 func setupGRPCConnection(cfg *service.Config) *mgrpc.GRPCConnection {
 	addr := fmt.Sprintf("%s:%s", cfg.LedgerGRPCAddr, cfg.LedgerGRPCPort)
 
@@ -72,6 +86,7 @@ var (
 		mzap.InitializeLogger,
 		setupPostgreSQLConnection,
 		setupMongoDBConnection,
+		setupCasdoorConnection,
 		setupGRPCConnection,
 		service.NewConfig,
 		httpHandler.NewRouter,
@@ -80,8 +95,8 @@ var (
 		postgres.NewOperationPostgreSQLRepository,
 		mongodb.NewMetadataMongoDBRepository,
 		grpc.NewAccountGRPC,
-		wire.Struct(new(ports.TransactionHandler), "*"),
-		wire.Struct(new(ports.OperationHandler), "*"),
+		wire.Struct(new(httpHandler.TransactionHandler), "*"),
+		wire.Struct(new(httpHandler.OperationHandler), "*"),
 		wire.Struct(new(command.UseCase), "*"),
 		wire.Struct(new(query.UseCase), "*"),
 		wire.Bind(new(t.Repository), new(*postgres.TransactionPostgreSQLRepository)),