From a21cfcd062c2f2944197d4a36fbefb90b5971c22 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 22 Aug 2020 11:11:10 +0200
Subject: [PATCH] create-app: update template to use DiscoveryApi

---
 .../default-app/packages/app/src/apis.ts      | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/create-app/templates/default-app/packages/app/src/apis.ts b/packages/create-app/templates/default-app/packages/app/src/apis.ts
index 35f3e076d6..4cc2ebe03a 100644
--- a/packages/create-app/templates/default-app/packages/app/src/apis.ts
+++ b/packages/create-app/templates/default-app/packages/app/src/apis.ts
@@ -6,6 +6,8 @@ import {
   ConfigApi,
   ErrorApiForwarder,
   ErrorAlerter,
+  discoveryApiRef,
+  UrlPatternDiscovery,
   oauthRequestApiRef,
   OAuthRequestManager,
   storageApiRef,
@@ -24,6 +26,10 @@ export const apis = (config: ConfigApi) => {
 
   const builder = ApiRegistry.builder();
 
+  const discoveryApi = builder.add(
+    discoveryApiRef,
+    UrlPatternDiscovery.compile(`${backendUrl}/{{ pluginId }}`),
+  );
   const alertApi = builder.add(alertApiRef, new AlertApiForwarder());
   const errorApi = builder.add(
     errorApiRef,
@@ -33,21 +39,9 @@ export const apis = (config: ConfigApi) => {
   builder.add(storageApiRef, WebStorage.create({ errorApi }));
   builder.add(oauthRequestApiRef, new OAuthRequestManager());
 
-  builder.add(
-    catalogApiRef,
-    new CatalogClient({
-      apiOrigin: backendUrl,
-      basePath: '/catalog',
-    }),
-  );
+  builder.add(catalogApiRef, new CatalogClient({ discoveryApi }));
 
-  builder.add(
-    scaffolderApiRef,
-    new ScaffolderApi({
-      apiOrigin: backendUrl,
-      basePath: '/scaffolder/v1',
-    }),
-  );
+  builder.add(scaffolderApiRef, new ScaffolderApi({ discoveryApi }));
 
   return builder.build();
 };