Skip to content

Commit 322c803

Browse files
committed
(bug): Adjusted data handling to handle cases where ForwardingAddress is an array
1 parent 8381c5e commit 322c803

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

src/pages/identity/administration/users/user/exchange.jsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,16 @@ const Page = () => {
128128
};
129129
}
130130

131+
// Handle arrays by joining them
132+
if (Array.isArray(userIdentifier)) {
133+
userIdentifier = userIdentifier.join(", ");
134+
}
135+
136+
// Ensure userIdentifier is a string
137+
if (typeof userIdentifier !== "string") {
138+
userIdentifier = String(userIdentifier);
139+
}
140+
131141
// Handle special built-in cases
132142
if (userIdentifier === "Default" || userIdentifier === "Anonymous") {
133143
return {
@@ -147,7 +157,7 @@ const Page = () => {
147157
// Exact match on display name
148158
(group.displayName && group.displayName === userIdentifier) ||
149159
// Partial match - permission identifier starts with group display name (handles timestamps)
150-
(group.displayName && userIdentifier?.startsWith(group.displayName))
160+
(group.displayName && userIdentifier.startsWith(group.displayName))
151161
);
152162
});
153163

@@ -316,10 +326,15 @@ const Page = () => {
316326
useEffect(() => {
317327
if (userRequest.isSuccess && userRequest.data?.[0]) {
318328
const currentSettings = userRequest.data[0];
319-
const forwardingAddress = currentSettings.ForwardingAddress;
329+
let forwardingAddress = currentSettings.ForwardingAddress;
320330
const forwardingSmtpAddress = currentSettings.MailboxActionsData?.ForwardingSmtpAddress;
321331
const forwardAndDeliver = currentSettings.ForwardAndDeliver;
322332

333+
// Handle ForwardingAddress being an array or string
334+
if (Array.isArray(forwardingAddress)) {
335+
forwardingAddress = forwardingAddress.join(", ");
336+
}
337+
323338
let forwardingType = "disabled";
324339
let cleanAddress = "";
325340

0 commit comments

Comments
 (0)