Fjerner tokenprovider

navikt · Jan 24, 2025 · d939f11 · d939f11
1 parent cf25d92
commit d939f11
Showing 1 changed file with 0 additions and 83 deletions.
diff --git a/src/main/kotlin/no/nav/syfo/koin/ExternalSystemsModule.kt b/src/main/kotlin/no/nav/syfo/koin/ExternalSystemsModule.kt
@@ -1,24 +1,12 @@
 package no.nav.syfo.koin
 
-import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod
 import io.ktor.server.config.ApplicationConfig
 import no.nav.auth.AuthClient
 import no.nav.auth.IdentityProvider
 import no.nav.auth.fetchToken
 import no.nav.helsearbeidsgiver.oppgave.OppgaveClient
 import no.nav.helsearbeidsgiver.pdl.Behandlingsgrunnlag
 import no.nav.helsearbeidsgiver.pdl.PdlClient
-import no.nav.helsearbeidsgiver.tokenprovider.AccessTokenProvider
-import no.nav.helsearbeidsgiver.tokenprovider.DefaultOAuth2HttpClient
-import no.nav.helsearbeidsgiver.tokenprovider.OAuth2TokenProvider
-import no.nav.helsearbeidsgiver.tokenprovider.TokenResolver
-import no.nav.security.token.support.client.core.ClientAuthenticationProperties
-import no.nav.security.token.support.client.core.ClientProperties
-import no.nav.security.token.support.client.core.OAuth2GrantType
-import no.nav.security.token.support.client.core.oauth2.ClientCredentialsTokenClient
-import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenService
-import no.nav.security.token.support.client.core.oauth2.OnBehalfOfTokenClient
-import no.nav.security.token.support.client.core.oauth2.TokenExchangeClient
 import no.nav.syfo.client.dokarkiv.DokArkivClient
 import no.nav.syfo.client.norg.Norg2Client
 import no.nav.syfo.client.saf.SafDokumentClient
@@ -27,10 +15,7 @@ import no.nav.syfo.util.getString
 import org.koin.core.module.Module
 import org.koin.core.qualifier.Qualifier
 import org.koin.core.qualifier.QualifierValue
-import org.koin.core.qualifier.named
-import org.koin.core.scope.Scope
 import org.koin.dsl.bind
-import java.net.URI
 
 enum class AccessScope : Qualifier {
     DOKARKIV,
@@ -44,7 +29,6 @@ enum class AccessScope : Qualifier {
 }
 
 fun Module.externalSystemClients(config: ApplicationConfig) {
-    val clientConfig = config.configList("no.nav.security.jwt.client.registration.clients").first()
     single {
         AuthClient(
             httpClient = get(),
@@ -54,33 +38,6 @@ fun Module.externalSystemClients(config: ApplicationConfig) {
         )
     }
 
-    single(named(AccessScope.OPPGAVE)) {
-        oauth2TokenProvider(
-            clientConfig,
-            clientConfig.getString("oppgavescope"),
-        )
-    } bind AccessTokenProvider::class
-
-    single(named(AccessScope.DOKARKIV)) {
-        oauth2TokenProvider(
-            clientConfig,
-            clientConfig.getString("dokarkivscope"),
-        )
-    } bind AccessTokenProvider::class
-
-    single(named(AccessScope.SAF)) {
-        oauth2TokenProvider(
-            clientConfig,
-            clientConfig.getString("safscope"),
-        )
-    } bind AccessTokenProvider::class
-
-    single(named(AccessScope.PDL)) {
-        oauth2TokenProvider(
-            clientConfig,
-            clientConfig.getString("pdlscope"),
-        )
-    } bind AccessTokenProvider::class
     single {
         val azureClient: AuthClient = get()
         PdlClient(
@@ -130,43 +87,3 @@ fun Module.externalSystemClients(config: ApplicationConfig) {
         )
     }
 }
-
-private fun Scope.oauth2TokenProvider(
-    config: ApplicationConfig,
-    scope: String,
-): OAuth2TokenProvider =
-    OAuth2TokenProvider(
-        oauth2Service = accessTokenService(),
-        clientProperties = config.azureAdConfig(scope),
-    )
-
-private fun accessTokenService(): OAuth2AccessTokenService =
-    DefaultOAuth2HttpClient().let {
-        OAuth2AccessTokenService(
-            TokenResolver(),
-            OnBehalfOfTokenClient(it),
-            ClientCredentialsTokenClient(it),
-            TokenExchangeClient(it),
-        )
-    }
-
-private fun ApplicationConfig.azureAdConfig(scope: String): ClientProperties =
-    ClientProperties(
-        getString("token_endpoint_url").let(::URI),
-        getString("well_known_url").let(::URI),
-        getString("grant_type").let(::OAuth2GrantType),
-        scope.split(","),
-        authProps(),
-        null,
-        null,
-    )
-
-private fun ApplicationConfig.authProps(): ClientAuthenticationProperties {
-    val prefix = "authentication"
-    return ClientAuthenticationProperties(
-        getString("$prefix.client_id"),
-        getString("$prefix.client_auth_method").let(::ClientAuthenticationMethod),
-        getString("$prefix.client_secret"),
-        null,
-    )
-}