From 6f0ee4f832da2679acba00718aba449f35af3128 Mon Sep 17 00:00:00 2001
From: aeberhardt <alexandre.eberhardt@savoirfairelinux.com>
Date: Fri, 7 Feb 2025 13:49:34 -0500
Subject: [PATCH] Display name: return "" if first or last name is not set in
LDAP/AD
Change the return API to avoid displaying "null" as name in every client
Usefull when first and/or last name is left blank during LDAP/AD creation
GitLab: #145
Change-Id: I48270ad514d6ffaa33c58678354b2fc146d5d18f
---
.../jami/jams/server/core/workflows/RegisterDeviceFlow.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
index f18ef0a1..d594a484 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
@@ -85,7 +85,11 @@ public class RegisterDeviceFlow {
user.getEthAddress());
response.setDeviceReceipt(devReceipt[0]);
response.setReceiptSignature(devReceipt[1]);
- response.setDisplayName(userProfile.getFirstName() + " " + userProfile.getLastName());
+ String firstDisplayName =
+ userProfile.getFirstName() != null ? userProfile.getFirstName() : "";
+ String lastDisplayName =
+ userProfile.getLastName() != null ? userProfile.getLastName() : "";
+ response.setDisplayName(firstDisplayName + " " + lastDisplayName);
response.setNameServer(nameServer.getURI());
if (userProfile.getProfilePicture() != null)
--
GitLab