Merge branch 'main' of github.com:navikt/sif-brukerdialog into server…

…-oms-arbeidstaker
navikt · Sep 30, 2024 · fd0f3e3 · fd0f3e3
2 parents 91ff731 + 4172f35
commit fd0f3e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/apps/omsorgsdager-kalkulator/nais/dev-gcp.json b/apps/omsorgsdager-kalkulator/nais/dev-gcp.json
@@ -14,5 +14,6 @@
         "NEXT_PUBLIC_DEKORATOR_ENV": "dev",
         "NEXT_PUBLIC_ENVIRONMENT": "dev",
         "NPM_CONFIG_CACHE": "/tmp"
-    }
+    },
+    "skipAutologin": true
 }
diff --git a/apps/omsorgsdager-kalkulator/nais/prod-gcp.json b/apps/omsorgsdager-kalkulator/nais/prod-gcp.json
@@ -14,5 +14,6 @@
         "NEXT_PUBLIC_DEKORATOR_ENV": "prod",
         "NEXT_PUBLIC_ENVIRONMENT": "prod",
         "NPM_CONFIG_CACHE": "/tmp"
-    }
+    },
+    "skipAutologin": true
 }
diff --git a/nais-config/nais.yml b/nais-config/nais.yml
@@ -72,12 +72,15 @@ spec:
        value: {{GITHUB_REF_NAME}}
      - name: NEXT_PUBLIC_GITHUB_REF_NAME
        value: {{GITHUB_REF_NAME}}
+
     tokenx:
          enabled: true
     idporten:
         enabled: true
         sidecar:
+            {{#unless skipAutologin}}
             autoLogin: true
+            {{/unless}}
             autoLoginIgnorePaths:
                 - {{env.PUBLIC_PATH}}/assets/*
             enabled: true