From bbb9ca105fb1027b3988e77cc6404eadf44c6dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 28 May 2026 17:02:02 +0200 Subject: [PATCH] Fix inconsistent accountEnabled wording across docs and changeset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consistently use 'accountEnabled === false' everywhere to describe which users are filtered out. Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: Fredrik Adelöw --- .changeset/fix-msgraph-group-member-filter.md | 2 +- plugins/catalog-backend-module-msgraph/config.d.ts | 8 ++++---- .../src/microsoftGraph/config.ts | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.changeset/fix-msgraph-group-member-filter.md b/.changeset/fix-msgraph-group-member-filter.md index a56b30a9af..81628dc187 100644 --- a/.changeset/fix-msgraph-group-member-filter.md +++ b/.changeset/fix-msgraph-group-member-filter.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog-backend-module-msgraph': patch --- -Reverted the server-side `accountEnabled eq true` base filter that was added in v1.51.0, which broke the `userGroupMember` path because the group members endpoint doesn't support `$filter` on that property. Disabled users (`accountEnabled !== true`) are now filtered client-side in both the `/users` and group members paths. The mutual exclusivity checks between `userFilter` and `userGroupMemberFilter`/`userGroupMemberSearch` have been restored. +Reverted the server-side `accountEnabled eq true` base filter that was added in v1.51.0, which broke the `userGroupMember` path because the group members endpoint doesn't support `$filter` on that property. Disabled users (`accountEnabled === false`) are now filtered client-side in both the `/users` and group members paths. The mutual exclusivity checks between `userFilter` and `userGroupMemberFilter`/`userGroupMemberSearch` have been restored. diff --git a/plugins/catalog-backend-module-msgraph/config.d.ts b/plugins/catalog-backend-module-msgraph/config.d.ts index b1252a3a90..5ec4f0b175 100644 --- a/plugins/catalog-backend-module-msgraph/config.d.ts +++ b/plugins/catalog-backend-module-msgraph/config.d.ts @@ -60,8 +60,8 @@ export interface Config { /** * The filter to apply to extract users. Disabled users - * (accountEnabled !== true) are always filtered out client-side - * regardless of this setting. + * (`accountEnabled === false`) are always filtered out + * client-side regardless of this setting. * * E.g. "userType eq 'member'" */ @@ -164,7 +164,7 @@ export interface Config { expand?: string; /** * The filter to apply to extract users. - * Disabled users (accountEnabled === false) are always + * Disabled users (`accountEnabled === false`) are always * filtered out client-side regardless of this setting. * * E.g. "userType eq 'member'" @@ -299,7 +299,7 @@ export interface Config { expand?: string; /** * The filter to apply to extract users. - * Disabled users (accountEnabled === false) are always + * Disabled users (`accountEnabled === false`) are always * filtered out client-side regardless of this setting. * * E.g. "userType eq 'member'" diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts index 4f82bcd1f3..a3a0eecf58 100644 --- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts +++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts @@ -61,9 +61,9 @@ export type MicrosoftGraphProviderConfig = { */ clientSecret?: string; /** - * The filter to apply to extract users. Disabled users (accountEnabled - * !== true) are always filtered out client-side regardless of this - * setting. + * The filter to apply to extract users. Disabled users + * (`accountEnabled === false`) are always filtered out client-side + * regardless of this setting. * * E.g. "userType eq 'member'" */