rm idps

Makefile

@@ -67,7 +67,7 @@ login-test-acceptance-build-bake:
 	$(BAKE_CLI_WITH_COMMON_ARGS) login-test-acceptance login-standalone
 
 login-test-acceptance-build-compose:
-	$(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink oidcrp samlsp
+	$(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink
 
 login-test-acceptance-build: login-test-acceptance-build-compose login-test-acceptance-build-bake
 	@:

apps/login-test-acceptance/docker-compose-dev.yaml

@@ -0,0 +1,14 @@
+services:
+  traefik:
+    extra_hosts:
+      - host.docker.internal:host-gateway
+  setup:
+    environment:
+      LOGIN_BASE_URL: https://localhost/ui/v2/login/
+      ZITADEL_API_INTERNAL_URL: http://zitadel:8080
+      ZITADEL_API_URL: https://localhost
+      ZITADEL_API_DOMAIN: localhost
+    volumes:
+      - pat:/pat # Read the PAT file from zitadels setup
+      - ./env:/acceptance-env # Write the environment variables file for the tests
+      - ../login:/login-env # Write the environment variables file for the login

apps/login-test-acceptance/docker-compose.yaml

@@ -9,6 +9,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.zitadel.rule=!PathPrefix(`/ui/v2/login`)"
       - "traefik.http.services.zitadel-service.loadbalancer.server.scheme=h2c"
+      - "traefik.http.middlewares.zitadel-headers.headers.customrequestheaders.Host=zitadel"
     ports:
       - "8080:8080"
     volumes:
@@ -256,12 +257,12 @@ services:
         condition: "service_healthy"
       sink:
         condition: service_healthy
-      oidcrp:
+#      oidcrp:
-        condition: service_healthy
+#        condition: service_healthy
 #      oidcop:
 #        condition: service_healthy
-      samlsp:
+#      samlsp:
-        condition: service_healthy
+#        condition: service_healthy
 #      samlidp:
 #        condition: service_healthy
 

apps/login-test-acceptance/go-command.Dockerfile.dockerignore

@@ -1,6 +0,0 @@
-*
-!idp
-!oidcrp
-!samlsp
-!setup
-!sink

apps/login-test-acceptance/package.json

@@ -2,14 +2,8 @@
   "name": "login-test-acceptance",
   "private": true,
   "scripts": {
-    "test:acceptance": "pnpm exec playwright test",
+    "test:acceptance": "pnpm exec playwright",
-    "run-zitadel": "docker compose -f ./acceptance/docker-compose.yaml run setup",
+    "test:acceptance:setup": "pnpm exec playwright"
-    "run-sink": "docker compose -f ./acceptance/docker-compose.yaml up -d sink",
-    "run-samlsp": "docker compose -f ./acceptance/saml/docker-compose.yaml up -d",
-    "run-samlidp": "docker compose -f ./acceptance/idp/saml/docker-compose.yaml up -d",
-    "run-oidcrp": "docker compose -f ./acceptance/oidc/docker-compose.yaml up -d",
-    "run-oidcop": "docker compose -f ./acceptance/idp/oidc/docker-compose.yaml up -d",
-    "stop": "docker compose -f ./acceptance/docker-compose.yaml stop"
   },
   "devDependencies": {
     "@otplib/core": "^12.0.0",

apps/login-test-acceptance/zitadel.yaml

@@ -1,4 +1,4 @@
-ExternalDomain: traefik
+ExternalDomain: zitadel
 ExternalSecure: true
 ExternalPort: 443