Override duplicate "Authorization" header with Header from Parent, to align with Postman app behavior

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

README.adoc

@@ -18,13 +18,13 @@ endif::[]
 :pmtemplates: src/integrationTest/resources/pm-templates
 :imagesdir: docs/images
 :prewrap!:
-:revoman-version: 0.7.9
+:revoman-version: 0.8.0
 
 '''
 
 *ReṼoman* is an API automation tool for JVM (Java/Kotlin) from the API-first SaaS company, *Salesforce*. It re-imagines API automation by letting you execute a Postman collection in a JVM program/test.
 
-NOTE: NO licensed Postman SDKs are used inside this project. This is written ground up natively in JVM 
+NOTE: NO licensed Postman SDKs are used inside this project. This is written ground up natively in JVM
 
 '''
 
@@ -55,7 +55,7 @@ to always be ready for Manually trying them out importing into Postman.
 
 * ReṼoman may be similar to Newman or Postman CLI when it comes to executing a Postman collection, but the _similarities end there_
 * Newman or Postman CLI are built for node and cannot be executed within a JVM. Even if you are able to run with some hacky way, there is no easy way to assert results.
-* Built for the JVM, ReṼoman fits naturally within your current JVM stack. 
+* Built for the JVM, ReṼoman fits naturally within your current JVM stack.
 * Its <<#_type_safety_with_flexible_json_pojo_marshallingserialization_and_unmarshallingdeserialization,Type Safety>> bridges the gap between strongly-typed JVM code and flexible JSON.
 * It has more features, like <<#_pre_step_and_post_step_hooks,Hooks>> feature that lets you plug in your custom JVM code in-between the execution. The <<Rundown>> is much richer in providing execution information than the link:{pmtemplates}/restfulapidev/postman-cli-reports/restful-api.dev-2025-04-14-13-16-43.json[newman/postman-cli reports]
 * It's not limited to Postman templates. We have plans to support more popular templates formats like ThunderClient, Bruno, etc. which offers versatality for consumers.
