From b2e0687363c0659444ae89990d274582aafd7387 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 31 May 2022 13:27:19 +0200
Subject: [PATCH] scaffolder-backend: fix merge conflict in router

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/scaffolder-backend/src/service/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 3132ccffda..df416093f4 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -354,7 +354,7 @@ export async function createRouter(
         throw new InputError('Input template is not a template');
       }
 
-      const token = getBearerToken(req.headers.authorization);
+      const { token } = parseBearerToken(req.headers.authorization);
 
       for (const parameters of [template.spec.parameters ?? []].flat()) {
         const result = validate(body.values, parameters);