Skip to content

Commit

Permalink
add application/json content-type header to http responses
Browse files Browse the repository at this point in the history
  • Loading branch information
IngoRoessner committed Oct 4, 2023
1 parent fb1f7fd commit f00ffdd
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
24 changes: 24 additions & 0 deletions lib/api/v1endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func init() {
func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camunda.Camunda, e *events.Events, m Metrics) {

router.GET("/", func(writer http.ResponseWriter, request *http.Request, params httprouter.Params) {
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(map[string]string{"status": "OK"})
})

Expand Down Expand Up @@ -69,6 +70,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
// keep empty list as output
// to keep signature of endpoint
// and ensure that no other services throw errors because of this change
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode([]string{})
})

Expand All @@ -95,6 +97,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -119,6 +122,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -134,13 +138,15 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu

err = c.CheckDeploymentAccess(id, token.GetUserId())
if err == camunda.UnknownVid || err == camunda.CamundaDeploymentUnknown {
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(false)
return
}
if err != nil {
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(true)
})

Expand Down Expand Up @@ -178,6 +184,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand Down Expand Up @@ -213,6 +220,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -237,6 +245,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -258,6 +267,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -282,6 +292,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand Down Expand Up @@ -334,6 +345,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -352,6 +364,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -370,6 +383,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -388,6 +402,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -404,6 +419,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -427,6 +443,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -450,6 +467,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -466,6 +484,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -490,6 +509,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -514,6 +534,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -538,6 +559,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand Down Expand Up @@ -569,6 +591,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
})

Expand All @@ -593,6 +616,7 @@ func V1Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
})
}
Expand Down
20 changes: 20 additions & 0 deletions lib/api/v2endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
// keep empty list as output
// to keep signature of endpoint
// and ensure that no other services throw errors because of this change
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode([]string{})
})

Expand All @@ -91,6 +92,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -112,6 +114,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -126,13 +129,15 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu

err = c.CheckDeploymentAccess(id, token.GetUserId())
if err == camunda.UnknownVid || err == camunda.CamundaDeploymentUnknown {
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(false)
return
}
if err != nil {
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(true)
})

Expand Down Expand Up @@ -170,6 +175,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand Down Expand Up @@ -205,6 +211,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -228,6 +235,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -247,6 +255,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -267,6 +276,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -290,6 +300,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand Down Expand Up @@ -336,6 +347,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -351,6 +363,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
})

Expand All @@ -369,6 +382,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
} else {
result, err := c.GetFilteredProcessInstanceHistoryList(token.GetUserId(), query)
Expand All @@ -377,6 +391,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode(result)
}

Expand Down Expand Up @@ -407,6 +422,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
})

Expand All @@ -428,6 +444,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
})

Expand Down Expand Up @@ -456,6 +473,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
http.Error(writer, err.Error(), http.StatusInternalServerError)
return
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
})

Expand Down Expand Up @@ -484,6 +502,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
return
}
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
return
})
Expand Down Expand Up @@ -520,6 +539,7 @@ func V2Endpoints(config configuration.Config, router *httprouter.Router, c *camu
return
}
}
writer.Header().Set("Content-Type", "application/json")
json.NewEncoder(writer).Encode("ok")
return
})
Expand Down

0 comments on commit f00ffdd

Please sign in to comment.