@backstage/plugin-catalog-backend-module-msgraph 0.9.3-next.1 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.10.0
+
+### Minor Changes
+
+- 2bd0450: **BREAKING**: Disabled user accounts are now filtered out by default. The provider automatically applies an `accountEnabled eq true` filter, combining it with any custom `user.filter` you provide. If you previously included `accountEnabled eq true` in your user filter, it is safe to remove it, but leaving it in will not cause any issues.
+
+### Patch Changes
+
+- e9b78e9: Removed the `uuid` dependency and replaced usage with the built-in `crypto.randomUUID()`.
+- Updated dependencies
+  - @backstage/catalog-model@1.9.0
+  - @backstage/backend-plugin-api@1.9.1
+  - @backstage/plugin-catalog-node@2.2.1
+  - @backstage/config@1.3.8
+  - @backstage/plugin-catalog-common@1.1.10
+
 ## 0.9.3-next.1
 
 ### Patch Changes

package/README.md

@@ -52,8 +52,9 @@ catalog:
           # Optional filter for user, see Microsoft Graph API for the syntax
           # See https://docs.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties
           # and for the syntax https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter
-          # This and userGroupMemberFilter are mutually exclusive, only one can be specified
-          filter: accountEnabled eq true and userType eq 'member'
+          # This is combined with the base `accountEnabled eq true` filter
+          # that is always applied automatically.
+          filter: userType eq 'member'
           # Set to false to not load user photos.
           loadPhotos: true
           # See  https://docs.microsoft.com/en-us/graph/api/resources/schemaextension?view=graph-rest-1.0
@@ -64,12 +65,10 @@ catalog:
         userGroupMember:
           # Optional filter for users, use group membership to get users.
           # (Filtered groups and fetch their members.)
-          # This and userFilter are mutually exclusive, only one can be specified
           # See https://docs.microsoft.com/en-us/graph/search-query-parameter
           filter: "displayName eq 'Backstage Users'"
           # Optional search for users, use group membership to get users.
           # (Search for groups and fetch their members.)
-          # This and userFilter are mutually exclusive, only one can be specified
           search: '"description:One" AND ("displayName:Video" OR "displayName:Drive")'
           # Optional /groups by default but allow to query groups from different msgraph endpoints
           path: /groups
