kie-issues#363: It's not possible to clone a branch different than th…

…e default on KIE Sandbox when the user is using a GitHub token (#1791)
apache · Jun 21, 2023 · 0f2325b · 0f2325b
1 parent 723e19b
commit 0f2325b
Showing 1 changed file with 21 additions and 27 deletions.
diff --git a/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx b/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx
@@ -20,16 +20,16 @@ import { Spinner } from "@patternfly/react-core/dist/js/components/Spinner";
 import { Text, TextContent, TextVariants } from "@patternfly/react-core/dist/js/components/Text";
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 import { basename } from "path";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useHistory } from "react-router";
 import { EditorPageErrorPage } from "../editor/EditorPageErrorPage";
 import { useRoutes } from "../navigation/Hooks";
 import { QueryParams } from "../navigation/Routes";
 import { OnlineEditorPage } from "../pageTemplate/OnlineEditorPage";
 import { useQueryParam, useQueryParams } from "../queryParams/QueryParamsContext";
+import { useSettingsDispatch } from "../settings/SettingsContext";
 import {
   ImportableUrl,
-  isCertainlyGit,
   isPotentiallyGit,
   isSingleFile,
   UrlType,
@@ -42,7 +42,7 @@ import { fetchSingleFileContent } from "./fetchSingleFileContent";
 import { useGitHubClient } from "../github/Hooks";
 import { AccountsDispatchActionKind, useAccountsDispatch } from "../accounts/AccountsContext";
 import { useAuthSession, useAuthSessions } from "../authSessions/AuthSessionsContext";
-import { useAuthProviders } from "../authProviders/AuthProvidersContext";
+import { useAuthProvider, useAuthProviders } from "../authProviders/AuthProvidersContext";
 import { getCompatibleAuthSessionWithUrlDomain } from "../authSessions/CompatibleAuthSessions";
 import { useWorkspaces } from "@kie-tools-core/workspaces-git-fs/dist/context/WorkspacesContext";
 import { LocalFile } from "@kie-tools-core/workspaces-git-fs/dist/worker/api/LocalFile";
@@ -59,7 +59,9 @@ export function NewWorkspaceFromUrlPage() {
   const accountsDispatch = useAccountsDispatch();
 
   const [importingError, setImportingError] = useState("");
+
   const queryParams = useQueryParams();
+
   const queryParamUrl = useQueryParam(QueryParams.URL);
   const queryParamBranch = useQueryParam(QueryParams.BRANCH);
   const queryParamAuthSessionId = useQueryParam(QueryParams.AUTH_SESSION_ID);
@@ -140,40 +142,35 @@ export function NewWorkspaceFromUrlPage() {
 
   // Startup the page. Only import if those are set.
   useEffect(() => {
-    const urlDomain = importableUrl.url?.hostname;
+    if (!selectedGitRefName || !queryParamUrl) {
+      return;
+    }
+
     const { compatible } = getCompatibleAuthSessionWithUrlDomain({
       authProviders,
       authSessions,
       authSessionStatus,
-      urlDomain,
+      urlDomain: new URL(queryParamUrl).hostname,
     });
-    setAuthSessionId(compatible[0].id);
 
-    if (compatible[0].id === AUTH_SESSION_NONE.id && !selectedGitRefName) {
-      history.replace({
-        pathname: routes.import.path({}),
-        search: queryParams.with(QueryParams.CONFIRM, "true").toString(),
-      });
-    } else {
-      history.replace({
-        pathname: routes.import.path({}),
-        search: queryParams
-          .without(QueryParams.CONFIRM)
-          .with(QueryParams.BRANCH, selectedGitRefName)
-          .with(QueryParams.AUTH_SESSION_ID, compatible[0].id)
-          .toString(),
-      });
-    }
+    history.replace({
+      pathname: routes.import.path({}),
+      search: queryParams
+        .with(QueryParams.BRANCH, selectedGitRefName)
+        .with(QueryParams.AUTH_SESSION_ID, authSession?.id ?? compatible[0].id)
+        .toString(),
+    });
   }, [
     authProviders,
+    authSession?.id,
     authSessionStatus,
     authSessions,
     history,
-    importableUrl.url?.hostname,
+    queryParamUrl,
     queryParams,
     routes.import,
     selectedGitRefName,
-    setAuthSessionId,
+    setGitRefName,
   ]);
 
   const cloneGitRepository: typeof workspaces.createWorkspaceFromGitRepository = useCallback(
@@ -254,10 +251,6 @@ export function NewWorkspaceFromUrlPage() {
         return;
       }
 
-      if (!queryParamBranch && isCertainlyGit(importableUrl.type) && queryParamAuthSessionId !== AUTH_SESSION_NONE.id) {
-        return;
-      }
-
       if (clonableUrl.type === UrlType.INVALID || clonableUrl.type === UrlType.NOT_SUPPORTED) {
         setImportingError(clonableUrl.error);
         return;
@@ -394,6 +387,7 @@ export function NewWorkspaceFromUrlPage() {
       advancedImportModalRef.current?.open();
       return;
     }
+
     setImportingError("");
     doImport();
   }, [