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

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.5.2
+
+### Patch Changes
+
+- a4ebd513527: Revert using `baseUrl` for MS Graph provider as it breaks token retrieval
+- 26eef93c547: Fixed msgraph catalog backend to use user.select option when fetching user from AzureAD
+- 90469c02c8c: Renamed `microsoftGraphOrgEntityProviderCatalogModule` to `catalogModuleMicrosoftGraphOrgEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).
+- e675f902980: Make sure to not use deprecated exports from `@backstage/plugin-catalog-backend`
+- 928a12a9b3e: Internal refactor of `/alpha` exports.
+- 52b0022dab7: Updated dependency `msw` to `^1.0.0`.
+- 2c234a89325: properly support custom graph api URL
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.0
+  - @backstage/backend-common@0.18.3
+  - @backstage/plugin-catalog-node@1.3.4
+  - @backstage/backend-plugin-api@0.5.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+
+## 0.5.2-next.2
+
+### Patch Changes
+
+- 26eef93c547: Fixed msgraph catalog backend to use user.select option when fetching user from AzureAD
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.0-next.2
+  - @backstage/backend-common@0.18.3-next.2
+  - @backstage/backend-plugin-api@0.4.1-next.2
+  - @backstage/plugin-catalog-backend@1.8.0-next.2
+  - @backstage/plugin-catalog-node@1.3.4-next.2
+  - @backstage/config@1.0.7-next.0
+
 ## 0.5.2-next.1
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.5.2-next.1",
+  "version": "0.5.2",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -13,7 +13,7 @@ var fetch = require('node-fetch');
 var qs = require('qs');
 var backendTasks = require('@backstage/backend-tasks');
 var limiterFactory = require('p-limit');
-require('@backstage/plugin-catalog-backend');
+require('@backstage/plugin-catalog-node');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -655,8 +655,8 @@ async function readMicrosoftGraphUsersInGroups(client, options) {
   for await (const group of client.getGroups(
     {
       expand: options.groupExpand,
-      search: options.userGroupMemberSearch,
       filter: options.userGroupMemberFilter,
+      search: options.userGroupMemberSearch,
       select: ["id", "displayName"],
       top: PAGE_SIZE
     },
@@ -669,6 +669,8 @@ async function readMicrosoftGraphUsersInGroups(client, options) {
           group.id,
           {
             expand: options.userExpand,
+            filter: options.userFilter,
+            select: options.userSelect,
             top: PAGE_SIZE
           },
           options.queryMode
@@ -723,8 +725,8 @@ async function readMicrosoftGraphGroups(client, tenantId, options) {
   for await (const group of client.getGroups(
     {
       expand: options == null ? void 0 : options.groupExpand,
-      search: options == null ? void 0 : options.groupSearch,
       filter: options == null ? void 0 : options.groupFilter,
+      search: options == null ? void 0 : options.groupSearch,
       select: options == null ? void 0 : options.groupSelect,
       top: PAGE_SIZE
     },
@@ -835,6 +837,9 @@ async function readMicrosoftGraphOrg(client, tenantId, options) {
       client,
       {
         queryMode: options.queryMode,
+        userExpand: options.userExpand,
+        userFilter: options.userFilter,
+        userSelect: options.userSelect,
         userGroupMemberFilter: options.userGroupMemberFilter,
         userGroupMemberSearch: options.userGroupMemberSearch,
         transformer: options.userTransformer,
@@ -845,9 +850,9 @@ async function readMicrosoftGraphOrg(client, tenantId, options) {
   } else {
     const { users: usersWithFilter } = await readMicrosoftGraphUsers(client, {
       queryMode: options.queryMode,
+      userExpand: options.userExpand,
       userFilter: options.userFilter,
       userSelect: options.userSelect,
-      userExpand: options.userExpand,
       transformer: options.userTransformer,
       logger: options.logger
     });
@@ -855,8 +860,9 @@ async function readMicrosoftGraphOrg(client, tenantId, options) {
   }
   const { groups, rootGroup, groupMember, groupMemberOf } = await readMicrosoftGraphGroups(client, tenantId, {
     queryMode: options.queryMode,
-    groupSearch: options.groupSearch,
+    groupExpand: options.groupExpand,
     groupFilter: options.groupFilter,
+    groupSearch: options.groupSearch,
     groupSelect: options.groupSelect,
     groupTransformer: options.groupTransformer,
     organizationTransformer: options.organizationTransformer
@@ -1026,10 +1032,11 @@ class MicrosoftGraphOrgEntityProvider {
       provider.tenantId,
       {
         userExpand: provider.userExpand,
-        groupExpand: provider.groupExpand,
         userFilter: provider.userFilter,
+        userSelect: provider.userSelect,
         userGroupMemberFilter: provider.userGroupMemberFilter,
         userGroupMemberSearch: provider.userGroupMemberSearch,
+        groupExpand: provider.groupExpand,
         groupFilter: provider.groupFilter,
         groupSearch: provider.groupSearch,
         groupSelect: provider.groupSelect,
@@ -1105,7 +1112,7 @@ function withLocations(providerId, entity) {
   );
 }
 
-const microsoftGraphOrgEntityProviderCatalogModule = backendPluginApi.createBackendModule(
+const catalogModuleMicrosoftGraphOrgEntityProvider = backendPluginApi.createBackendModule(
   {
     pluginId: "catalog",
     moduleId: "microsoftGraphOrgEntityProvider",
@@ -1133,5 +1140,5 @@ const microsoftGraphOrgEntityProviderCatalogModule = backendPluginApi.createBack
   }
 );
 
-exports.microsoftGraphOrgEntityProviderCatalogModule = microsoftGraphOrgEntityProviderCatalogModule;
+exports.catalogModuleMicrosoftGraphOrgEntityProvider = catalogModuleMicrosoftGraphOrgEntityProvider;
 //# sourceMappingURL=alpha.cjs.js.map