@rivascva/dt-idl 1.1.82 → 1.1.84

package/go/log/utils.go

@@ -3,7 +3,9 @@ package log
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"maps"
+	"runtime"
 	"time"
 
 	"github.com/RivasCVA/dt-idl/go/utils"
@@ -24,6 +26,15 @@ func toJson(ctx context.Context, m any, kvs map[string]any, lvl string) string {
 	// add the timestamp
 	out["timestamp"] = time.Now().UTC().Format(time.RFC3339)
 
+	// add the caller
+	if pc, file, line, ok := runtime.Caller(3); ok {
+		fn := runtime.FuncForPC(pc).Name()
+		if fn == "" {
+			fn = "unknown"
+		}
+		out["caller"] = fmt.Sprintf("%s:%s:%d", file, fn, line)
+	}
+
 	// add the actor id
 	if actorId, err := utils.GetActorIdFromContext(ctx); err == nil {
 		out["actorId"] = actorId

package/go/utils/auth.go

@@ -0,0 +1,35 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"slices"
+)
+
+// approvedServices is a list of services that are allowed to access sensitive data.
+var approvedServices = []string{"dt-trade-service", "dt-portfolio-service", "dt-asset-service", "dt-user-service"}
+
+// CanActorAccessUserId checks if the actor is allowed to access data for the user id.
+func CanActorAccessUserId(ctx context.Context, userId string) (bool, error) {
+	// get the actor id from the context
+	actorId, err := GetActorIdFromContext(ctx)
+	if err != nil {
+		return false, fmt.Errorf("failed to get the actor id from the context: %w", err)
+	}
+
+	// get the token type from the context
+	tokenType, err := GetTokenTypeFromContext(ctx)
+	if err != nil {
+		return false, fmt.Errorf("failed to get the token type from the context: %w", err)
+	}
+
+	// check if the actor is allowed to access the user id
+	switch tokenType {
+	case "user":
+		return actorId == userId, nil
+	case "service":
+		return slices.Contains(approvedServices, actorId), nil
+	default:
+		return false, fmt.Errorf("invalid token type %s", tokenType)
+	}
+}

package/go/utils/context.go

@@ -39,6 +39,24 @@ func GetActorIdFromContext(ctx context.Context) (string, error) {
 	return subject, nil
 }
 
+// GetTokenTypeFromContext retrieves the token type from the JWT token in the given context.
+// The token type is a custom claim in the JWT token, and it represents the type of the token (e.g. user or service).
+func GetTokenTypeFromContext(ctx context.Context) (string, error) {
+	// get the token from the context
+	token := GetTokenFromContext(ctx)
+	if token == nil {
+		return "", errors.New("token not found in the context")
+	}
+
+	// get the token type from the token
+	tokenType, ok := token.Claims.(jwt.MapClaims)["type"].(string)
+	if !ok {
+		return "", errors.New("token type not found in the token")
+	}
+
+	return tokenType, nil
+}
+
 // GetRequestPathFromContext retrieves the request path from the given context.
 func GetRequestPathFromContext(ctx context.Context) (string, error) {
 	requestPath, ok := ctx.Value(models.RequestPathKey).(string)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.82",
+  "version": "1.1.84",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",