@@ -661,7 +661,7 @@ IMPORTANT: It is not supported to load `node_modules` from jar. For example, `/U
 
 image::node_modules.png[]
 
-* If `node_modules` is ignored on your git repo, you can force-add to check in using the command `git add -all -f <path>/node_modules`
+* If `node_modules` is ignored on your git repo, you can force-add to check in using the command `git add --all -f <path>/node_modules`
 ====
 
 CAUTION: The recommendation is not to add too much code in <<Pre-req and Post-res scripts>>, as it's not intuitive to troubleshoot through debugging. Use it for simple operations that can be understood without debugging, and use <<#_pre_step_and_post_step_hooks,Pre-Step /Post-Step Hooks>> for any non-trivial operations, which are intuitive to debug.

buildSrc/src/main/kotlin/Config.kt

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.7.9"
+const val VERSION = "0.8.0"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

renovate.json

@@ -18,6 +18,7 @@
       "matchPackageNames": [
         "org.graalvm.sdk:graal-sdk",
         "org.graalvm.js:js",
+        "org.http4k:http4k-bom",
         "org.http4k:http4k-core",
         "org.http4k:http4k-client-apache",
         "org.http4k:http4k-format-moshi"

src/integrationTest/resources/pm-templates/core/milestone/bmp-create-runtime.postman_collection.json

@@ -1,11 +1,11 @@
 {
 	"info": {
-		"_postman_id": "6d4408f2-0e8e-43dc-9e0e-958825246388",
+		"_postman_id": "b6a7d9e6-6176-45a6-ad41-ea63a0969cd4",
 		"name": "bmp-create-runtime",
 		"description": "- SalesOpsRep: Create an Order using PST and Activate it",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "23827434",
-		"_collection_link": "https://salesforce-734821.postman.co/workspace/1c6fbe60-fabb-4988-890b-b032cf03e25d/collection/23827434-6d4408f2-0e8e-43dc-9e0e-958825246388?source=collection_link"
+		"_collection_link": "https://salesforce-734821.postman.co/workspace/Ape~84673b5d-fa1c-4ac7-ab44-1073ee53332d/collection/23827434-b6a7d9e6-6176-45a6-ad41-ea63a0969cd4?action=share&source=collection_link&creator=23827434"
 	},
 	"item": [
 		{
@@ -185,7 +185,13 @@
 					],
 					"request": {
 						"method": "POST",
-						"header": [],
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Bearer 00DLT000005y8W6!AQEAQM_BzmGAc9C50ew5dHciarq4jL2hDuUcvpDDQnqw3SIs5Snt8ZCQJX2lbe9swZW6vHPy9.paaSYRkjHzhMd.Fx3EZ6Gc",
+								"type": "text"
+							}
+						],
 						"body": {
 							"mode": "raw",
 							"raw": "{\n  \"pricingPref\": \"{{$pricingPref}}\",\n  \"configurationPref\": {\n    \"configurationMethod\": \"skip\"\n  },\n  \"graph\": {\n    \"graphId\": \"{{$requestName}}\",\n    \"records\": [\n      {\n        \"referenceId\": \"refOrder\",\n        \"record\": {\n          \"attributes\": {\n            \"type\": \"Order\",\n            \"method\": \"POST\"\n          },\n          \"Status\": \"Draft\",\n          \"AccountId\": \"{{accountId}}\",\n          \"Pricebook2Id\": \"{{standardPricebookId}}\",\n          \"BillToContactId\": \"{{contactId}}\",\n          \"EffectiveDate\": \"2024-11-20\",\n          \"BillingStreet\": \"Block 3, DivyaSree Orion IT/ITES SEZ, Raidurg Village\",\n          \"BillingCity\": \"Hyderabad\",\n          \"BillingState\": \"TS\",\n          \"BillingPostalCode\": \"500032\",\n          \"BillingCountry\": \"India\",\n          \"ShippingStreet\": \"Block 3, DivyaSree Orion IT/ITES SEZ, Raidurg Village\",\n          \"ShippingCity\": \"Hyderabad\",\n          \"ShippingState\": \"TS\",\n          \"ShippingPostalCode\": \"500032\",\n          \"ShippingCountry\": \"India\"\n        }\n      },\n      {\n        \"referenceId\": \"refAppTag\",\n        \"record\": {\n          \"attributes\": {\n            \"type\": \"AppUsageAssignment\",\n            \"method\": \"POST\"\n          },\n          \"AppUsageType\": \"RevenueLifecycleManagement\",\n          \"RecordId\": \"@{refOrder.id}\"\n        }\n      },\n      {\n        \"referenceId\": \"refOrderAction\",\n        \"record\": {\n          \"attributes\": {\n            \"type\": \"OrderAction\",\n            \"method\": \"POST\"\n          },\n          \"OrderId\": \"@{refOrder.id}\",\n          \"Type\": \"Add\"\n        }\n      },\n      {\n        \"referenceId\": \"OrderItem1\",\n        \"record\": {\n          \"attributes\": {\n            \"type\": \"OrderItem\",\n            \"method\": \"POST\"\n          },\n          \"OrderId\": \"@{refOrder.id}\",\n          \"PricebookEntryId\": \"{{oneTimePriceBookEntryId}}\",\n          \"Product2Id\": \"{{oneTimeProductId}}\",\n          \"Quantity\": {{$quantity}},\n          \"UnitPrice\": {{$unitPrice}},\n          \"OrderActionId\": \"@{refOrderAction.id}\"\n        }\n      }\n    ]\n  }\n}",

src/integrationTest/resources/pm-templates/core/milestone/env.postman_environment.json

@@ -4,19 +4,19 @@
   "values": [
     {
       "key" : "baseUrl",
-      "value" : "https://orgfarm-fe6a79aee6.test1.my.pc-rnd.salesforce.com/",
+      "value" : "https://dlt000005y8w62ai.test1.my.pc-rnd.salesforce.com",
       "type" : "default",
       "enabled" : true
     },
     {
       "key" : "username",
-      "value" : "[email protected]",
+      "value" : "[email protected]",
       "type" : "default",
       "enabled" : true
     },
     {
       "key" : "password",
-      "value" : "orgfarm1234",
+      "value" : "test1234",
       "type" : "default",
       "enabled" : true
     },

src/main/kotlin/com/salesforce/revoman/ReVoman.kt

@@ -189,13 +189,7 @@ object ReVoman {
               // PRE-REQ-JS
               val item = regexReplacer.replaceVariablesInPmItem(itemWithRegex, pm)
               val httpRequest = item.request.toHttpRequest(moshiReVoman)
-              fireHttpRequest(
-                  step,
-                  item.request.auth,
-                  httpRequest,
-                  kick.insecureHttp(),
-                  moshiReVoman,
-                )
+              fireHttpRequest(step, httpRequest, kick.insecureHttp(), moshiReVoman)
                 .mapLeft { sr.copy(requestInfo = Left(it).toVavr()) }
                 .map {
                   sr.copy(

src/main/kotlin/com/salesforce/revoman/internal/exe/HttpRequest.kt

@@ -9,7 +9,6 @@ package com.salesforce.revoman.internal.exe
 
 import arrow.core.Either
 import com.salesforce.revoman.internal.json.MoshiReVoman
-import com.salesforce.revoman.internal.postman.template.Auth
 import com.salesforce.revoman.output.ExeType.HTTP_REQUEST
 import com.salesforce.revoman.output.report.Step
 import com.salesforce.revoman.output.report.TxnInfo
@@ -23,19 +22,15 @@ import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory
 import org.apache.hc.core5.http.config.RegistryBuilder
 import org.apache.hc.core5.ssl.SSLContextBuilder
 import org.http4k.client.ApacheClient
-import org.http4k.core.Filter
 import org.http4k.core.HttpHandler
-import org.http4k.core.NoOp
 import org.http4k.core.Request
 import org.http4k.core.Response
 import org.http4k.core.then
-import org.http4k.filter.ClientFilters
 import org.http4k.filter.DebuggingFilters
 
 @JvmSynthetic
 internal fun fireHttpRequest(
   currentStep: Step,
-  auth: Auth?,
   httpRequest: Request,
   insecureHttp: Boolean,
   moshiReVoman: MoshiReVoman,
@@ -44,14 +39,13 @@ internal fun fireHttpRequest(
       // * NOTE gopala.akshintala 06/08/22: Preparing httpClient for each step,
       // * as there can be intermediate auths
       // ! TODO 29/01/24 gopala.akshintala: When would bearer token size be > 1?
-      prepareHttpClient(auth?.bearer?.firstOrNull()?.value, insecureHttp)(httpRequest)
+      prepareHttpClient(insecureHttp)(httpRequest)
     }
     .mapLeft { HttpRequestFailure(it, TxnInfo(httpMsg = httpRequest, moshiReVoman = moshiReVoman)) }
     .map { TxnInfo(httpMsg = it, moshiReVoman = moshiReVoman) }
 
-private fun prepareHttpClient(bearerToken: String?, insecureHttp: Boolean): HttpHandler =
+private fun prepareHttpClient(insecureHttp: Boolean): HttpHandler =
   DebuggingFilters.PrintRequestAndResponse()
-    .then(if (bearerToken.isNullOrEmpty()) Filter.NoOp else ClientFilters.BearerAuth(bearerToken))
     .then(if (insecureHttp) ApacheClient(client = insecureApacheHttpClient()) else ApacheClient())
 
 /** Only for Testing. DO NOT USE IN PROD */

src/main/kotlin/com/salesforce/revoman/internal/postman/template/Template.kt

@@ -18,6 +18,7 @@ import org.http4k.core.Uri
 import org.http4k.core.queryParametersEncoded
 import org.http4k.core.with
 import org.http4k.lens.Header.CONTENT_TYPE
+import org.http4k.lens.bearerAuth
 
 @JsonClass(generateAdapter = true)
 internal data class Template(val item: List<Item>, val auth: Auth?)
@@ -86,8 +87,13 @@ data class Request(
         .Request(Method.valueOf(method), uri)
         .headers(header.map { it.key.trim() to it.value.trim() })
         .body(cleansedRawBody)
-    return if (contentTypeHeader != null) request.with(CONTENT_TYPE of contentTypeHeader)
-    else request
+    val requestWithAuth =
+      auth?.bearer?.firstOrNull()?.value?.let {
+        // * NOTE 11 May 2025 gopala.akshintala: Auth in headers will be overridden by Auth from
+        // request, to align with Postman app behavior
+        request.removeHeader("Authorization").bearerAuth(it)
+      } ?: request
+    return contentTypeHeader?.let { requestWithAuth.with(CONTENT_TYPE of it) } ?: requestWithAuth
   }
 
   companion object {