fix(microsoft-ad): add $search/$filter guard, $count=true, and member…

…Id validation - Prevent using $search and $filter together (Graph API rejects this) - Add $count=true when $search is used (required with ConsistencyLevel: eventual) - Validate and trim memberId in add_group_member body before use Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
simstudioai · waleedlatif1 · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026
commit 763de06038f25475ce618b3ac46fabcdf5989ee9
diff --git a/apps/sim/tools/microsoft_ad/add_group_member.ts b/apps/sim/tools/microsoft_ad/add_group_member.ts
@@ -48,9 +48,13 @@ export const addGroupMemberTool: ToolConfig<
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
     }),
-    body: (params) => ({
-      '@odata.id': `https://graph.microsoft.com/v1.0/directoryObjects/${params.memberId}`,
-    }),
+    body: (params) => {
+      const memberId = params.memberId?.trim()
+      if (!memberId) throw new Error('Member ID is required')
+      return {
+        '@odata.id': `https://graph.microsoft.com/v1.0/directoryObjects/${memberId}`,
+      }
+    },
   },
   transformResponse: async (_response: Response, params?: MicrosoftAdAddGroupMemberParams) => {
     return {

diff --git a/apps/sim/tools/microsoft_ad/list_groups.ts b/apps/sim/tools/microsoft_ad/list_groups.ts
@@ -51,8 +51,14 @@ export const listGroupsTool: ToolConfig<
         '$select=id,displayName,description,mail,mailEnabled,mailNickname,securityEnabled,groupTypes,visibility,createdDateTime'
       )
       if (params.top) queryParts.push(`$top=${params.top}`)
+      if (params.search && params.filter) {
+        throw new Error('$search and $filter cannot be used together in Microsoft Graph API')
+      }
       if (params.filter) queryParts.push(`$filter=${encodeURIComponent(params.filter)}`)
-      if (params.search) queryParts.push(`$search="${encodeURIComponent(params.search)}"`)
+      if (params.search) {
+        queryParts.push(`$search="${encodeURIComponent(params.search)}"`)
+        queryParts.push('$count=true')
+      }
       return `https://graph.microsoft.com/v1.0/groups?${queryParts.join('&')}`
     },
     method: 'GET',

diff --git a/apps/sim/tools/microsoft_ad/list_users.ts b/apps/sim/tools/microsoft_ad/list_users.ts
@@ -48,8 +48,14 @@ export const listUsersTool: ToolConfig<MicrosoftAdListUsersParams, MicrosoftAdLi
         '$select=id,displayName,givenName,surname,userPrincipalName,mail,jobTitle,department,officeLocation,mobilePhone,accountEnabled'
       )
       if (params.top) queryParts.push(`$top=${params.top}`)
+      if (params.search && params.filter) {
+        throw new Error('$search and $filter cannot be used together in Microsoft Graph API')
+      }
       if (params.filter) queryParts.push(`$filter=${encodeURIComponent(params.filter)}`)
-      if (params.search) queryParts.push(`$search="${encodeURIComponent(params.search)}"`)
+      if (params.search) {
+        queryParts.push(`$search="${encodeURIComponent(params.search)}"`)
+        queryParts.push('$count=true')
+      }
       return `https://graph.microsoft.com/v1.0/users?${queryParts.join('&')}`
     },
     method: 'GET',