Merge pull request #67 from hmrc/bugfix

updated getregister to use th correct header function
hmrc · Mar 14, 2017 · 6d82aca · 6d82aca
2 parents e6cbb23 + 83182dd
commit 6d82aca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/connectors/RegistrationConnector.scala b/app/connectors/RegistrationConnector.scala
@@ -112,7 +112,7 @@ class RegistrationConnector @Inject()( appConfig: AppConfig,
 
     implicit val loggingConfig = RegistrationConnector.getRegistrationLoggingConfig
     lazy val requestDetails: Map[String, String] = Map("nino" -> nino)
-    val updatedHc = createHeaderCarrierPost
+    val updatedHc = createHeaderCarrierGet
 
     lazy val auditRequest = logging.auditFor(auditGetRegistrationName, requestDetails)(updatedHc)
     auditRequest(eventTypeRequest)

diff --git a/app/connectors/SubscriptionConnector.scala b/app/connectors/SubscriptionConnector.scala
@@ -43,13 +43,15 @@ class SubscriptionConnector @Inject()
   val businessSubscribeUrl: String => String = nino => s"${applicationConfig.desURL}/income-tax-self-assessment/nino/$nino/business"
   val propertySubscribeUrl: String => String = nino => s"${applicationConfig.desURL}/income-tax-self-assessment/nino/$nino/properties"
 
+  lazy val urlHeaderAuthorization: String = s"Bearer ${applicationConfig.desToken}"
+
   def createHeaderCarrierPost(hc: HeaderCarrier): HeaderCarrier =
-    hc.copy(authorization = Some(Authorization(s"Bearer ${applicationConfig.desToken}")))
-      .withExtraHeaders("Environment" -> applicationConfig.desEnvironment, "Content-Type" -> "application/json")
+    HeaderCarrier(extraHeaders = Seq("Environment" -> applicationConfig.desEnvironment, "Content-Type" -> "application/json"),
+      authorization = Some(Authorization(urlHeaderAuthorization)))
 
   def createHeaderCarrierPostEmpty(headerCarrier: HeaderCarrier): HeaderCarrier =
-    headerCarrier.copy(authorization = Some(Authorization(s"Bearer ${applicationConfig.desToken}")))
-      .withExtraHeaders("Environment" -> applicationConfig.desEnvironment)
+    HeaderCarrier(extraHeaders = Seq("Environment" -> applicationConfig.desEnvironment),
+      authorization = Some(Authorization(urlHeaderAuthorization)))
 
   def businessSubscribe(nino: String, businessSubscriptionPayload: BusinessSubscriptionRequestModel)
                        (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[BusinessConnectorUtil.Response] = {