Fikser JettyDevServer med VTP

navikt · Nov 27, 2024 · 174b9c3 · 174b9c3
1 parent 41fb84c
commit 174b9c3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/.run/Ung-sak JettyDevServer.run.xml b/.run/Ung-sak JettyDevServer.run.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ung-sak JettyDevServer" type="Application" factoryName="Application">
+    <option name="ALTERNATIVE_JRE_PATH" value="21" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="MAIN_CLASS_NAME" value="no.nav.ung.sak.web.server.jetty.JettyDevServer" />
+    <module name="web-webapp" />
+    <option name="PROGRAM_PARAMETERS" value="--vtp" />
+    <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="no.nav.k9.sak.web.server.jetty.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/web/app-vtp.properties b/web/app-vtp.properties
@@ -11,7 +11,7 @@ arbeidsfordeling.rs.url=https://localhost:8063/rest/norg2/api/v1/arbeidsfordelin
 url.k9oppdrag=http://localhost:8070/k9/oppdrag/api
 k9abakus.url=http://localhost:8015/k9/abakus
 k9abakus.scope=api://vtp.k9saksbehandling.k9-abakus/.default
-abakus.callback.url=http://host.docker.internal:8080/ung/sak/api/registerdata/iay/callback
+abakus.callback.url=http://host.docker.internal:8085/ung/sak/api/registerdata/iay/callback
 abakus.callback.scope=api://vtp.k9saksbehandling.ung-sak/.default
 k9.psb.uttak.url=http://localhost:8686/pleiepenger-barn-uttak
 saf.base.url=https://localhost:8063/rest/api/saf
@@ -92,9 +92,23 @@ INFOTRYGD_MIGRERING_TILLATELSER=saksbeh
 
 AZURE_APP_PRE_AUTHORIZED_APPS=[{"name":"vtp:teamforeldrepenger:vtp","clientId":"vtp"}]
 
-
-
 k9inntektsmelding.url=http://localhost:8040/k9/inntektsmelding
 
 db.username=ung_sak_unit
 db.password=ung_sak
+
+# Gruppenavn for roller fra Active Directory (preprod)
+# 0000-GA-k9-beslutter
+bruker.gruppe.id.beslutter=f171716a-aaab-4e76-8869-047abaebb8f5
+# 0000-GA-GOSYS_UTVIDET
+bruker.gruppe.id.egenansatt=de44052d-b062-4497-89a2-0c85b935b808
+# 0000-GA-GOSYS_KODE6
+bruker.gruppe.id.kode.6=87ea7c87-08a2-43bc-83d6-0bfeee92185d
+# 0000-GA-GOSYS_KODE7
+bruker.gruppe.id.kode.7=69d4a70f-1c83-42a8-8fb8-2f5d54048647
+# 0000-GA-k9-overstyrer
+bruker.gruppe.id.overstyrer=5c7003ff-b3ba-407c-9b58-7fea9bf7cb2e
+# 0000-GA-k9-saksbehandler
+bruker.gruppe.id.saksbehandler=93e8903d-5c3f-4cbe-929e-0afeb22dec73
+# 0000-GA-k9-veileder
+bruker.gruppe.id.veileder=5bc5cae2-3ef9-4897-9828-766757299de8
diff --git a/web/src/test/java/no/nav/ung/sak/web/server/jetty/JettyDevKonfigurasjon.java b/web/src/test/java/no/nav/ung/sak/web/server/jetty/JettyDevKonfigurasjon.java
@@ -2,7 +2,7 @@
 
 public class JettyDevKonfigurasjon extends JettyWebKonfigurasjon {
     private static final int SSL_SERVER_PORT = 8443;
-    private static final int DEV_SERVER_PORT = 8080;
+    private static final int DEV_SERVER_PORT = 8085;
 
     public JettyDevKonfigurasjon() {
         super(DEV_SERVER_PORT);