From 612d1fdaa9b06cd3c0184086c377e18a546074e3 Mon Sep 17 00:00:00 2001 From: Jonathan Roebuck Date: Mon, 24 Feb 2025 15:55:17 +0000 Subject: [PATCH] Use correct config definitions in MS related modules Signed-off-by: Jonathan Roebuck --- .changeset/rich-sloths-hang.md | 7 +++++++ plugins/auth-backend-module-microsoft-provider/config.d.ts | 1 + plugins/catalog-backend-module-msgraph/config.d.ts | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .changeset/rich-sloths-hang.md diff --git a/.changeset/rich-sloths-hang.md b/.changeset/rich-sloths-hang.md new file mode 100644 index 0000000000..9b7a9915a6 --- /dev/null +++ b/.changeset/rich-sloths-hang.md @@ -0,0 +1,7 @@ +--- +'@backstage/plugin-auth-backend-module-microsoft-provider': patch +'@backstage/plugin-catalog-backend-module-msgraph': patch +--- + +Update `catalog.providers.microsoftGraphOrg.target` config def to be optional as this has a default value. +Update `auth.microsoft.signIn.resolvers` config def to include the `userIdMatchingUserEntityAnnotation` resolver. diff --git a/plugins/auth-backend-module-microsoft-provider/config.d.ts b/plugins/auth-backend-module-microsoft-provider/config.d.ts index d69637e7a2..3cfcd45a2a 100644 --- a/plugins/auth-backend-module-microsoft-provider/config.d.ts +++ b/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; diff --git a/plugins/catalog-backend-module-msgraph/config.d.ts b/plugins/catalog-backend-module-msgraph/config.d.ts index b04c1cd303..d91d3f9d34 100644 --- a/plugins/catalog-backend-module-msgraph/config.d.ts +++ b/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. *