diff --git a/app/uk/gov/hmrc/agentauthorisation/config/AppConfig.scala b/app/uk/gov/hmrc/agentauthorisation/config/AppConfig.scala index 91811556..444fcb3d 100644 --- a/app/uk/gov/hmrc/agentauthorisation/config/AppConfig.scala +++ b/app/uk/gov/hmrc/agentauthorisation/config/AppConfig.scala @@ -38,6 +38,6 @@ class AppConfig @Inject() (servicesConfig: ServicesConfig, config: Configuration val apiSupportedVersions: util.List[String] = config.underlying.getStringList("api.supported-versions") - val apiType: String = servicesConfig.getString("api.access.type") + val apiType: String = servicesConfig.getString("api.access") } diff --git a/conf/application.conf b/conf/application.conf index 63de74e4..d2eab739 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -102,13 +102,10 @@ auditing { enabled = true } -api.access { - type = PRIVATE -} - # API Platform api { supported-versions = [1.0, 2.0] + access = PRIVATE } microservice { diff --git a/test/uk/gov/hmrc/agentauthorisation/action/AcceptHeaderFilterSpec.scala b/test/uk/gov/hmrc/agentauthorisation/action/AcceptHeaderFilterSpec.scala index 42d516a7..929bd037 100644 --- a/test/uk/gov/hmrc/agentauthorisation/action/AcceptHeaderFilterSpec.scala +++ b/test/uk/gov/hmrc/agentauthorisation/action/AcceptHeaderFilterSpec.scala @@ -32,7 +32,7 @@ class AcceptHeaderFilterSpec extends BaseSpec { val config = Configuration.apply( "api.supported-versions" -> List("1.0"), - "api.access.type" -> "some config string", + "api.access" -> "some config string", "microservice.services.agent-client-relationships.host" -> "localhost", "microservice.services.agent-client-relationships.port" -> 9434, "microservice.services.agent-client-relationships-frontend.external-url" -> "blah" diff --git a/test/uk/gov/hmrc/agentauthorisation/config/AppConfigSpec.scala b/test/uk/gov/hmrc/agentauthorisation/config/AppConfigSpec.scala index 47bfda64..0474a552 100644 --- a/test/uk/gov/hmrc/agentauthorisation/config/AppConfigSpec.scala +++ b/test/uk/gov/hmrc/agentauthorisation/config/AppConfigSpec.scala @@ -29,7 +29,7 @@ class AppConfigSpec extends UnitSpec { "read service URLs and API settings from configuration" in { val configuration = Configuration( "api.supported-versions" -> List("1.0", "2.0"), - "api.access.type" -> "PRIVATE", + "api.access" -> "PRIVATE", "microservice.services.agent-client-relationships.host" -> "localhost", "microservice.services.agent-client-relationships.port" -> 9434, "microservice.services.agent-client-relationships-frontend.external-url" -> "http://localhost:9435" @@ -46,7 +46,7 @@ class AppConfigSpec extends UnitSpec { "fail clearly when agent-client-relationships-frontend.external-url is missing" in { val configuration = Configuration( "api.supported-versions" -> List("1.0"), - "api.access.type" -> "PRIVATE", + "api.access" -> "PRIVATE", "microservice.services.agent-client-relationships.host" -> "localhost", "microservice.services.agent-client-relationships.port" -> 9434 ) diff --git a/test/uk/gov/hmrc/agentauthorisation/services/DeleteRelationshipServiceSpec.scala b/test/uk/gov/hmrc/agentauthorisation/services/DeleteRelationshipServiceSpec.scala index 1d7b6799..b91b9aa0 100644 --- a/test/uk/gov/hmrc/agentauthorisation/services/DeleteRelationshipServiceSpec.scala +++ b/test/uk/gov/hmrc/agentauthorisation/services/DeleteRelationshipServiceSpec.scala @@ -36,7 +36,7 @@ class DeleteRelationshipServiceSpec extends BaseSpec with MockFactory { private val config = Configuration.apply( "api.supported-versions" -> List("1.0"), - "api.access.type" -> "PRIVATE", + "api.access" -> "PRIVATE", "microservice.services.agent-client-relationships.host" -> "localhost", "microservice.services.agent-client-relationships.port" -> 9434, "microservice.services.agent-client-relationships-frontend.external-url" -> "http://localhost"