From a7e5f64b50f102855bd15568ff698160f2b616e3 Mon Sep 17 00:00:00 2001
From: Jaime Conde <conde-segovia@univention.de>
Date: Wed, 9 Oct 2024 12:16:00 +0200
Subject: [PATCH] fix(intercom-service): Customizable user mapper.

---
 helmfile/apps/nubus/values-intercom-service.yaml.gotmpl   | 1 +
 helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl | 2 +-
 helmfile/environments/default/charts.yaml                 | 2 +-
 helmfile/environments/default/images.yaml                 | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
index 01f8b651..f4a7ae62 100644
--- a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
@@ -31,6 +31,7 @@ ics:
   secret: {{ .Values.secrets.intercom.secret | quote }}
   issuerBaseUrl: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
   originRegex: "{{ .Values.global.domain }}"
+  userUniqueMapper: {{ if .Values.functional.chat.matrix.profile.useImmutableIdentifierForLocalpart }}"entryuuid"{{ else }}"phoenixusername"{{ end }}
   keycloak:
     realm: {{ .Values.platform.realm | quote }}
   default:
diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
index 47c2855b..503fd6e6 100644
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -249,7 +249,7 @@ appsuite:
       # Old capability can be used to toggle all integrations with a single switch
       com.openexchange.capability.public-sector: "true"
       # New capabilities in 2.0
-      com.openexchange.capability.public-sector-element: "false"
+      com.openexchange.capability.public-sector-element: "true"
       com.openexchange.capability.public-sector-navigation: "true"
       com.openexchange.capability.client-onboarding: "true"
       com.openexchange.capability.dynamic-theme: "true"
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index 25a7a2e5..2a5a97b9 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -122,7 +122,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "intercom-service"
-    version: "2.2.0"
+    version: "2.4.0"
     verify: true
   jitsi:
     # providerCategory: "Platform"
diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml
index df22db18..25f0280d 100644
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -79,7 +79,7 @@ images:
     # upstreamMirrorStartFrom: ["2", "1", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/intercom-service"
-    tag: "2.2.0@sha256:6e02a3b06827d8f23615ea43ed87f510018b8ecf77b2a8404b1554077b1bdc6b"
+    tag: "2.4.0@sha256:df743b7ea30077dc941815ccc60198820d67bbba94853fa7a6f939c0f36af335"
   jibri:
     # providerCategory: "Supplier"
     # providerResponsible: "Nordeck"