fixes external sender

Author: KelvinTegelaar

src/store/api/groups.js

@@ -60,11 +60,12 @@ export const groupsApi = baseApi.injectEndpoints({
       }),
     }),
     listGroupSenderAuth: builder.query({
-      query: ({ tenantDomain, groupId }) => ({
+      query: ({ tenantDomain, groupId, type }) => ({
         path: '/api/ListGroupSenderAuthentication',
         params: {
           TenantFilter: tenantDomain,
           GroupId: groupId,
+          Type: type,
         },
       }),
     }),

src/views/identity/administration/EditGroup.jsx

@@ -42,13 +42,6 @@ const EditGroup = () => {
     isSuccess,
   } = useListGroupQuery({ tenantDomain, groupId })
 
-  const {
-    data: SenderAuth = {},
-    isFetching: SenderAuthisFetching,
-    error: SenderAuthError,
-    isSuccess: SenderAuthIsSuccess,
-  } = useListGroupSenderAuthQuery({ tenantDomain, groupId })
-
   const {
     data: members = [],
     isFetching: membersisFetching,
@@ -96,6 +89,13 @@ const EditGroup = () => {
     }
   }, [owners, members, ownersIsSuccess, membersIsSuccess, postResults])
 
+  const {
+    data: SenderAuth = {},
+    isFetching: SenderAuthisFetching,
+    error: SenderAuthError,
+    isSuccess: SenderAuthIsSuccess,
+  } = useListGroupSenderAuthQuery({ tenantDomain, groupId, type: group?.[0]?.calculatedGroupType })
+
   useEffect(() => {
     if (!groupId || !tenantDomain) {
       ModalService.open({
@@ -166,7 +166,7 @@ const EditGroup = () => {
                       initialValues={{
                         ...(group[0].calculatedGroupType === 'Microsoft 365' ||
                         group[0].calculatedGroupType === 'Distribution List'
-                          ? { allowExternal: !SenderAuth.enabled }
+                          ? { allowExternal: SenderAuth.allowedToReceiveExternal }
                           : {}),
                       }}
                       render={({ handleSubmit, submitting, values }) => {
@@ -323,14 +323,6 @@ const EditGroup = () => {
                         This is the (raw) information for this group.
                         <pre>{JSON.stringify(group, null, 2)}</pre>
                       </div>
-                      <div>
-                        This is the (raw) information for SenderAuth.
-                        {SenderAuthisFetching && <CSpinner />}
-                        {SenderAuthIsSuccess && <pre>{JSON.stringify(SenderAuth, null, 2)}</pre>}
-                        {SenderAuthError && (
-                          <div>Error fetching SenderAuth data: {SenderAuthError.message}</div>
-                        )}
-                      </div>
                     </>
                   )}
                 </CCardBody>