From 43795b857664d21d2c700cc4bada82431abe42ba Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 31 May 2020 19:37:38 +0200
Subject: [PATCH 1/2] packages/dev-utils: added addRootChild to DevAppBuilder

---
 packages/dev-utils/src/devApp/render.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/dev-utils/src/devApp/render.tsx b/packages/dev-utils/src/devApp/render.tsx
index 72c9581a84..5a28a43e8b 100644
--- a/packages/dev-utils/src/devApp/render.tsx
+++ b/packages/dev-utils/src/devApp/render.tsx
@@ -15,7 +15,7 @@
  */
 
 import { hot } from 'react-hot-loader/root';
-import React, { FC, ComponentType } from 'react';
+import React, { FC, ComponentType, ReactNode } from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import BookmarkIcon from '@material-ui/icons/Bookmark';
@@ -43,6 +43,7 @@ type BackstagePlugin = ReturnType<typeof createPlugin>;
 class DevAppBuilder {
   private readonly plugins = new Array<BackstagePlugin>();
   private readonly factories = new Array<ApiFactory<any, any, any>>();
+  private readonly rootChildren = new Array<ReactNode>();
 
   /**
    * Register one or more plugins to render in the dev app
@@ -62,6 +63,16 @@ class DevAppBuilder {
     return this;
   }
 
+  /**
+   * Adds a React node to place just inside the App Provider.
+   *
+   * Useful for adding more global components like the AlertDisplay.
+   */
+  addRootChild(node: ReactNode): DevAppBuilder {
+    this.rootChildren.push(node);
+    return this;
+  }
+
   /**
    * Build a DevApp component using the resources registered so far
    */
@@ -79,6 +90,7 @@ class DevAppBuilder {
       return (
         <AppProvider>
           <AlertDisplay />
+          {this.rootChildren}
           <BrowserRouter>
             <SidebarPage>
               {sidebar}

From 6f955a536678eb91c43405f751549666a72b1144 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 31 May 2020 19:40:58 +0200
Subject: [PATCH 2/2] packages/dev-utils: add oauthRequestApi factory + dialog

---
 packages/dev-utils/src/devApp/apiFactories.ts | 8 ++++++++
 packages/dev-utils/src/devApp/render.tsx      | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/packages/dev-utils/src/devApp/apiFactories.ts b/packages/dev-utils/src/devApp/apiFactories.ts
index 162375cf1c..967918d87a 100644
--- a/packages/dev-utils/src/devApp/apiFactories.ts
+++ b/packages/dev-utils/src/devApp/apiFactories.ts
@@ -22,6 +22,8 @@ import {
   createApiFactory,
   ErrorAlerter,
   AlertApiForwarder,
+  oauthRequestApiRef,
+  OAuthRequestManager,
 } from '@backstage/core';
 
 // TODO(rugvip): We should likely figure out how to reuse all of these between apps
@@ -41,3 +43,9 @@ export const errorApiFactory = createApiFactory({
   factory: ({ alertApi }) =>
     new ErrorAlerter(alertApi, new ErrorApiForwarder()),
 });
+
+export const oauthRequestApiFactory = createApiFactory({
+  implements: oauthRequestApiRef,
+  deps: {},
+  factory: () => new OAuthRequestManager(),
+});
diff --git a/packages/dev-utils/src/devApp/render.tsx b/packages/dev-utils/src/devApp/render.tsx
index 5a28a43e8b..b174a0447f 100644
--- a/packages/dev-utils/src/devApp/render.tsx
+++ b/packages/dev-utils/src/devApp/render.tsx
@@ -30,6 +30,7 @@ import {
   ApiTestRegistry,
   ApiHolder,
   AlertDisplay,
+  OAuthRequestDialog,
 } from '@backstage/core';
 import * as defaultApiFactories from './apiFactories';
 
@@ -90,6 +91,7 @@ class DevAppBuilder {
       return (
         <AppProvider>
           <AlertDisplay />
+          <OAuthRequestDialog />
           {this.rootChildren}
           <BrowserRouter>
             <SidebarPage>