Merge branch 'master' into feature/PRXS-951-2057-EventsName

id/system/system.go

@@ -63,9 +63,11 @@ func Handler(obj any) *id.ObjectId {
 		i.UserID = val.GetID(context.TODO())
 		return id.MustObjectId(&i)
 	case *auth.ClientPrincipal:
-		var i id.ClientId
-		i.ClientID = val.GetID(context.TODO())
-		return id.MustObjectId(&i)
+		client, _ := val.Client(context.TODO())
+		if client == nil {
+			return id.MustObjectId(&id.ClientId{})
+		}
+		return Handler(client)
 	case *auth.SystemPrincipal:
 		return id.MustObjectId(&id.SystemId{})
 	case *auth.Anonymous:

logs/log.go

@@ -27,7 +27,7 @@ func (l Level) String() string {
 }
 
 type Entry struct {
-	ID        string       `json:"id" bson:"id" mapstructure:"id"`
+	ID        string       `json:"id" bson:"_id" mapstructure:"id"`
 	Timestamp time.Time    `json:"timestamp,omitempty" bson:"timestamp,omitempty" mapstructure:"timestamp,omitempty"`
 	Level     Level        `json:"level,omitempty" bson:"level,omitempty" mapstructure:"level,omitempty"`
 	Message   string       `json:"message,omitempty" bson:"message,omitempty" mapstructure:"message,omitempty"`