Fix bug with targetRealm

cloudtrust · May 20, 2019 · ef8e606 · ef8e606
1 parent ef020b3
commit ef8e606
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pkg/events/endpoint.go b/pkg/events/endpoint.go
@@ -17,7 +17,14 @@ type Endpoints struct {
 // MakeGetEventsEndpoint makes the events endpoint.
 func MakeGetEventsEndpoint(ec EventsComponent) cs.Endpoint {
 	return func(ctx context.Context, req interface{}) (interface{}, error) {
-		params := filterParameters(req.(map[string]string), "first", "max", "dateFrom", "dateTo", "realmTarget", "userID", "origin", "ctEventType")
+		params := filterParameters(req.(map[string]string), "first", "max", "dateFrom", "dateTo", "realmTarget", "origin", "ctEventType")
+
+		//Rewrite realmTarget into realm
+		if value, ok := params["realmTarget"]; ok {
+			params["realm"] = value
+			delete(params, "realmTarget")
+		}
+
 		return ec.GetEvents(ctx, params)
 	}
 }
@@ -32,7 +39,7 @@ func MakeGetEventsSummaryEndpoint(ec EventsComponent) cs.Endpoint {
 // MakeGetUserEventsEndpoint makes the events summary endpoint.
 func MakeGetUserEventsEndpoint(ec EventsComponent) cs.Endpoint {
 	return func(ctx context.Context, req interface{}) (interface{}, error) {
-		params := filterParameters(req.(map[string]string), "first", "max", "dateFrom", "dateTo", "realm", "realmTarget", "userID", "origin", "ctEventType")
+		params := filterParameters(req.(map[string]string), "first", "max", "dateFrom", "dateTo", "realm", "userID", "origin", "ctEventType")
 		return ec.GetUserEvents(ctx, params)
 	}
 }

diff --git a/pkg/events/http_test.go b/pkg/events/http_test.go
@@ -33,7 +33,7 @@ func TestHTTPManagementHandler(t *testing.T) {
 	{
 		var params map[string]string
 		params = make(map[string]string)
-		params["realmTarget"] = "master"
+		params["realm"] = "master"
 
 		var eventsResp = api.AuditEventsRepresentation{}
 		var event = api.AuditRepresentation{