From ea84d25b72ac5137f22716c83c687c03aa4e7943 Mon Sep 17 00:00:00 2001 From: Vincenzo Scamporlino Date: Thu, 4 Apr 2024 14:38:11 +0200 Subject: [PATCH] backend-next: rollback auth example Signed-off-by: Vincenzo Scamporlino --- packages/backend-next/package.json | 3 +- packages/backend-next/src/index.ts | 137 ++++++++--------------------- yarn.lock | 1 - 3 files changed, 37 insertions(+), 104 deletions(-) diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json index 12d1a7872b..340223ca0f 100644 --- a/packages/backend-next/package.json +++ b/packages/backend-next/package.json @@ -66,8 +66,7 @@ "@backstage/plugin-signals-backend": "workspace:^", "@backstage/plugin-sonarqube-backend": "workspace:^", "@backstage/plugin-techdocs-backend": "workspace:^", - "@backstage/plugin-todo-backend": "workspace:^", - "express-promise-router": "^4.1.0" + "@backstage/plugin-todo-backend": "workspace:^" }, "devDependencies": { "@backstage/cli": "workspace:^" diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts index ee99e0f551..4965462b2c 100644 --- a/packages/backend-next/src/index.ts +++ b/packages/backend-next/src/index.ts @@ -15,113 +15,48 @@ */ import { createBackend } from '@backstage/backend-defaults'; -import { createBackendPlugin } from '@backstage/backend-plugin-api'; -import Router from 'express-promise-router'; -import { coreServices } from '@backstage/backend-plugin-api'; const backend = createBackend(); +backend.add(import('@backstage/plugin-auth-backend')); +backend.add(import('./authModuleGithubProvider')); +backend.add(import('@backstage/plugin-auth-backend-module-guest-provider')); + +backend.add(import('@backstage/plugin-adr-backend')); +backend.add(import('@backstage/plugin-app-backend/alpha')); +backend.add(import('@backstage/plugin-azure-devops-backend')); +backend.add(import('@backstage/plugin-badges-backend')); +backend.add(import('@backstage/plugin-catalog-backend-module-unprocessed')); backend.add( - createBackendPlugin({ - pluginId: 'receiver', - register(reg) { - reg.registerInit({ - deps: { - httpRouter: coreServices.httpRouter, - httpAuth: coreServices.httpAuth, - }, - async init({ httpRouter, httpAuth }) { - const router = Router(); - router.get('/hello', async (req, res) => { - console.log('Got hello'); - const credentials = await httpAuth.credentials(req); - console.log('Got credentials', credentials); - - res.json({ hello: 'world' }); - }); - httpRouter.use(router); - }, - }); - }, - }), + import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'), ); - +backend.add(import('@backstage/plugin-catalog-backend/alpha')); +backend.add(import('@backstage/plugin-devtools-backend')); +backend.add(import('@backstage/plugin-entity-feedback-backend')); +backend.add(import('@backstage/plugin-jenkins-backend')); +backend.add(import('@backstage/plugin-kubernetes-backend/alpha')); +backend.add(import('@backstage/plugin-lighthouse-backend')); +backend.add(import('@backstage/plugin-linguist-backend')); +backend.add(import('@backstage/plugin-playlist-backend')); +backend.add(import('@backstage/plugin-nomad-backend')); backend.add( - createBackendPlugin({ - pluginId: 'caller', - register(reg) { - reg.registerInit({ - deps: { - rootLifecycle: coreServices.rootLifecycle, - auth: coreServices.auth, - discovery: coreServices.discovery, - // httpRouter: coreServices.httpRouter, - }, - async init({ rootLifecycle, auth, discovery }) { - rootLifecycle.addStartupHook(async () => { - const { token } = await auth.getPluginRequestToken({ - onBehalfOf: await auth.getOwnServiceCredentials(), - targetPluginId: 'receiver', - }); - console.log(`DEBUG: token=`, token); - const res = await fetch( - `${await discovery.getBaseUrl('receiver')}/hello`, - { - headers: { - authorization: `Bearer ${token}`, - }, - }, - ); - console.log( - `DEBUG: res ${res.status} ${res.statusText}`, - await res.json(), - ); - }); - }, - }); - }, - }), + import('@backstage/plugin-permission-backend-module-allow-all-policy'), ); - -// backend.add(import('@backstage/plugin-auth-backend')); -// backend.add(import('./authModuleGithubProvider')); -// backend.add(import('@backstage/plugin-auth-backend-module-guest-provider')); - -// backend.add(import('@backstage/plugin-adr-backend')); -// backend.add(import('@backstage/plugin-app-backend/alpha')); -// backend.add(import('@backstage/plugin-azure-devops-backend')); -// backend.add(import('@backstage/plugin-badges-backend')); -// backend.add(import('@backstage/plugin-catalog-backend-module-unprocessed')); -// backend.add( -// import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'), -// ); -// backend.add(import('@backstage/plugin-catalog-backend/alpha')); -// backend.add(import('@backstage/plugin-devtools-backend')); -// backend.add(import('@backstage/plugin-entity-feedback-backend')); -// backend.add(import('@backstage/plugin-jenkins-backend')); -// backend.add(import('@backstage/plugin-kubernetes-backend/alpha')); -// backend.add(import('@backstage/plugin-lighthouse-backend')); -// backend.add(import('@backstage/plugin-linguist-backend')); -// backend.add(import('@backstage/plugin-playlist-backend')); -// backend.add(import('@backstage/plugin-nomad-backend')); -// backend.add( -// import('@backstage/plugin-permission-backend-module-allow-all-policy'), -// ); -// backend.add(import('@backstage/plugin-permission-backend/alpha')); -// backend.add(import('@backstage/plugin-proxy-backend/alpha')); -// backend.add(import('@backstage/plugin-scaffolder-backend/alpha')); -// backend.add(import('@backstage/plugin-scaffolder-backend-module-github')); -// backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha')); -// backend.add(import('@backstage/plugin-search-backend-module-explore/alpha')); -// backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha')); -// backend.add( -// import('@backstage/plugin-catalog-backend-module-backstage-openapi'), -// ); -// backend.add(import('@backstage/plugin-search-backend/alpha')); -// backend.add(import('@backstage/plugin-techdocs-backend/alpha')); -// backend.add(import('@backstage/plugin-todo-backend')); -// backend.add(import('@backstage/plugin-sonarqube-backend')); -// backend.add(import('@backstage/plugin-signals-backend')); -// backend.add(import('@backstage/plugin-notifications-backend')); +backend.add(import('@backstage/plugin-permission-backend/alpha')); +backend.add(import('@backstage/plugin-proxy-backend/alpha')); +backend.add(import('@backstage/plugin-scaffolder-backend/alpha')); +backend.add(import('@backstage/plugin-scaffolder-backend-module-github')); +backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha')); +backend.add(import('@backstage/plugin-search-backend-module-explore/alpha')); +backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha')); +backend.add( + import('@backstage/plugin-catalog-backend-module-backstage-openapi'), +); +backend.add(import('@backstage/plugin-search-backend/alpha')); +backend.add(import('@backstage/plugin-techdocs-backend/alpha')); +backend.add(import('@backstage/plugin-todo-backend')); +backend.add(import('@backstage/plugin-sonarqube-backend')); +backend.add(import('@backstage/plugin-signals-backend')); +backend.add(import('@backstage/plugin-notifications-backend')); backend.start(); diff --git a/yarn.lock b/yarn.lock index d1e6c584b8..aeaba30baf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27585,7 +27585,6 @@ __metadata: "@backstage/plugin-sonarqube-backend": "workspace:^" "@backstage/plugin-techdocs-backend": "workspace:^" "@backstage/plugin-todo-backend": "workspace:^" - express-promise-router: ^4.1.0 languageName: unknown linkType: soft