From 1eb840ece8b4d9c0f72ad52a8fab4219a3f93bec Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 3 Feb 2025 17:05:10 +0100
Subject: [PATCH] chore(scaffolder): use host in GitHub autocompletion

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../GitHubRepoBranchPicker.test.tsx                |  1 +
 .../RepoBranchPicker/GitHubRepoBranchPicker.tsx    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.test.tsx
index afdfaf4d6e..6467c4c81c 100644
--- a/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.test.tsx
@@ -78,6 +78,7 @@ describe('GitHubRepoBranchPicker', () => {
         <GitHubRepoBranchPicker
           onChange={onChange}
           state={{
+            host: 'github.com',
             branch: 'main',
             owner: 'foo',
             repository: 'bar',
diff --git a/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.tsx b/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.tsx
index aaf448ae6c..f53249b5a7 100644
--- a/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoBranchPicker/GitHubRepoBranchPicker.tsx
@@ -40,14 +40,20 @@ export const GitHubRepoBranchPicker = ({
 }: BaseRepoBranchPickerProps<{
   accessToken?: string;
 }>) => {
-  const { owner, repository, branch } = state;
+  const { host, owner, repository, branch } = state;
 
   const [availableBranches, setAvailableBranches] = useState<string[]>([]);
 
   const scaffolderApi = useApi(scaffolderApiRef);
 
   const updateAvailableBranches = useCallback(() => {
-    if (!scaffolderApi.autocomplete || !owner || !repository || !accessToken) {
+    if (
+      !scaffolderApi.autocomplete ||
+      !owner ||
+      !repository ||
+      !accessToken ||
+      !host
+    ) {
       setAvailableBranches([]);
       return;
     }
@@ -56,7 +62,7 @@ export const GitHubRepoBranchPicker = ({
       .autocomplete({
         token: accessToken,
         resource: 'branches',
-        context: { owner, repository },
+        context: { host, owner, repository },
         provider: 'github',
       })
       .then(({ results }) => {
@@ -65,7 +71,7 @@ export const GitHubRepoBranchPicker = ({
       .catch(() => {
         setAvailableBranches([]);
       });
-  }, [owner, repository, accessToken, scaffolderApi]);
+  }, [host, owner, repository, accessToken, scaffolderApi]);
 
   useDebounce(updateAvailableBranches, 500, [updateAvailableBranches]);