@rivascva/dt-idl 1.1.91 → 1.1.93

package/go/auth/utils.go

@@ -32,3 +32,28 @@ func CanActorAccessResourcesForUser(ctx context.Context, userId string) (bool, e
 		return false, fmt.Errorf("invalid token type %s", tokenType)
 	}
 }
+
+// CanActorAccessResourcesForAll checks if the actor is allowed to access resources for all users.
+func CanActorAccessResourcesForAll(ctx context.Context) (bool, error) {
+	// get the actor id from the context
+	actorId, err := utils.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 := utils.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 false, nil
+	case "service":
+		return slices.Contains(approvedServices, actorId), nil
+	default:
+		return false, fmt.Errorf("invalid token type %s", tokenType)
+	}
+}

package/go/log/utils.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"maps"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/RivasCVA/dt-idl/go/utils"
@@ -13,9 +13,20 @@ import (
 
 // toJson converts the message and key-value pairs to a JSON string.
 func toJson(ctx context.Context, m any, kvs map[string]any, lvl string) string {
-	// copy the key-value pairs into a new map
+	// copy the key-value pairs into a new map, applying any transformations if necessary
 	out := make(map[string]any, len(kvs)+10)
-	maps.Copy(out, kvs)
+	for k, v := range kvs {
+		if v == nil {
+			// ensure nil interfaces are printed as nulls
+			out[k] = nil
+		} else if e, ok := v.(error); ok {
+			// ensure errors are printed as strings
+			out[k] = e.Error()
+		} else {
+			// copy the value as-is
+			out[k] = v
+		}
+	}
 
 	// add the message
 	out["msg"] = m
@@ -29,6 +40,9 @@ func toJson(ctx context.Context, m any, kvs map[string]any, lvl string) string {
 	// add the caller
 	if pc, file, line, ok := runtime.Caller(2); ok {
 		fn := runtime.FuncForPC(pc).Name()
+		if i := strings.LastIndex(fn, "."); i != -1 {
+			fn = fn[i+1:]
+		}
 		if fn == "" {
 			fn = "unknown"
 		}

package/go/utils/types.go

@@ -0,0 +1,6 @@
+package utils
+
+func IsType[T any](v any) bool {
+	_, ok := v.(T)
+	return ok
+}

package/package.json

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