Merge pull request #28952 from backstage/correct-ms-config-defs

Use correct config definitions in MS related modules

.changeset/olive-dodos-applaud.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-microsoft-provider': patch
+---
+
+Update `auth.microsoft.signIn.resolvers` config def to include the `userIdMatchingUserEntityAnnotation` resolver.

.changeset/rich-sloths-hang.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Update `catalog.providers.microsoftGraphOrg.target` config def to be optional as this has a default value.

plugins/auth-backend-module-microsoft-provider/config.d.ts

@@ -40,6 +40,7 @@ export interface Config {
                   allowedDomains?: string[];
                 }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
+              | { resolver: 'userIdMatchingUserEntityAnnotation' }
             >;
           };
           sessionDuration?: HumanDuration | string;

plugins/catalog-backend-module-msgraph/config.d.ts

@@ -32,7 +32,7 @@ export interface Config {
            * The prefix of the target that this matches on, e.g.
            * "https://graph.microsoft.com/v1.0", with no trailing slash.
            */
-          target: string;
+          target?: string;
           /**
            * The auth authority used.
            *