From 6ca29b66c8cff1e498f6dbe1cf425206af89cfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 25 Jun 2021 21:25:20 +0200
Subject: [PATCH] Unbreak `.well-known` OIDC routes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/long-olives-cheer.md            |  5 +++++
 .github/styles/vocab.txt                   |  1 +
 plugins/auth-backend/src/service/router.ts | 10 +++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/long-olives-cheer.md

diff --git a/.changeset/long-olives-cheer.md b/.changeset/long-olives-cheer.md
new file mode 100644
index 0000000000..65c79aeae7
--- /dev/null
+++ b/.changeset/long-olives-cheer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Unbreak `.well-known` OIDC routes
diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt
index dcad0952f1..8b5522b4a3 100644
--- a/.github/styles/vocab.txt
+++ b/.github/styles/vocab.txt
@@ -272,6 +272,7 @@ transpilation
 transpiled
 truthy
 ui
+unbreak
 unmanaged
 unregister
 unregistration
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index e988fde97c..8173efcbc1 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -144,11 +144,6 @@ export async function createRouter({
     }
   }
 
-  router.use('/:provider/', req => {
-    const { provider } = req.params;
-    throw new NotFoundError(`Unknown auth provider '${provider}'`);
-  });
-
   router.use(
     createOidcRouter({
       tokenIssuer,
@@ -156,5 +151,10 @@ export async function createRouter({
     }),
   );
 
+  router.use('/:provider/', req => {
+    const { provider } = req.params;
+    throw new NotFoundError(`Unknown auth provider '${provider}'`);
+  });
+
   return router;
 }