From a55da5b9ba0efc56f236541c5d8bf50a58f3db01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Fri, 9 Aug 2024 13:20:05 +0200
Subject: [PATCH] fix(context.ts): Return `null` when a required OIDC claim is
not available.
---
.../files/jitsi-keycloak-adapter/context.ts | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts b/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
index 7076328..bcfb314 100644
--- a/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
+++ b/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
@@ -1,4 +1,5 @@
// -----------------------------------------------------------------------------
+// SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
// SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
// SPDX-License-Identifier: Apache-2.0
// -----------------------------------------------------------------------------
@@ -9,14 +10,18 @@
// -----------------------------------------------------------------------------
export function createContext(userInfo: Record<string, unknown>) {
- const context = {
- user: {
- id: userInfo.sub,
- name: userInfo.name || userInfo.preferred_username || "",
- email: userInfo.email || "",
- lobby_bypass: true,
- },
- };
-
- return context;
+ if (userInfo.opendesk_username) {
+ const context = {
+ user: {
+ id: userInfo.sub,
+ name: userInfo.name || userInfo.opendesk_username || "",
+ email: userInfo.email || "",
+ lobby_bypass: true,
+ },
+ };
+ return context;
+ }
+ else {
+ return null;
+ }
}
--
GitLab