fjern aap-endepunkt(ikke lenger i bruk)

Author: rannveigskjerve

nais/dev-gcp/nais.yaml

@@ -55,8 +55,6 @@ spec:
         - application: tms-mikrofrontend-selector
         - application: meldekort-api-q2
           namespace: meldekort
-        - application: soknad-api
-          namespace: aap
         - application: veilarboppfolging
           namespace: pto
           cluster: dev-fss
@@ -68,10 +66,6 @@ spec:
       value: http://tms-statistikk
     - name: STATISTIKK_CLIENT_ID
       value: dev-gcp.min-side.tms-statistikk
-    - name: AAP_BASE_URL
-      value: http://soknad-api.aap
-    - name: AAP_CLIENT_ID
-      value: dev-gcp:aap:soknad-api
     - name: CORS_ALLOWED_ORIGINS
       value: "*.dev.nav.no"
     - name: CORS_ALLOWED_SCHEMES

nais/prod-gcp/nais.yaml

@@ -53,8 +53,6 @@ spec:
         - application: tms-mikrofrontend-selector
         - application: meldekort-api
           namespace: meldekort
-        - application: soknad-api
-          namespace: aap
         - application: veilarboppfolging
           namespace: pto
           cluster: prod-fss
@@ -66,10 +64,6 @@ spec:
       value: http://tms-statistikk
     - name: STATISTIKK_CLIENT_ID
       value: prod-gcp.min-side.tms-statistikk
-    - name: AAP_BASE_URL
-      value: http://soknad-api.aap
-    - name: AAP_CLIENT_ID
-      value: prod-gcp:aap:soknad-api
     - name: CORS_ALLOWED_ORIGINS
       value: www.nav.no
     - name: CORS_ALLOWED_SCHEMES

src/main/kotlin/no/nav/tms/min/side/proxy/Application.kt

@@ -29,8 +29,6 @@ fun main() {
 data class AppConfiguration(
     val corsAllowedOrigins: String = StringEnvVar.getEnvVar("CORS_ALLOWED_ORIGINS"),
     val corsAllowedSchemes: String = StringEnvVar.getEnvVar("CORS_ALLOWED_SCHEMES"),
-    private val aapBaseUrl: String = StringEnvVar.getEnvVar("AAP_BASE_URL"),
-    private val aapClientId: String = StringEnvVar.getEnvVar("AAP_CLIENT_ID"),
      private val meldekortClientId: String = StringEnvVar.getEnvVar("MELDEKORT_CLIENT_ID"),
     private val meldekortBaseUrl: String = StringEnvVar.getEnvVar("MELDEKORT_BASE_URL"),
     private val utkastClientId: String = StringEnvVar.getEnvVar("UTKAST_CLIENT_ID"),
@@ -82,8 +80,6 @@ data class AppConfiguration(
 
     val externalContentFetcher = ExternalContentFetcher(
         proxyHttpClient = proxyHttpClient,
-        aapClientId = aapClientId,
-        aapBaseUrl = aapBaseUrl,
         meldekortClientId = meldekortClientId,
         meldekortBaseUrl = meldekortBaseUrl,
         aiaBaseUrl = aiaBaseUrl,

src/main/kotlin/no/nav/tms/min/side/proxy/ExternalContentFetcher.kt

@@ -4,21 +4,11 @@ import io.ktor.client.statement.HttpResponse
 
 class ExternalContentFetcher(
     private val proxyHttpClient: ProxyHttpClient,
-    private val aapClientId: String,
-    private val aapBaseUrl: String,
     private val meldekortClientId: String,
     private val meldekortBaseUrl: String,
     private val aiaBaseUrl: String,
     private val aiaClientId: String,
 ) {
-    suspend fun getAapContent(token: String, proxyPath: String?): HttpResponse =
-        proxyHttpClient.getContent(
-            userToken = token,
-            targetAppId = aapClientId,
-            baseUrl = aapBaseUrl,
-            proxyPath = proxyPath,
-        )
-
     suspend fun getMeldekortContent(token: String, proxyPath: String?): HttpResponse =
         proxyHttpClient.getContent(
             userToken = token,

src/main/kotlin/no/nav/tms/min/side/proxy/proxyRoutes.kt

@@ -15,11 +15,6 @@ private val log = KotlinLogging.logger {}
 private val securelog = KotlinLogging.logger("secureLog")
 fun Route.proxyRoutes(contentFetcher: ContentFetcher, externalContentFetcher: ExternalContentFetcher) {
 
-    get("/aap/{proxyPath...}") {
-        val response = externalContentFetcher.getAapContent(accessToken, proxyPath)
-        call.respondBytes(response.readBytes(), response.contentType(), response.status)
-    }
-
     get("/utkast/{proxyPath...}") {
         val response = contentFetcher.getUtkastContent(accessToken, proxyPath)
         call.respondBytes(response.readBytes(), response.contentType(), response.status)

src/test/kotlin/no/nav/tms/min/side/proxy/GetRoutesTest.kt

@@ -20,7 +20,6 @@ import org.junit.jupiter.params.provider.ValueSource
 class GetRoutesTest {
     private val testParametersMap =
         mapOf(
-            "aap" to TestParameters("http://aap.test"),
             "meldekort" to TestParameters("http://meldekort.test"),
             "utkast" to TestParameters("http://utkast.test"),
             "personalia" to TestParameters("http://personalia.test"),
@@ -39,7 +38,7 @@ class GetRoutesTest {
 
 
     @ParameterizedTest
-    @ValueSource(strings = ["aap", "utkast", "meldekort", "selector", "aia"])
+    @ValueSource(strings = [ "utkast", "meldekort", "selector", "aia"])
     fun `proxy get api`(tjenestePath: String) = testApplication {
         val applicationhttpClient = testApplicationHttpClient()
         val proxyHttpClient = ProxyHttpClient(applicationhttpClient, tokendigsMock, azureMock)
@@ -192,8 +191,6 @@ class GetRoutesTest {
 
     private fun externalContentFetcher(proxyHttpClient: ProxyHttpClient) = ExternalContentFetcher(
         proxyHttpClient = proxyHttpClient,
-        aapBaseUrl = testParametersMap.getParameters("aap").baseUrl,
-        aapClientId = "aap",
         meldekortClientId = "meldekort",
         meldekortBaseUrl = testParametersMap.getParameters("meldekort").baseUrl,
         aiaBaseUrl = testParametersMap.getParameters("aia").baseUrl,

src/test/kotlin/no/nav/tms/min/side/proxy/PostRoutesTest.kt

@@ -41,8 +41,6 @@ class PostRoutesTest {
 
     private fun externalContentFetcher(proxyHttpClient: ProxyHttpClient) = ExternalContentFetcher(
         proxyHttpClient = proxyHttpClient,
-        aapClientId = "aap",
-        aapBaseUrl = "",
         meldekortClientId = "meldekort",
         meldekortBaseUrl = "",
         aiaBaseUrl = "placeholder",