From d7f0203094e11a823aa80a57fc6ec2b8d0b3d98c Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 10 Feb 2021 11:59:30 +0100 Subject: [PATCH] scaffolder-backend: remove auth-backend dependency --- plugins/scaffolder-backend/package.json | 1 - plugins/scaffolder-backend/src/service/router.ts | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index 50f383e9ca..b8b61e4649 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -34,7 +34,6 @@ "@backstage/catalog-model": "^0.7.1", "@backstage/config": "^0.1.2", "@backstage/integration": "^0.3.2", - "@backstage/plugin-auth-backend": "^0.2.12", "@gitbeaker/core": "^28.0.2", "@gitbeaker/node": "^28.0.2", "@octokit/rest": "^18.0.12", diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index 0237386a4b..51425f75e8 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -15,7 +15,6 @@ */ import { Config } from '@backstage/config'; -import { IdentityClient } from '@backstage/plugin-auth-backend'; import Docker from 'dockerode'; import express from 'express'; import { resolve as resolvePath } from 'path'; @@ -136,7 +135,7 @@ export async function createRouter( // Forward authorization from client const template = await entityClient.findTemplate(templateName, { - token: IdentityClient.getBearerToken(req.headers.authorization), + token: getBearerToken(req.headers.authorization), }); const validationResult: ValidatorResult = validate( @@ -299,3 +298,7 @@ export async function createRouter( return app; } + +function getBearerToken(header?: string): string | undefined { + return header?.match(/Bearer\s+(\S+)/i)?.[1]; +}