@rivascva/dt-idl 1.1.81 → 1.1.82

package/go/jwt/constants.go

@@ -0,0 +1,6 @@
+package jwt
+
+import "time"
+
+// DefaultServiceTokenDuration is the default duration for service tokens.
+const DefaultServiceTokenDuration = 30 * time.Minute

package/go/jwt/jwt.go

@@ -2,6 +2,7 @@ package jwt
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/golang-jwt/jwt/v5"
 )
@@ -19,3 +20,31 @@ func ValidateToken(token string, secret string) (*jwt.Token, error) {
 
 	return parsedToken, nil
 }
+
+// NewUserToken creates a new JWT token for the given user id.
+func NewUserToken(secret string, issuer string, userId string, duration time.Duration) (string, error) {
+	return newToken(secret, "user", issuer, userId, duration)
+}
+
+// NewServiceToken creates a new JWT token for the given service.
+func NewServiceToken(secret string, issuer string, service string, duration time.Duration) (string, error) {
+	return newToken(secret, "service", issuer, service, duration)
+}
+
+// newToken creates a new JWT token.
+func newToken(secret string, ttype string, issuer string, subject string, duration time.Duration) (string, error) {
+	t := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"type": ttype,
+		"iss":  issuer,
+		"sub":  subject,
+		"iat":  time.Now().UnixMilli(),
+		"exp":  time.Now().Add(duration).UnixMilli(),
+	})
+
+	s, err := t.SignedString([]byte(secret))
+	if err != nil {
+		return "", fmt.Errorf("unable to sign the JWT token: %w", err)
+	}
+
+	return s, nil
+}

package/go/log/log.go

@@ -39,19 +39,19 @@ func NewLog() *Log {
 }
 
 func (l *Log) Info(ctx context.Context, m any) {
-	l.info.Println(toJson(m, kvsWithContext(ctx, l.kvs), "info"))
+	l.info.Println(toJson(ctx, m, l.kvs, "info"))
 }
 
 func (l *Log) Warn(ctx context.Context, m any) {
-	l.warn.Println(toJson(m, kvsWithContext(ctx, l.kvs), "warn"))
+	l.warn.Println(toJson(ctx, m, l.kvs, "warn"))
 }
 
 func (l *Log) Error(ctx context.Context, m any) {
-	l.error.Println(toJson(m, kvsWithContext(ctx, l.kvs), "error"))
+	l.error.Println(toJson(ctx, m, l.kvs, "error"))
 }
 
 func (l *Log) Fatal(ctx context.Context, m any) {
-	l.error.Fatal(toJson(m, kvsWithContext(ctx, l.kvs), "error"))
+	l.error.Fatal(toJson(ctx, m, l.kvs, "error"))
 }
 
 func (l *Log) With(kvs ...any) Logger {

package/go/log/utils.go

@@ -10,49 +10,40 @@ import (
 )
 
 // toJson converts the message and key-value pairs to a JSON string.
-func toJson(m any, kvs map[string]any, level string) string {
+func toJson(ctx context.Context, m any, kvs map[string]any, lvl string) string {
 	// copy the key-value pairs into a new map
-	out := make(map[string]any, len(kvs)+3)
+	out := make(map[string]any, len(kvs)+10)
 	maps.Copy(out, kvs)
 
 	// add the message
 	out["msg"] = m
 
 	// add the log level
-	out["level"] = level
+	out["level"] = lvl
 
 	// add the timestamp
 	out["timestamp"] = time.Now().UTC().Format(time.RFC3339)
 
-	// marshal the map to a JSON byte array
-	data, err := json.Marshal(out)
-	if err != nil {
-		return err.Error()
+	// add the actor id
+	if actorId, err := utils.GetActorIdFromContext(ctx); err == nil {
+		out["actorId"] = actorId
 	}
 
-	return string(data)
-}
-
-// kvsWithContext returns a new kvs map with added context metadata.
-func kvsWithContext(ctx context.Context, kvs map[string]any) map[string]any {
-	// copy the existing key-value pairs into a new map
-	newkvs := make(map[string]any, len(kvs)+3)
-	maps.Copy(newkvs, kvs)
-
-	// add the user id to the key-value pairs
-	if userId, err := utils.GetUserIdFromContext(ctx); err == nil {
-		newkvs["userId"] = userId
-	}
-
-	// add the request path to the key-value pairs
+	// add the request path
 	if requestPath, err := utils.GetRequestPathFromContext(ctx); err == nil {
-		newkvs["requestPath"] = requestPath
+		out["requestPath"] = requestPath
 	}
 
-	// add the request id to the key-value pairs
+	// add the request id
 	if requestId, err := utils.GetRequestIdFromContext(ctx); err == nil {
-		newkvs["requestId"] = requestId
+		out["requestId"] = requestId
+	}
+
+	// marshal the map to a JSON byte array
+	data, err := json.Marshal(out)
+	if err != nil {
+		return err.Error()
 	}
 
-	return newkvs
+	return string(data)
 }

package/go/models/constants.go

@@ -11,3 +11,10 @@ const (
 	// RequestIdKey is the key used to set/get the request id in the request context.
 	RequestIdKey = ContextKey("requestId")
 )
+
+type TokenType string
+
+const (
+	UserToken    TokenType = "user"
+	ServiceToken TokenType = "service"
+)

package/go/utils/context.go

@@ -18,24 +18,25 @@ func GetTokenFromContext(ctx context.Context) *jwt.Token {
 	return token
 }
 
-// GetUserIdFromContext retrieves the user id from the JTW token in the given context.
-func GetUserIdFromContext(ctx context.Context) (string, error) {
+// GetActorIdFromContext retrieves the actor id from the JTW token in the given context.
+// The actor id is the subject of the JWT token, and it represents the user id or service name that initiated the request.
+func GetActorIdFromContext(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 subject (userId) from the token
-	userId, err := token.Claims.GetSubject()
+	// get the subject from the token
+	subject, err := token.Claims.GetSubject()
 	if err != nil {
 		return "", fmt.Errorf("failed to get the subject from the token: %w", err)
 	}
-	if userId == "" {
-		return "", errors.New("user id not found in the token subject")
+	if subject == "" {
+		return "", errors.New("subject is empty in the token")
 	}
 
-	return userId, nil
+	return subject, nil
 }
 
 // GetRequestPathFromContext retrieves the request path from the given context.

package/package.json

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