@@ -102,9 +101,7 @@ catalog:
           initialDelay: { seconds: 15},
 ```
 
-`user.filter` and `userGroupMember.filter` are mutually exclusive, only one can be provided. If both are provided, an error will be thrown.
-
-By default, all users are loaded. If you want to filter users based on their attributes, use `user.filter`. `userGroupMember.filter` can be used if you want to load users based on their group membership.
+By default, all enabled users are loaded (disabled accounts are automatically filtered out). If you want to further filter users based on their attributes, use `user.filter`. `userGroupMember.filter` can be used if you want to load users based on their group membership.
 
 3. The package is not installed by default, therefore you have to add a
    dependency to `@backstage/plugin-catalog-backend-module-msgraph` to your

package/config.d.ts

@@ -60,8 +60,9 @@ export interface Config {
 
           /**
            * The filter to apply to extract users.
+           * Combined with the base `accountEnabled eq true` filter.
            *
-           * E.g. "accountEnabled eq true and userType eq 'member'"
+           * E.g. "userType eq 'member'"
            */
           userFilter?: string;
           /**
@@ -162,8 +163,9 @@ export interface Config {
               expand?: string;
               /**
                * The filter to apply to extract users.
+               * Combined with the base `accountEnabled eq true` filter
                *
-               * E.g. "accountEnabled eq true and userType eq 'member'"
+               * E.g. "userType eq 'member'"
                */
               filter?: string;
               /**
@@ -295,8 +297,9 @@ export interface Config {
                 expand?: string;
                 /**
                  * The filter to apply to extract users.
+                 * Combined with the base `accountEnabled eq true` filter
                  *
-                 * E.g. "accountEnabled eq true and userType eq 'member'"
+                 * E.g. "userType eq 'member'"
                  */
                 filter?: string;
                 /**

package/dist/index.d.ts

@@ -43,9 +43,10 @@ type MicrosoftGraphProviderConfig = {
      */
     clientSecret?: string;
     /**
-     * The filter to apply to extract users.
+     * The filter to apply to extract users. This is combined with the base
+     * `accountEnabled eq true` filter that is always applied automatically.
      *
-     * E.g. "accountEnabled eq true and userType eq 'member'"
+     * E.g. "userType eq 'member'"
      */
     userFilter?: string;
     /**

package/dist/microsoftGraph/config.cjs.js

@@ -18,7 +18,9 @@ function readMicrosoftGraphConfig(config) {
     const clientId = providerConfig.getOptionalString("clientId");
     const clientSecret = providerConfig.getOptionalString("clientSecret");
     const userExpand = providerConfig.getOptionalString("userExpand");
-    const userFilter = providerConfig.getOptionalString("userFilter");
+    const userFilter = buildUserFilter(
+      providerConfig.getOptionalString("userFilter")
+    );
     const userSelect = providerConfig.getOptionalStringArray("userSelect");
     const userGroupMemberFilter = providerConfig.getOptionalString(
       "userGroupMemberFilter"
@@ -29,16 +31,6 @@ function readMicrosoftGraphConfig(config) {
     const groupExpand = providerConfig.getOptionalString("groupExpand");
     const groupFilter = providerConfig.getOptionalString("groupFilter");
     const groupSearch = providerConfig.getOptionalString("groupSearch");
-    if (userFilter && userGroupMemberFilter) {
-      throw new Error(
-        `userFilter and userGroupMemberFilter are mutually exclusive, only one can be specified.`
-      );
-    }
-    if (userFilter && userGroupMemberSearch) {
-      throw new Error(
-        `userGroupMemberSearch cannot be specified when userFilter is defined.`
-      );
-    }
     const groupSelect = providerConfig.getOptionalStringArray("groupSelect");
     const queryMode = providerConfig.getOptionalString("queryMode");
     if (queryMode !== void 0 && queryMode !== "basic" && queryMode !== "advanced") {
@@ -100,7 +92,7 @@ function readProviderConfig(id, config) {
   const clientId = config.getOptionalString("clientId");
   const clientSecret = config.getOptionalString("clientSecret");
   const userExpand = config.getOptionalString("user.expand");
-  const userFilter = config.getOptionalString("user.filter");
+  const userFilter = buildUserFilter(config.getOptionalString("user.filter"));
   const userSelect = config.getOptionalStringArray("user.select");
   const userPath = config.getOptionalString("user.path") ?? "users";
   const loadUserPhotos = config.getOptionalBoolean("user.loadPhotos");
@@ -123,16 +115,6 @@ function readProviderConfig(id, config) {
     "userGroupMember.search"
   );
   const userGroupMemberPath = config.getOptionalString("userGroupMember.path");
-  if (userFilter && userGroupMemberFilter) {
-    throw new Error(
-      `userFilter and userGroupMemberFilter are mutually exclusive, only one can be specified.`
-    );
-  }
-  if (userFilter && userGroupMemberSearch) {
-    throw new Error(
-      `userGroupMemberSearch cannot be specified when userFilter is defined.`
-    );
-  }
   if (clientId && !clientSecret) {
     throw new Error(`clientSecret must be provided when clientId is defined.`);
   }
@@ -167,6 +149,13 @@ function readProviderConfig(id, config) {
     schedule
   };
 }
+function buildUserFilter(rawFilter) {
+  const base = "accountEnabled eq true";
+  if (rawFilter) {
+    return `${base} and (${rawFilter})`;
+  }
+  return base;
+}
 
 exports.readMicrosoftGraphConfig = readMicrosoftGraphConfig;
 exports.readProviderConfig = readProviderConfig;

package/dist/microsoftGraph/config.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.cjs.js","sources":["../../src/microsoftGraph/config.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  SchedulerServiceTaskScheduleDefinition,\n  readSchedulerServiceTaskScheduleDefinitionFromConfig,\n} from '@backstage/backend-plugin-api';\nimport { Config } from '@backstage/config';\nimport { trimEnd } from 'lodash';\n\nconst DEFAULT_PROVIDER_ID = 'default';\nconst DEFAULT_TARGET = 'https://graph.microsoft.com/v1.0';\n\n/**\n * The configuration parameters for a single Microsoft Graph provider.\n *\n * @public\n */\nexport type MicrosoftGraphProviderConfig = {\n  /**\n   * Identifier of the provider which will be used i.e. at the location key for ingested entities.\n   */\n  id: string;\n\n  /**\n   * The prefix of the target that this matches on, e.g.\n   * \"https://graph.microsoft.com/v1.0\", with no trailing slash.\n   */\n  target: string;\n  /**\n   * The auth authority used.\n   *\n   * E.g. \"https://login.microsoftonline.com\"\n   */\n  authority?: string;\n  /**\n   * The tenant whose org data we are interested in.\n   */\n  tenantId: string;\n  /**\n   * The OAuth client ID to use for authenticating requests.\n   * If specified, ClientSecret must also be specified\n   */\n  clientId?: string;\n  /**\n   * The OAuth client secret to use for authenticating requests.\n   * If specified, ClientId must also be specified\n   */\n  clientSecret?: string;\n  /**\n   * The filter to apply to extract users.\n   *\n   * E.g. \"accountEnabled eq true and userType eq 'member'\"\n   */\n  userFilter?: string;\n  /**\n   * The fields to be fetched on query.\n   *\n   * E.g. [\"id\", \"displayName\", \"description\"]\n   */\n  userSelect?: string[];\n  /**\n   * The \"expand\" argument to apply to users.\n   *\n   * E.g. \"manager\".\n   */\n  userExpand?: string;\n\n  /**\n   * The path to the users endpoint. Defaults to \"/users\".\n   *\n   * E.g. \"/users\"\n   */\n  userPath?: string;\n  /**\n   * The filter to apply to extract users by groups memberships.\n   *\n   * E.g. \"displayName eq 'Backstage Users'\"\n   */\n  userGroupMemberFilter?: string;\n  /**\n   * The search criteria to apply to extract users by groups memberships.\n   *\n   * E.g. \"\\\"displayName:-team\\\"\" would only match groups which contain '-team'\n   */\n  userGroupMemberSearch?: string;\n\n  /**\n   * The path to the groups endpoint. Defaults to \"/groups\".\n   *\n   * E.g. \"/groups\"\n   */\n  userGroupMemberPath?: string;\n\n  /**\n   * The \"expand\" argument to apply to groups.\n   *\n   * E.g. \"member\".\n   */\n  groupExpand?: string;\n  /**\n   * The filter to apply to extract groups.\n   *\n   * E.g. \"securityEnabled eq false and mailEnabled eq true\"\n   */\n  groupFilter?: string;\n  /**\n   * The search criteria to apply to extract groups.\n   *\n   * E.g. \"\\\"displayName:-team\\\"\" would only match groups which contain '-team'\n   */\n  groupSearch?: string;\n\n  /**\n   * The fields to be fetched on query.\n   *\n   * E.g. [\"id\", \"displayName\", \"description\"]\n   */\n  groupSelect?: string[];\n\n  /**\n   * The path to the groups endpoint. Defaults to \"/groups\".\n   *\n   * E.g. \"/groups\"\n   */\n  groupPath?: string;\n\n  /**\n   * Whether to ingest groups that are members of the found/filtered/searched groups.\n   * Default value is `false`.\n   */\n  groupIncludeSubGroups?: boolean;\n\n  /**\n   * By default, the Microsoft Graph API only provides the basic feature set\n   * for querying. Certain features are limited to advanced query capabilities\n   * (see https://docs.microsoft.com/en-us/graph/aad-advanced-queries)\n   * and need to be enabled.\n   *\n   * Some features like `$expand` are not available for advanced queries, though.\n   */\n  queryMode?: 'basic' | 'advanced';\n\n  /**\n   * Set to false to not load user photos.\n   * This can be useful for huge organizations.\n   */\n  loadUserPhotos?: boolean;\n\n  /**\n   * Schedule configuration for refresh tasks.\n   */\n  schedule?: SchedulerServiceTaskScheduleDefinition;\n};\n\n/**\n * Parses configuration.\n *\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n * @deprecated Replaced by not exported `readProviderConfigs` and kept for backwards compatibility only.\n */\nexport function readMicrosoftGraphConfig(\n  config: Config,\n): MicrosoftGraphProviderConfig[] {\n  const providers: MicrosoftGraphProviderConfig[] = [];\n  const providerConfigs = config.getOptionalConfigArray('providers') ?? [];\n\n  for (const providerConfig of providerConfigs) {\n    const target = trimEnd(\n      providerConfig.getOptionalString('target') ?? DEFAULT_TARGET,\n      '/',\n    );\n    const authority = providerConfig.getOptionalString('authority');\n\n    const tenantId = providerConfig.getString('tenantId');\n    const clientId = providerConfig.getOptionalString('clientId');\n    const clientSecret = providerConfig.getOptionalString('clientSecret');\n\n    const userExpand = providerConfig.getOptionalString('userExpand');\n    const userFilter = providerConfig.getOptionalString('userFilter');\n    const userSelect = providerConfig.getOptionalStringArray('userSelect');\n    const userGroupMemberFilter = providerConfig.getOptionalString(\n      'userGroupMemberFilter',\n    );\n    const userGroupMemberSearch = providerConfig.getOptionalString(\n      'userGroupMemberSearch',\n    );\n    const groupExpand = providerConfig.getOptionalString('groupExpand');\n    const groupFilter = providerConfig.getOptionalString('groupFilter');\n    const groupSearch = providerConfig.getOptionalString('groupSearch');\n\n    if (userFilter && userGroupMemberFilter) {\n      throw new Error(\n        `userFilter and userGroupMemberFilter are mutually exclusive, only one can be specified.`,\n      );\n    }\n    if (userFilter && userGroupMemberSearch) {\n      throw new Error(\n        `userGroupMemberSearch cannot be specified when userFilter is defined.`,\n      );\n    }\n\n    const groupSelect = providerConfig.getOptionalStringArray('groupSelect');\n    const queryMode = providerConfig.getOptionalString('queryMode');\n    if (\n      queryMode !== undefined &&\n      queryMode !== 'basic' &&\n      queryMode !== 'advanced'\n    ) {\n      throw new Error(`queryMode must be one of: basic, advanced`);\n    }\n\n    if (clientId && !clientSecret) {\n      throw new Error(\n        `clientSecret must be provided when clientId is defined.`,\n      );\n    }\n\n    if (clientSecret && !clientId) {\n      throw new Error(\n        `clientId must be provided when clientSecret is defined.`,\n      );\n    }\n\n    providers.push({\n      id: target,\n      target,\n      authority,\n      tenantId,\n      clientId,\n      clientSecret,\n      userExpand,\n      userFilter,\n      userSelect,\n      userGroupMemberFilter,\n      userGroupMemberSearch,\n      groupExpand,\n      groupFilter,\n      groupSearch,\n      groupSelect,\n      queryMode,\n    });\n  }\n\n  return providers;\n}\n\n/**\n * Parses all configured providers.\n *\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n */\nexport function readProviderConfigs(\n  config: Config,\n): MicrosoftGraphProviderConfig[] {\n  const providersConfig = config.getOptionalConfig(\n    'catalog.providers.microsoftGraphOrg',\n  );\n  if (!providersConfig) {\n    return [];\n  }\n\n  if (providersConfig.has('clientId')) {\n    // simple/single config variant\n    return [readProviderConfig(DEFAULT_PROVIDER_ID, providersConfig)];\n  }\n\n  return providersConfig.keys().map(id => {\n    const providerConfig = providersConfig.getConfig(id);\n\n    return readProviderConfig(id, providerConfig);\n  });\n}\n\n/**\n * Parses a single configured provider by id.\n *\n * @param id - the id of the provider to parse\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n */\nexport function readProviderConfig(\n  id: string,\n  config: Config,\n): MicrosoftGraphProviderConfig {\n  const target = trimEnd(\n    config.getOptionalString('target') ?? DEFAULT_TARGET,\n    '/',\n  );\n  const authority = config.getOptionalString('authority');\n\n  const tenantId = config.getString('tenantId');\n  const clientId = config.getOptionalString('clientId');\n  const clientSecret = config.getOptionalString('clientSecret');\n\n  const userExpand = config.getOptionalString('user.expand');\n  const userFilter = config.getOptionalString('user.filter');\n  const userSelect = config.getOptionalStringArray('user.select');\n  const userPath = config.getOptionalString('user.path') ?? 'users';\n  const loadUserPhotos = config.getOptionalBoolean('user.loadPhotos');\n\n  const groupExpand = config.getOptionalString('group.expand');\n  const groupFilter = config.getOptionalString('group.filter');\n  const groupSearch = config.getOptionalString('group.search');\n  const groupSelect = config.getOptionalStringArray('group.select');\n  const groupPath = config.getOptionalString('group.path') ?? 'groups';\n  const groupIncludeSubGroups = config.getOptionalBoolean(\n    'group.includeSubGroups',\n  );\n\n  const queryMode = config.getOptionalString('queryMode');\n  if (\n    queryMode !== undefined &&\n    queryMode !== 'basic' &&\n    queryMode !== 'advanced'\n  ) {\n    throw new Error(`queryMode must be one of: basic, advanced`);\n  }\n\n  const userGroupMemberFilter = config.getOptionalString(\n    'userGroupMember.filter',\n  );\n  const userGroupMemberSearch = config.getOptionalString(\n    'userGroupMember.search',\n  );\n  const userGroupMemberPath = config.getOptionalString('userGroupMember.path');\n\n  if (userFilter && userGroupMemberFilter) {\n    throw new Error(\n      `userFilter and userGroupMemberFilter are mutually exclusive, only one can be specified.`,\n    );\n  }\n  if (userFilter && userGroupMemberSearch) {\n    throw new Error(\n      `userGroupMemberSearch cannot be specified when userFilter is defined.`,\n    );\n  }\n\n  if (clientId && !clientSecret) {\n    throw new Error(`clientSecret must be provided when clientId is defined.`);\n  }\n\n  if (clientSecret && !clientId) {\n    throw new Error(`clientId must be provided when clientSecret is defined.`);\n  }\n\n  const schedule = config.has('schedule')\n    ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n        config.getConfig('schedule'),\n      )\n    : undefined;\n\n  return {\n    id,\n    target,\n    authority,\n    clientId,\n    clientSecret,\n    tenantId,\n    userExpand,\n    userFilter,\n    userSelect,\n    userPath,\n    loadUserPhotos,\n    groupExpand,\n    groupFilter,\n    groupSearch,\n    groupSelect,\n    groupPath,\n    groupIncludeSubGroups,\n    queryMode,\n    userGroupMemberFilter,\n    userGroupMemberSearch,\n    userGroupMemberPath,\n    schedule,\n  };\n}\n"],"names":["trimEnd","readSchedulerServiceTaskScheduleDefinitionFromConfig"],"mappings":"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"}
+{"version":3,"file":"config.cjs.js","sources":["../../src/microsoftGraph/config.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  SchedulerServiceTaskScheduleDefinition,\n  readSchedulerServiceTaskScheduleDefinitionFromConfig,\n} from '@backstage/backend-plugin-api';\nimport { Config } from '@backstage/config';\nimport { trimEnd } from 'lodash';\n\nconst DEFAULT_PROVIDER_ID = 'default';\nconst DEFAULT_TARGET = 'https://graph.microsoft.com/v1.0';\n\n/**\n * The configuration parameters for a single Microsoft Graph provider.\n *\n * @public\n */\nexport type MicrosoftGraphProviderConfig = {\n  /**\n   * Identifier of the provider which will be used i.e. at the location key for ingested entities.\n   */\n  id: string;\n\n  /**\n   * The prefix of the target that this matches on, e.g.\n   * \"https://graph.microsoft.com/v1.0\", with no trailing slash.\n   */\n  target: string;\n  /**\n   * The auth authority used.\n   *\n   * E.g. \"https://login.microsoftonline.com\"\n   */\n  authority?: string;\n  /**\n   * The tenant whose org data we are interested in.\n   */\n  tenantId: string;\n  /**\n   * The OAuth client ID to use for authenticating requests.\n   * If specified, ClientSecret must also be specified\n   */\n  clientId?: string;\n  /**\n   * The OAuth client secret to use for authenticating requests.\n   * If specified, ClientId must also be specified\n   */\n  clientSecret?: string;\n  /**\n   * The filter to apply to extract users. This is combined with the base\n   * `accountEnabled eq true` filter that is always applied automatically.\n   *\n   * E.g. \"userType eq 'member'\"\n   */\n  userFilter?: string;\n  /**\n   * The fields to be fetched on query.\n   *\n   * E.g. [\"id\", \"displayName\", \"description\"]\n   */\n  userSelect?: string[];\n  /**\n   * The \"expand\" argument to apply to users.\n   *\n   * E.g. \"manager\".\n   */\n  userExpand?: string;\n\n  /**\n   * The path to the users endpoint. Defaults to \"/users\".\n   *\n   * E.g. \"/users\"\n   */\n  userPath?: string;\n  /**\n   * The filter to apply to extract users by groups memberships.\n   *\n   * E.g. \"displayName eq 'Backstage Users'\"\n   */\n  userGroupMemberFilter?: string;\n  /**\n   * The search criteria to apply to extract users by groups memberships.\n   *\n   * E.g. \"\\\"displayName:-team\\\"\" would only match groups which contain '-team'\n   */\n  userGroupMemberSearch?: string;\n\n  /**\n   * The path to the groups endpoint. Defaults to \"/groups\".\n   *\n   * E.g. \"/groups\"\n   */\n  userGroupMemberPath?: string;\n\n  /**\n   * The \"expand\" argument to apply to groups.\n   *\n   * E.g. \"member\".\n   */\n  groupExpand?: string;\n  /**\n   * The filter to apply to extract groups.\n   *\n   * E.g. \"securityEnabled eq false and mailEnabled eq true\"\n   */\n  groupFilter?: string;\n  /**\n   * The search criteria to apply to extract groups.\n   *\n   * E.g. \"\\\"displayName:-team\\\"\" would only match groups which contain '-team'\n   */\n  groupSearch?: string;\n\n  /**\n   * The fields to be fetched on query.\n   *\n   * E.g. [\"id\", \"displayName\", \"description\"]\n   */\n  groupSelect?: string[];\n\n  /**\n   * The path to the groups endpoint. Defaults to \"/groups\".\n   *\n   * E.g. \"/groups\"\n   */\n  groupPath?: string;\n\n  /**\n   * Whether to ingest groups that are members of the found/filtered/searched groups.\n   * Default value is `false`.\n   */\n  groupIncludeSubGroups?: boolean;\n\n  /**\n   * By default, the Microsoft Graph API only provides the basic feature set\n   * for querying. Certain features are limited to advanced query capabilities\n   * (see https://docs.microsoft.com/en-us/graph/aad-advanced-queries)\n   * and need to be enabled.\n   *\n   * Some features like `$expand` are not available for advanced queries, though.\n   */\n  queryMode?: 'basic' | 'advanced';\n\n  /**\n   * Set to false to not load user photos.\n   * This can be useful for huge organizations.\n   */\n  loadUserPhotos?: boolean;\n\n  /**\n   * Schedule configuration for refresh tasks.\n   */\n  schedule?: SchedulerServiceTaskScheduleDefinition;\n};\n\n/**\n * Parses configuration.\n *\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n * @deprecated Replaced by not exported `readProviderConfigs` and kept for backwards compatibility only.\n */\nexport function readMicrosoftGraphConfig(\n  config: Config,\n): MicrosoftGraphProviderConfig[] {\n  const providers: MicrosoftGraphProviderConfig[] = [];\n  const providerConfigs = config.getOptionalConfigArray('providers') ?? [];\n\n  for (const providerConfig of providerConfigs) {\n    const target = trimEnd(\n      providerConfig.getOptionalString('target') ?? DEFAULT_TARGET,\n      '/',\n    );\n    const authority = providerConfig.getOptionalString('authority');\n\n    const tenantId = providerConfig.getString('tenantId');\n    const clientId = providerConfig.getOptionalString('clientId');\n    const clientSecret = providerConfig.getOptionalString('clientSecret');\n\n    const userExpand = providerConfig.getOptionalString('userExpand');\n    const userFilter = buildUserFilter(\n      providerConfig.getOptionalString('userFilter'),\n    );\n    const userSelect = providerConfig.getOptionalStringArray('userSelect');\n    const userGroupMemberFilter = providerConfig.getOptionalString(\n      'userGroupMemberFilter',\n    );\n    const userGroupMemberSearch = providerConfig.getOptionalString(\n      'userGroupMemberSearch',\n    );\n    const groupExpand = providerConfig.getOptionalString('groupExpand');\n    const groupFilter = providerConfig.getOptionalString('groupFilter');\n    const groupSearch = providerConfig.getOptionalString('groupSearch');\n\n    const groupSelect = providerConfig.getOptionalStringArray('groupSelect');\n    const queryMode = providerConfig.getOptionalString('queryMode');\n    if (\n      queryMode !== undefined &&\n      queryMode !== 'basic' &&\n      queryMode !== 'advanced'\n    ) {\n      throw new Error(`queryMode must be one of: basic, advanced`);\n    }\n\n    if (clientId && !clientSecret) {\n      throw new Error(\n        `clientSecret must be provided when clientId is defined.`,\n      );\n    }\n\n    if (clientSecret && !clientId) {\n      throw new Error(\n        `clientId must be provided when clientSecret is defined.`,\n      );\n    }\n\n    providers.push({\n      id: target,\n      target,\n      authority,\n      tenantId,\n      clientId,\n      clientSecret,\n      userExpand,\n      userFilter,\n      userSelect,\n      userGroupMemberFilter,\n      userGroupMemberSearch,\n      groupExpand,\n      groupFilter,\n      groupSearch,\n      groupSelect,\n      queryMode,\n    });\n  }\n\n  return providers;\n}\n\n/**\n * Parses all configured providers.\n *\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n */\nexport function readProviderConfigs(\n  config: Config,\n): MicrosoftGraphProviderConfig[] {\n  const providersConfig = config.getOptionalConfig(\n    'catalog.providers.microsoftGraphOrg',\n  );\n  if (!providersConfig) {\n    return [];\n  }\n\n  if (providersConfig.has('clientId')) {\n    // simple/single config variant\n    return [readProviderConfig(DEFAULT_PROVIDER_ID, providersConfig)];\n  }\n\n  return providersConfig.keys().map(id => {\n    const providerConfig = providersConfig.getConfig(id);\n\n    return readProviderConfig(id, providerConfig);\n  });\n}\n\n/**\n * Parses a single configured provider by id.\n *\n * @param id - the id of the provider to parse\n * @param config - The root of the msgraph config hierarchy\n *\n * @public\n */\nexport function readProviderConfig(\n  id: string,\n  config: Config,\n): MicrosoftGraphProviderConfig {\n  const target = trimEnd(\n    config.getOptionalString('target') ?? DEFAULT_TARGET,\n    '/',\n  );\n  const authority = config.getOptionalString('authority');\n\n  const tenantId = config.getString('tenantId');\n  const clientId = config.getOptionalString('clientId');\n  const clientSecret = config.getOptionalString('clientSecret');\n\n  const userExpand = config.getOptionalString('user.expand');\n  const userFilter = buildUserFilter(config.getOptionalString('user.filter'));\n  const userSelect = config.getOptionalStringArray('user.select');\n  const userPath = config.getOptionalString('user.path') ?? 'users';\n  const loadUserPhotos = config.getOptionalBoolean('user.loadPhotos');\n\n  const groupExpand = config.getOptionalString('group.expand');\n  const groupFilter = config.getOptionalString('group.filter');\n  const groupSearch = config.getOptionalString('group.search');\n  const groupSelect = config.getOptionalStringArray('group.select');\n  const groupPath = config.getOptionalString('group.path') ?? 'groups';\n  const groupIncludeSubGroups = config.getOptionalBoolean(\n    'group.includeSubGroups',\n  );\n\n  const queryMode = config.getOptionalString('queryMode');\n  if (\n    queryMode !== undefined &&\n    queryMode !== 'basic' &&\n    queryMode !== 'advanced'\n  ) {\n    throw new Error(`queryMode must be one of: basic, advanced`);\n  }\n\n  const userGroupMemberFilter = config.getOptionalString(\n    'userGroupMember.filter',\n  );\n  const userGroupMemberSearch = config.getOptionalString(\n    'userGroupMember.search',\n  );\n  const userGroupMemberPath = config.getOptionalString('userGroupMember.path');\n\n  if (clientId && !clientSecret) {\n    throw new Error(`clientSecret must be provided when clientId is defined.`);\n  }\n\n  if (clientSecret && !clientId) {\n    throw new Error(`clientId must be provided when clientSecret is defined.`);\n  }\n\n  const schedule = config.has('schedule')\n    ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n        config.getConfig('schedule'),\n      )\n    : undefined;\n\n  return {\n    id,\n    target,\n    authority,\n    clientId,\n    clientSecret,\n    tenantId,\n    userExpand,\n    userFilter,\n    userSelect,\n    userPath,\n    loadUserPhotos,\n    groupExpand,\n    groupFilter,\n    groupSearch,\n    groupSelect,\n    groupPath,\n    groupIncludeSubGroups,\n    queryMode,\n    userGroupMemberFilter,\n    userGroupMemberSearch,\n    userGroupMemberPath,\n    schedule,\n  };\n}\n\nfunction buildUserFilter(rawFilter: string | undefined): string {\n  const base = 'accountEnabled eq true';\n  if (rawFilter) {\n    return `${base} and (${rawFilter})`;\n  }\n  return base;\n}\n"],"names":["trimEnd","readSchedulerServiceTaskScheduleDefinitionFromConfig"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.9.3-next.1",
+  "version": "0.10.0",
   "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
   "backstage": {
     "role": "backend-plugin-module",
@@ -66,19 +66,19 @@
   },
   "dependencies": {
     "@azure/identity": "^4.0.0",
-    "@backstage/backend-plugin-api": "1.9.1-next.0",
-    "@backstage/catalog-model": "1.8.1-next.1",
-    "@backstage/config": "1.3.8-next.0",
-    "@backstage/plugin-catalog-common": "1.1.10-next.0",
-    "@backstage/plugin-catalog-node": "2.2.1-next.1",
+    "@backstage/backend-plugin-api": "^1.9.1",
+    "@backstage/catalog-model": "^1.9.0",
+    "@backstage/config": "^1.3.8",
+    "@backstage/plugin-catalog-common": "^1.1.10",
+    "@backstage/plugin-catalog-node": "^2.2.1",
     "@microsoft/microsoft-graph-types": "^2.6.0",
     "lodash": "^4.17.21",
     "p-limit": "^3.0.2",
     "qs": "^6.9.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.11.3-next.1",
-    "@backstage/cli": "0.36.2-next.1",
+    "@backstage/backend-test-utils": "^1.11.3",
+    "@backstage/cli": "^0.36.2",
     "@types/lodash": "^4.14.151",
     "msw": "^1.0.0"
   },