Add Content-Type response headers (#323)

Author: dijjal

src/main/kotlin/no/nav/pdfgen/application/api/pdf/GenerateHtmlApi.kt

@@ -16,7 +16,10 @@ fun Route.registerGenerateHtmlApi(env: Environment = Environment()) {
             get("/{applicationName}/{template}") {
                 val template = call.parameters["template"]!!
                 val applicationName = call.parameters["applicationName"]!!
-                createHtmlFromTemplateData(template, applicationName)?.let { call.respond(it) }
+                createHtmlFromTemplateData(template, applicationName)?.let {
+                    call.response.header("Content-Type", ContentType.Text.Html.toString())
+                    call.respond(it)
+                }
                     ?: call.respondText(
                         "Template or application not found",
                         status = HttpStatusCode.NotFound
@@ -31,6 +34,7 @@ fun Route.registerGenerateHtmlApi(env: Environment = Environment()) {
             val jsonNode: JsonNode = call.receive()
 
             createHtml(template, applicationName, jsonNode)?.let {
+                call.response.header("Content-Type", ContentType.Text.Html.toString())
                 call.respond(it)
                 logger.info("Done generating HTML in ${System.currentTimeMillis() - startTime}ms")
             }

src/main/kotlin/no/nav/pdfgen/application/api/pdf/GeneratePdfApi.kt

@@ -3,13 +3,10 @@ package no.nav.pdfgen.application.api.pdf
 import com.fasterxml.jackson.databind.JsonNode
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
 import io.ktor.server.request.contentType
 import io.ktor.server.request.receive
 import io.ktor.server.request.receiveText
-import io.ktor.server.response.respond
-import io.ktor.server.response.respondBytes
-import io.ktor.server.response.respondText
+import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
@@ -28,6 +25,7 @@ fun Route.registerGeneratePdfApi(env: Environment = Environment()) {
             val template = call.parameters["template"]!!
             val applicationName = call.parameters["applicationName"]!!
             createHtmlFromTemplateData(template, applicationName)?.let { document ->
+                call.response.header("Content-Type", ContentType.Application.Pdf.toString())
                 call.respond(createPDFA(document))
             }
                 ?: call.respondText(
@@ -43,6 +41,7 @@ fun Route.registerGeneratePdfApi(env: Environment = Environment()) {
         val jsonNode: JsonNode = call.receive()
 
         createHtml(template, applicationName, jsonNode)?.let { document ->
+            call.response.header("Content-Type", ContentType.Application.Pdf.toString())
             call.respond(createPDFA(document))
             logger.info("Done generating PDF in ${System.currentTimeMillis() - startTime}ms")
         }
@@ -59,6 +58,7 @@ fun Route.registerGeneratePdfApi(env: Environment = Environment()) {
 
         val html = call.receiveText()
 
+        call.response.header("Content-Type", ContentType.Application.Pdf.toString())
         call.respond(createPDFA(html))
         logger.info(
             "Generated PDF using HTML template for $applicationName om ${timer.observeDuration()}ms"
@@ -76,6 +76,10 @@ fun Route.registerGeneratePdfApi(env: Environment = Environment()) {
                     call.receive<InputStream>().use { inputStream ->
                         ByteArrayOutputStream().use { outputStream ->
                             createPDFA(inputStream, outputStream)
+                            call.response.header(
+                                "Content-Type",
+                                ContentType.Application.Pdf.toString()
+                            )
                             call.respondBytes(
                                 outputStream.toByteArray(),
                                 contentType = ContentType.Application.Pdf

src/test/kotlin/no/nav/pdfgen/PdfGenITest.kt

@@ -51,6 +51,7 @@ internal class PdfGenITest {
                         }
                     }
                     assertEquals(true, response.status.isSuccess())
+                    assertEquals(true, response.headers["Content-Type"]!!.contains("application/pdf"))
                     val bytes = runBlocking { response.readRawBytes() }
                     assertNotEquals(null, bytes)
                     // Load the document in pdfbox to ensure it's valid
@@ -104,6 +105,7 @@ internal class PdfGenITest {
                         }
                     }
                     assertEquals(true, response.status.isSuccess())
+                    assertEquals(true, response.headers["Content-Type"]!!.contains("text/html"))
                     assertEquals(true, response.bodyAsText().contains("<html>"))
                 }
         }
@@ -215,6 +217,10 @@ internal class PdfGenITest {
                             }
                             .execute { response ->
                                 assertEquals(true, response.status.isSuccess())
+                                assertEquals(
+                                    true,
+                                    response.headers["Content-Type"]!!.contains("application/pdf"),
+                                )
                                 val bytes = response.readRawBytes()
                                 assertEquals(false, bytes.isEmpty())
                                 Files.write(Paths.get("build", outputFile), bytes)