From 7bbbfa1e6a958d6a083bf1d5021e4a2cb2ec88ea Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Fri, 28 Aug 2020 10:31:28 +0200
Subject: [PATCH] fix: discovery api leftovers

---
 packages/app/src/apis.ts                         |  3 +--
 .../auth/microsoft/MicrosoftAuth.ts              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index c23f09a5be..eedd07ed08 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -135,8 +135,7 @@ export const apis = (config: ConfigApi) => {
   builder.add(
     microsoftAuthApiRef,
     MicrosoftAuth.create({
-      backendUrl,
-      basePath: '/auth/',
+      discoveryApi,
       oauthRequestApi,
     }),
   );
diff --git a/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts b/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
index d4a70995e3..5800308c26 100644
--- a/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
+++ b/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
@@ -30,15 +30,17 @@ import {
   BackstageIdentity,
 } from '../../../definitions/auth';
 
-import { OAuthRequestApi, AuthProvider } from '../../../definitions';
+import {
+  OAuthRequestApi,
+  AuthProvider,
+  DiscoveryApi,
+} from '../../../definitions';
 import { SessionManager } from '../../../../lib/AuthSessionManager/types';
 import { RefreshingAuthSessionManager } from '../../../../lib/AuthSessionManager';
 import { Observable } from '../../../../types';
 
 type CreateOptions = {
-  backendUrl: string;
-  basePath: string;
-
+  discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
   environment?: string;
@@ -70,15 +72,13 @@ class MicrosoftAuth
     BackstageIdentityApi,
     SessionStateApi {
   static create({
-    backendUrl,
-    basePath,
     environment = 'development',
     provider = DEFAULT_PROVIDER,
     oauthRequestApi,
+    discoveryApi,
   }: CreateOptions) {
     const connector = new DefaultAuthConnector({
-      backendUrl,
-      basePath,
+      discoveryApi,
       environment,
       provider,
       oauthRequestApi: oauthRequestApi,