From 44e9c99eb31785be0c20757f15f49d23454f40f8 Mon Sep 17 00:00:00 2001
From: Sean <sean.f.t.engelhardt@gmail.com>
Date: Mon, 6 Dec 2021 12:14:18 +0100
Subject: [PATCH] Fix ICC integration

Updates the ICC Service
Changes the ICC port to 9007
Adjust the proxy
Adjust services.env
---
 docker/docker-compose.dev.yml                        | 2 ++
 docker/services.env                                  | 3 +++
 integration/cypress/integration/client-login.spec.js | 5 ++++-
 openslides-icc-service                               | 2 +-
 proxy/entrypoint                                     | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 2f48f1ea5..1a64fe4f9 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -96,6 +96,8 @@ services:
     volumes:
       - ../openslides-icc-service/cmd:/root/cmd
       - ../openslides-icc-service/internal:/root/internal
+    ports:
+      - "9007:9007"
 
   auth:
     image: openslides-auth-dev
diff --git a/docker/services.env b/docker/services.env
index 8d83dfa98..0e0eb66cd 100644
--- a/docker/services.env
+++ b/docker/services.env
@@ -22,6 +22,9 @@ AUTH_HOST=auth
 AUTH_PORT=9004
 CACHE_HOST=cache
 CACHE_PORT=6379
+
+ICC_PORT=9007
+ICC_HOST=icc
 ICC_REDIS_HOST=message-bus
 ICC_REDIS_PORT=6379
 
diff --git a/integration/cypress/integration/client-login.spec.js b/integration/cypress/integration/client-login.spec.js
index fe2d9c042..78c675743 100644
--- a/integration/cypress/integration/client-login.spec.js
+++ b/integration/cypress/integration/client-login.spec.js
@@ -4,9 +4,12 @@ describe("Login using UI", () => {
     const username = "admin"
     const password = "admin"
 
-    cy.visit("/login");
+    cy.visit("/");
+    cy.wait(1000)
+    cy.url().should("include", "login");
     cy.get("#mat-input-0").type(username);
     cy.get("#mat-input-1").type(`${password}{enter}`);
+    cy.wait(1000)
     cy.url().should("not.include", "login");
     cy.getCookie("refreshId").should("exist");
   });
diff --git a/openslides-icc-service b/openslides-icc-service
index 3ae20ef6f..fec8bf17d 160000
--- a/openslides-icc-service
+++ b/openslides-icc-service
@@ -1 +1 @@
-Subproject commit 3ae20ef6f1bfccd401e145d0a20253691ba90682
+Subproject commit fec8bf17d4944dae0087f77f136a11b6f6466071
diff --git a/proxy/entrypoint b/proxy/entrypoint
index 018d17519..2c824a8ef 100755
--- a/proxy/entrypoint
+++ b/proxy/entrypoint
@@ -12,7 +12,7 @@ cp $base $config
 ACTION_HOST="${ACTION_HOST:-backend}" ACTION_PORT="${ACTION_PORT:-9002}" \
 PRESENTER_HOST="${PRESENTER_HOST:-backend}" PRESENTER_PORT="${PRESENTER_PORT:-9003}" \
 AUTOUPDATE_HOST="${AUTOUPDATE_HOST:-autoupdate}" AUTOUPDATE_PORT="${AUTOUPDATE_PORT:-9012}" \
-ICC_HOST="${ICC_HOST:-icc}" ICC_PORT="${ICC_PORT:-9013}" \
+ICC_HOST="${ICC_HOST:-icc}" ICC_PORT="${ICC_PORT:-9007}" \
 AUTH_HOST="${AUTH_HOST:-auth}" AUTH_PORT="${AUTH_PORT:-9004}" \
 MEDIA_HOST="${MEDIA_HOST:-media}" MEDIA_PORT="${MEDIA_PORT:-9006}" \
 MANAGE_HOST="${MANAGE_HOST:-manage}" MANAGE_PORT="${MANAGE_PORT:-9008}" \