diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml
deleted file mode 100644
index 18ab3a96315..00000000000
--- a/.github/workflows/app.organisasjon-tilgang-frontend.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: organisasjon-tilgang-frontend
-
-on:
- push:
- paths:
- - "plugins/**"
- - "libs/reactive-core/**"
- - "libs/reactive-frontend/**"
- - "libs/reactive-session-security/**"
- - "libs/security-core/**"
- - "apps/organisasjon-tilgang-frontend/**"
- - ".github/workflows/app.organisasjon-tilgang-frontend.yml"
-
-jobs:
- workflow:
- uses: ./.github/workflows/common.workflow.frontend.yml
- with:
- working-directory: "apps/organisasjon-tilgang-frontend"
- deploy-tag: "#deploy-organisasjon-tilgang-frontend"
- permissions:
- contents: read
- id-token: write
- secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml
index 1b084267e6c..6136dd68925 100644
--- a/.github/workflows/app.person-organisasjon-tilgang-service.yml
+++ b/.github/workflows/app.person-organisasjon-tilgang-service.yml
@@ -17,7 +17,6 @@ jobs:
with:
working-directory: "apps/person-organisasjon-tilgang-service"
deploy-tag: "#deploy-person-organisasjon-tilgang-service"
- deploy-tag-test: "#deploy-test-person-organisasjon-tilgang-service"
permissions:
contents: read
id-token: write
diff --git a/apps/organisasjon-tilgang-frontend/.run/install.run.xml b/apps/organisasjon-tilgang-frontend/.run/install.run.xml
deleted file mode 100644
index a4a9efa158b..00000000000
--- a/apps/organisasjon-tilgang-frontend/.run/install.run.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/.run/start.run.xml b/apps/organisasjon-tilgang-frontend/.run/start.run.xml
deleted file mode 100644
index 218f295424e..00000000000
--- a/apps/organisasjon-tilgang-frontend/.run/start.run.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/Dockerfile b/apps/organisasjon-tilgang-frontend/Dockerfile
deleted file mode 100644
index fc1dcd83426..00000000000
--- a/apps/organisasjon-tilgang-frontend/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-LABEL maintainer="Team Dolly"
-
-ADD /build/libs/app.jar /app/app.jar
-
-EXPOSE 8080
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/README.md b/apps/organisasjon-tilgang-frontend/README.md
deleted file mode 100644
index 876680a93e0..00000000000
--- a/apps/organisasjon-tilgang-frontend/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## organisajon-tilgang-frontend
-
-App som forvalter tilgangsstyring for organisasjoner som har tilgang til Dolly gjennom bankid og legger på sikkerhet.
-
-## Ingress
-
-Tjenesten kan nås på [Organisasjon tilgang](https://testnav-organisasjon-tilgang.intern.nav.no)
-
-## Lokal kjøring
-
-Ha naisdevice kjørende og kjør OrganisasjonTilgangFrontendApplicationStarter med følgende argumenter:
-
-```
--Dspring.profiles.active=local
--Dspring.cloud.vault.token=[vault-token]
-```
diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle
deleted file mode 100644
index d7f2f825d07..00000000000
--- a/apps/organisasjon-tilgang-frontend/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-plugins {
- id "dolly-apps"
-}
-
-sonarqube {
- properties {
- property "sonar.projectKey", "testnav-organisasjon-tilgang-frontend"
- property "sonar.projectName", "testnav-organisasjon-tilgang-frontend"
- property 'sonar.sources', 'src/main/java,src/main/js'
- property 'sonar.tests', 'src/test/java'
- }
-}
-
-dependencies {
- implementation ('no.nav.testnav.libs:security-core') {
- exclude group: 'org.springframework.session', module: 'spring-session-data-redis'
- }
-
- implementation 'no.nav.testnav.libs:reactive-core'
-
- implementation ('no.nav.testnav.libs:reactive-session-security') {
- exclude group: 'org.springframework.session', module: 'spring-session-data-redis'
- exclude group: 'org.springframework.boot', module: 'spring-boot-starter-data-redis'
- }
-
- implementation 'no.nav.testnav.libs:reactive-frontend'
-
- implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-
- implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
-
- testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-}
diff --git a/apps/organisasjon-tilgang-frontend/config.yml b/apps/organisasjon-tilgang-frontend/config.yml
deleted file mode 100644
index 81f7c787cbb..00000000000
--- a/apps/organisasjon-tilgang-frontend/config.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
-metadata:
- name: testnav-organisasjon-tilgang-frontend
- namespace: dolly
- labels:
- team: dolly
- annotations:
- nginx.ingress.kubernetes.io/proxy-read-timeout: "15"
- nginx.ingress.kubernetes.io/proxy-send-timeout: "15"
-spec:
- env:
- - name: SPRING_PROFILES_ACTIVE
- value: prod
- port: 8080
- webproxy: true
- azure:
- application:
- enabled: true
- tenant: nav.no
- replyURLs:
- - "https://testnav-organisasjon-tilgang.intern.dev.nav.no/login/oauth2/code/aad"
- - "http://localhost:8080/login/oauth2/code/aad"
- claims:
- groups:
- - id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
- liveness:
- path: /internal/isAlive
- periodSeconds: 30
- initialDelay: 30
- observability:
- logging:
- destinations:
- - id: elastic
- autoInstrumentation:
- enabled: true
- runtime: java
- readiness:
- path: /internal/isReady
- initialDelay: 30
- prometheus:
- enabled: true
- path: /internal/metrics
- replicas:
- min: 1
- max: 1
- accessPolicy:
- outbound:
- rules:
- - application: testnav-organisasjon-tilgang-service
- resources:
- limits:
- memory: 1024Mi
- requests:
- cpu: 300m
- memory: 512Mi
- image: "{{image}}"
- ingresses:
- - "https://testnav-organisasjon-tilgang.intern.dev.nav.no"
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.jar b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7454180f2ae..00000000000
Binary files a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 48c0a02ca41..00000000000
--- a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-tilgang-frontend/gradlew b/apps/organisasjon-tilgang-frontend/gradlew
deleted file mode 100755
index 3da45c161b0..00000000000
--- a/apps/organisasjon-tilgang-frontend/gradlew
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright ? 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-# Gradle start up script for POSIX generated by Gradle.
-#
-# Important for running:
-#
-# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-# noncompliant, but you have some other compliant shell such as ksh or
-# bash, then to run this script, type that shell name before the whole
-# command line, like:
-#
-# ksh Gradle
-#
-# Busybox and similar reduced shells will NOT work, because this script
-# requires all of these POSIX shell features:
-# * functions;
-# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
-# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
-# * compound commands having a testable exit status, especially ?case?;
-# * various built-in commands including ?command?, ?set?, and ?ulimit?.
-#
-# Important for patching:
-#
-# (2) This script targets any POSIX shell, so it avoids extensions provided
-# by Bash, Ksh, etc; in particular arrays are avoided.
-#
-# The "traditional" practice of packing multiple parameters into a
-# space-separated string is a well documented source of bugs and security
-# problems, so this is (mostly) avoided, by progressively accumulating
-# options in "$@", and eventually passing that to Java.
-#
-# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-# see the in-line comments for details.
-#
-# There are tweaks for specific operating systems such as AIX, CygWin,
-# Darwin, MinGW, and NonStop.
-#
-# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-# within the Gradle project.
-#
-# You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
- [ -h "$app_path" ]
-do
- ls=$( ls -ld "$app_path" )
- link=${ls#*' -> '}
- case $link in #(
- /*) app_path=$link ;; #(
- *) app_path=$APP_HOME$link ;;
- esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
- echo "$*"
-} >&2
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in #(
- CYGWIN* ) cygwin=true ;; #(
- Darwin* ) darwin=true ;; #(
- MSYS* | MINGW* ) msys=true ;; #(
- NONSTOP* ) nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD=$JAVA_HOME/jre/sh/java
- else
- JAVACMD=$JAVA_HOME/bin/java
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
- case $MAX_FD in #(
- max*)
- MAX_FD=$( ulimit -H -n ) ||
- warn "Could not query maximum file descriptor limit"
- esac
- case $MAX_FD in #(
- '' | soft) :;; #(
- *)
- ulimit -n "$MAX_FD" ||
- warn "Could not set maximum file descriptor limit to $MAX_FD"
- esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-# * args from the command line
-# * the main class name
-# * -classpath
-# * -D...appname settings
-# * --module-path (only if needed)
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
- APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
- JAVACMD=$( cygpath --unix "$JAVACMD" )
-
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- for arg do
- if
- case $arg in #(
- -*) false ;; # don't mess with options #(
- /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
- [ -e "$t" ] ;; #(
- *) false ;;
- esac
- then
- arg=$( cygpath --path --ignore --mixed "$arg" )
- fi
- # Roll the args list around exactly as many times as the number of
- # args, so each arg winds up back in the position where it started, but
- # possibly modified.
- #
- # NB: a `for` loop captures its iteration list before it begins, so
- # changing the positional parameters here affects neither the number of
- # iterations, nor the values presented in `arg`.
- shift # remove old arg
- set -- "$@" "$arg" # push replacement arg
- done
-fi
-
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
- "-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-# set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
- printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
- xargs -n1 |
- sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
- tr '\n' ' '
- )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/apps/organisasjon-tilgang-frontend/gradlew.bat b/apps/organisasjon-tilgang-frontend/gradlew.bat
deleted file mode 100644
index ac1b06f9382..00000000000
--- a/apps/organisasjon-tilgang-frontend/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/apps/organisasjon-tilgang-frontend/gradlewUpdate.sh b/apps/organisasjon-tilgang-frontend/gradlewUpdate.sh
deleted file mode 100755
index e5ee6361152..00000000000
--- a/apps/organisasjon-tilgang-frontend/gradlewUpdate.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gradle wrapper
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/settings.gradle b/apps/organisasjon-tilgang-frontend/settings.gradle
deleted file mode 100644
index c690a5eb76b..00000000000
--- a/apps/organisasjon-tilgang-frontend/settings.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-plugins {
- id "com.gradle.develocity" version "3.17.4"
-}
-
-rootProject.name = 'organisasjon-tilgang-frontend'
-
-includeBuild "../../plugins/java"
-
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-frontend'
-includeBuild '../../libs/reactive-session-security'
-includeBuild '../../libs/security-core'
-
-develocity {
- buildScan {
- termsOfUseUrl = "https://gradle.com/terms-of-service"
- termsOfUseAgree = "yes"
- }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/OrganisasjonTilgangFrontendApplicationStarter.java b/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/OrganisasjonTilgangFrontendApplicationStarter.java
deleted file mode 100644
index 17092a5c8dd..00000000000
--- a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/OrganisasjonTilgangFrontendApplicationStarter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangfrontend;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.organisasjontilgangfrontend.config.Consumers;
-import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactivefrontend.config.FrontendConfig;
-import no.nav.testnav.libs.reactivefrontend.filter.AddAuthenticationHeaderToRequestGatewayFilterFactory;
-import no.nav.testnav.libs.reactivesessionsecurity.config.OidcInMemorySessionConfiguration;
-import no.nav.testnav.libs.reactivesessionsecurity.exchange.TokenExchange;
-import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration;
-import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.cloud.gateway.route.builder.Buildable;
-import org.springframework.cloud.gateway.route.builder.PredicateSpec;
-import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-
-import java.util.function.Function;
-
-@Import({
- CoreConfig.class,
- OidcInMemorySessionConfiguration.class,
- FrontendConfig.class
-})
-@SpringBootApplication(exclude = { ReactiveUserDetailsServiceAutoConfiguration.class })
-@RequiredArgsConstructor
-public class OrganisasjonTilgangFrontendApplicationStarter {
-
- private final Consumers consumers;
- private final TokenExchange tokenExchange;
-
- @Bean
- public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
- return builder
- .routes()
- .route(createRoute(consumers.getTestnavOrganisasjonTilgangService()))
- .build();
- }
-
- public static void main(String[] args) {
- SpringApplication.run(OrganisasjonTilgangFrontendApplicationStarter.class, args);
- }
-
- private GatewayFilter addAuthenticationHeaderFilterFrom(ServerProperties serverProperties) {
- return new AddAuthenticationHeaderToRequestGatewayFilterFactory()
- .apply(exchange -> {
- return tokenExchange
- .exchange(serverProperties, exchange)
- .map(AccessToken::getTokenValue);
- });
- }
-
- private Function> createRoute(ServerProperties serverProperties) {
- var host = serverProperties.getUrl();
- var filter = addAuthenticationHeaderFilterFrom(serverProperties);
- return spec -> spec
- .path("/organisasjon-tilgang-service/**")
- .filters(filterSpec -> filterSpec
- .rewritePath("/" + "organisasjon-tilgang-service" + "/(?.*)", "/${segment}")
- .filter(filter)
- ).uri(host);
- }
-}
diff --git a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/Consumers.java b/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/Consumers.java
deleted file mode 100644
index b9ccbfe89d9..00000000000
--- a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/Consumers.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangfrontend.config;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import static lombok.AccessLevel.PACKAGE;
-
-/**
- * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
- *