From 47328667d44cf84d1a33ebb73cdbd511a51fba9f Mon Sep 17 00:00:00 2001
From: BNWEIN <bweinberg@prime-networks.co.uk>
Date: Fri, 28 Jul 2023 11:03:34 +0100
Subject: [PATCH] Added SendOnBehalf Function

Added ability to add and remove "send on behalf" permissions from the edit mailbox screen
---
 .../administration/EditMailboxPermissions.js  | 30 +++++++++++++++++++
 .../identity/administration/UserActions.js    |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/views/email-exchange/administration/EditMailboxPermissions.js b/src/views/email-exchange/administration/EditMailboxPermissions.js
index 0d935683f332..2841cf1c4d41 100644
--- a/src/views/email-exchange/administration/EditMailboxPermissions.js
+++ b/src/views/email-exchange/administration/EditMailboxPermissions.js
@@ -122,6 +122,8 @@ const MailboxPermissions = () => {
       RemoveFullAccess: values.RemoveFullAccess ? values.RemoveFullAccess : null,
       AddSendAs: values.AddSendAs ? values.AddSendAs : null,
       RemoveSendAs: values.RemoveSendAs ? values.RemoveSendAs : null,
+      AddSendOnBehalf: values.AddSendOnBehalf ? values.AddSendOnBehalf : null,
+      RemoveSendOnBehalf: values.RemoveSendOnBehalf ? values.RemoveSendOnBehalf : null,
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/ExecEditMailboxPermissions', values: shippedValues })
@@ -250,6 +252,34 @@ const MailboxPermissions = () => {
                                 />
                                 {usersError && <span>Failed to load list of users</span>}
                               </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Add Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="AddSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Remove Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="RemoveSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
                             </CRow>
                             <CRow className="mb-3">
                               <CCol md={6}>
diff --git a/src/views/identity/administration/UserActions.js b/src/views/identity/administration/UserActions.js
index b8050eb5145b..78ca9e360fe8 100644
--- a/src/views/identity/administration/UserActions.js
+++ b/src/views/identity/administration/UserActions.js
@@ -54,7 +54,7 @@ export default function UserActions({ tenantDomain, userId, userEmail, className
       onClick: () =>
         handleModal(
           'Are you sure you want to enable the online archive for this user?',
-          `/api/ExecEnableArchive?TenantFilter=${tenantDomain}&ID=${userId}`,
+          `/api/ExecEnableArchive?TenantFilter=${tenantDomain}&ID=${userEmail}`,
         ),
     },
     {