From 4354d7c3de1486ab56cfe601073b935e64ec6b00 Mon Sep 17 00:00:00 2001
From: Matheo Joseph <matheo.joseph@savoirfairelinux.com>
Date: Tue, 20 Jun 2023 11:05:30 -0400
Subject: [PATCH] uicustomization: add uiCustom info to response when enrolling
a device
Change-Id: Idf1493f0456a551606473c9ee2d95ede120ee898
---
.../common/objects/responses/DeviceRegistrationResponse.java | 2 ++
.../java/net/jami/jams/common/objects/user/PolicyData.java | 1 +
.../jams/server/servlets/api/auth/device/DeviceServlet.java | 5 ++++-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceRegistrationResponse.java b/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceRegistrationResponse.java
index 37bf1c69..f4f87ca1 100644
--- a/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceRegistrationResponse.java
+++ b/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceRegistrationResponse.java
@@ -57,6 +57,7 @@ public class DeviceRegistrationResponse {
private Boolean upnpEnabled;
private Boolean rendezVous;
private String defaultModerators;
+ private String uiCustomization;
public void setCertificateChain(X509Certificate[] certificateChain){
StringBuilder stringBuilder = new StringBuilder();
@@ -86,6 +87,7 @@ public class DeviceRegistrationResponse {
this.upnpEnabled = policy.getUpnpEnabled();
this.rendezVous = policy.getRendezVous();
this.defaultModerators = policy.getDefaultModerators();
+ this.uiCustomization = policy.getUiCustomization();
}
diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/user/PolicyData.java b/jams-common/src/main/java/net/jami/jams/common/objects/user/PolicyData.java
index 9402d62b..94b688cb 100644
--- a/jams-common/src/main/java/net/jami/jams/common/objects/user/PolicyData.java
+++ b/jams-common/src/main/java/net/jami/jams/common/objects/user/PolicyData.java
@@ -24,4 +24,5 @@ public class PolicyData {
private Boolean rendezVous;
private String defaultModerators;
private Boolean allowLookup;
+ private String uiCustomization;
}
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
index 9df155dd..da9d2105 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
@@ -176,7 +176,6 @@ public class DeviceServlet extends HttpServlet {
obj.add("TURN.password", obj.get("turnServerPassword"));
obj.remove("turnServerPassword");
}
-
if (obj.get("proxyEnabled") != null) {
obj.add("Account.proxyEnabled", obj.get("proxyEnabled"));
obj.remove("proxyEnabled");
@@ -197,6 +196,10 @@ public class DeviceServlet extends HttpServlet {
obj.add("Account.defaultModerators", obj.get("defaultModerators"));
obj.remove("defaultModerators");
}
+ if (obj.get("uiCustomization") != null) {
+ obj.add("Account.uiCustomization", obj.get("uiCustomization"));
+ obj.remove("uiCustomization");
+ }
resp.getOutputStream().write((obj.toString()).getBytes());
}
--
GitLab