Merge pull request #108 from hmrc/GG-7754

GG-7754: openid-connect-userinfo : implicit auditing not working

app/config/AppContext.scala

@@ -18,19 +18,14 @@ package config
 
 import com.typesafe.config.ConfigObject
 import javax.inject.{Inject, Singleton}
-import play.api.{Configuration, Environment, Mode}
+import play.api.Configuration
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 
 @Singleton
-class AppContext @Inject() (val runModeConfiguration: Configuration, environment: Environment) extends ServicesConfig(runModeConfiguration) {
-  protected def mode: Mode = environment.mode
-
+class AppContext @Inject() (val runModeConfiguration: Configuration) extends ServicesConfig(runModeConfiguration) {
   lazy val appName:                         String = runModeConfiguration.get[String]("appName")
-  lazy val appUrl:                          String = runModeConfiguration.get[String]("appUrl")
   lazy val authUrl:                         String = baseUrl("auth")
   lazy val thirdPartyDelegatedAuthorityUrl: String = baseUrl("third-party-delegated-authority")
   lazy val access:                          Option[ConfigObject] = runModeConfiguration.getOptional[ConfigObject]("api.access.version")
-  lazy val desEnvironment:                  String = runModeConfiguration.get[String](s"microservice.services.des.environment")
-  lazy val desBearerToken:                  String = runModeConfiguration.get[String](s"microservice.services.des.bearer-token")
   lazy val logUserInfoResponsePayload:      Boolean = runModeConfiguration.underlying.getBoolean("log-user-info-response-payload")
 }

conf/application.conf

@@ -26,8 +26,6 @@ play.modules.enabled += "config.GuiceModule"
 play.http.filters = "filters.MicroserviceFilters"
 play.http.errorHandler = "handlers.ErrorHandler"
 
-appUrl = "https://"${appName}".protected.mdtp"
-
 # Session Timeout
 # ~~~~
 # The default session timeout for the app is 15 minutes (900seconds).
@@ -56,9 +54,6 @@ play.i18n.langs = ["en"]
 # !!!WARNING!!! DO NOT CHANGE THIS ROUTER
 play.http.router = prod.Routes
 
-# DES API endpoint
-des.individual.endpoint = /pay-as-you-earn/02.00.00/individuals/
-
 feature.addressLine5 = false
 feature.countryCode = false
 
@@ -80,7 +75,7 @@ controllers {
   controllers.LiveUserInfoController = {
     needsAuth = true
     needsLogging = true
-    needsAuditing = false
+    needsAuditing = true
     authParams.pattern = "/([\\d\\w-]+).*"
   }
 
@@ -148,13 +143,6 @@ microservice {
       port = 8100
     }
 
-    des {
-      host = localhost
-      port = 9625
-      bearer-token = "local"
-      environment = "local"
-    }
-
     third-party-delegated-authority {
       host = localhost
       port = 9609