From 034c04c25934171750dff00549003eef482d553a Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 17 Jun 2020 17:06:03 +0200
Subject: [PATCH] plugins/auth-backend: load config in standalone environment

---
 plugins/auth-backend/package.json                         | 1 +
 plugins/auth-backend/src/service/standaloneApplication.ts | 6 ++++--
 plugins/auth-backend/src/service/standaloneServer.ts      | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 7b448df126..d22a5ef6d6 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
     "@backstage/config": "^0.1.1-alpha.9",
+    "@backstage/config-loader": "^0.1.1-alpha.9",
     "@types/express": "^4.17.6",
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
diff --git a/plugins/auth-backend/src/service/standaloneApplication.ts b/plugins/auth-backend/src/service/standaloneApplication.ts
index 5eea4fb8f5..cd81e32ccb 100644
--- a/plugins/auth-backend/src/service/standaloneApplication.ts
+++ b/plugins/auth-backend/src/service/standaloneApplication.ts
@@ -19,6 +19,7 @@ import {
   notFoundHandler,
   requestLoggingHandler,
 } from '@backstage/backend-common';
+import { Config } from '@backstage/config';
 import compression from 'compression';
 import cors from 'cors';
 import express from 'express';
@@ -29,12 +30,13 @@ import { createRouter } from './router';
 export interface ApplicationOptions {
   enableCors: boolean;
   logger: Logger;
+  config: Config;
 }
 
 export async function createStandaloneApplication(
   options: ApplicationOptions,
 ): Promise<express.Application> {
-  const { enableCors, logger } = options;
+  const { enableCors, logger, config } = options;
   const app = express();
 
   app.use(helmet());
@@ -44,7 +46,7 @@ export async function createStandaloneApplication(
   app.use(compression());
   app.use(express.json());
   app.use(requestLoggingHandler());
-  app.use('/', await createRouter({ logger }));
+  app.use('/', await createRouter({ logger, config }));
   app.use(notFoundHandler());
   app.use(errorHandler());
 
diff --git a/plugins/auth-backend/src/service/standaloneServer.ts b/plugins/auth-backend/src/service/standaloneServer.ts
index be1021d604..c03fe44b40 100644
--- a/plugins/auth-backend/src/service/standaloneServer.ts
+++ b/plugins/auth-backend/src/service/standaloneServer.ts
@@ -17,6 +17,8 @@
 import { Server } from 'http';
 import { Logger } from 'winston';
 import { createStandaloneApplication } from './standaloneApplication';
+import { ConfigReader } from '@backstage/config';
+import { loadConfig } from '@backstage/config-loader';
 
 export interface ServerOptions {
   port: number;
@@ -28,11 +30,13 @@ export async function startStandaloneServer(
   options: ServerOptions,
 ): Promise<Server> {
   const logger = options.logger.child({ service: 'auth-backend' });
+  const config = ConfigReader.fromConfigs(await loadConfig());
 
   logger.debug('Creating application...');
   const app = await createStandaloneApplication({
     enableCors: options.enableCors,
     logger,
+    config,
   });
 
   logger.debug('Starting application server...');