Merge pull request #16201 from LauraMoraB/fix/read-user-select-from-config

Read msgraph user.select from configuration

.changeset/silly-buckets-joke.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Fixed a bug reading the `user.select` field expected from the `app-config.yaml` configuration

plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts

@@ -52,6 +52,7 @@ describe('readMicrosoftGraphConfig', () => {
           authority: 'https://login.example.com/',
           userExpand: 'manager',
           userFilter: 'accountEnabled eq true',
+          userSelect: ['id', 'displayName', 'department'],
           groupExpand: 'member',
           groupSelect: ['id', 'displayName', 'description'],
           groupFilter: 'securityEnabled eq false',
@@ -69,6 +70,7 @@ describe('readMicrosoftGraphConfig', () => {
         authority: 'https://login.example.com/',
         userExpand: 'manager',
         userFilter: 'accountEnabled eq true',
+        userSelect: ['id', 'displayName', 'department'],
         groupExpand: 'member',
         groupSelect: ['id', 'displayName', 'description'],
         groupFilter: 'securityEnabled eq false',
@@ -167,6 +169,7 @@ describe('readProviderConfigs', () => {
               user: {
                 expand: 'manager',
                 filter: 'accountEnabled eq true',
+                select: ['id', 'displayName', 'department'],
               },
               group: {
                 expand: 'member',
@@ -196,6 +199,7 @@ describe('readProviderConfigs', () => {
         queryMode: 'advanced',
         userExpand: 'manager',
         userFilter: 'accountEnabled eq true',
+        userSelect: ['id', 'displayName', 'department'],
         groupExpand: 'member',
         groupSelect: ['id', 'displayName', 'description'],
         groupFilter: 'securityEnabled eq false',

plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts

@@ -264,6 +264,7 @@ export function readProviderConfig(
 
   const userExpand = config.getOptionalString('user.expand');
   const userFilter = config.getOptionalString('user.filter');
+  const userSelect = config.getOptionalStringArray('user.select');
 
   const groupExpand = config.getOptionalString('group.expand');
   const groupFilter = config.getOptionalString('group.filter');
@@ -318,6 +319,7 @@ export function readProviderConfig(
     tenantId,
     userExpand,
     userFilter,
+    userSelect,
     groupExpand,
     groupFilter,
     groupSearch,