From 29e4d8b76b7cb4481a63eccb7ceba1b2793ea200 Mon Sep 17 00:00:00 2001
From: Gabriel Huber <gabriel@ghuber.de>
Date: Wed, 11 Oct 2023 10:46:33 +0200
Subject: [PATCH] Fix: signOutTargetUrl determination

Signed-off-by: Gabriel Huber <mail@ghuber.de>
---
 .changeset/empty-clocks-argue.md            | 5 +++++
 packages/core-app-api/src/app/AppRouter.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/empty-clocks-argue.md

diff --git a/.changeset/empty-clocks-argue.md b/.changeset/empty-clocks-argue.md
new file mode 100644
index 0000000000..57e56fce7e
--- /dev/null
+++ b/.changeset/empty-clocks-argue.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+Fixed bug in AppRouter to determine the correct signOutTargetUrl if app.baseUrl contains a basePath
diff --git a/packages/core-app-api/src/app/AppRouter.tsx b/packages/core-app-api/src/app/AppRouter.tsx
index b799983a3b..9d07be1ffd 100644
--- a/packages/core-app-api/src/app/AppRouter.tsx
+++ b/packages/core-app-api/src/app/AppRouter.tsx
@@ -70,7 +70,7 @@ function SignInPageWrapper({
 }) {
   const [identityApi, setIdentityApi] = useState<IdentityApi>();
   const configApi = useApi(configApiRef);
-  const basePath = getBasePath(configApi);
+  const basePath = readBasePath(configApi);
 
   if (!identityApi) {
     return <Component onSignInSuccess={setIdentityApi} />;