From 157440c3f7f1ec4664729f44a9f7bbab5d3e139e Mon Sep 17 00:00:00 2001
From: lourw <56288712+lourw@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:04:04 -0700
Subject: [PATCH] fix(nx-cloud): include nxCloudId when generating connect urls

---
 .../src/utils/nx/nx-cloud.ts                   |  4 ++--
 .../nx/src/nx-cloud/utilities/onboarding.ts    |  9 +++++++--
 packages/nx/src/utils/nx-cloud-utils.ts        | 18 ------------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts b/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
index 9018a3539952d0..70ac32fa64e10b 100644
--- a/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
+++ b/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
@@ -15,9 +15,9 @@ export function readNxCloudToken(directory: string) {
     // nx-ignore-next-line
   )) as typeof import('nx/src/nx-cloud/utilities/get-cloud-options');
 
-  const { accessToken } = getCloudOptions(directory);
+  const { accessToken, nxCloudId } = getCloudOptions(directory);
   nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
-  return accessToken;
+  return accessToken || nxCloudId;
 }
 
 export async function getOnboardingInfo(
diff --git a/packages/nx/src/nx-cloud/utilities/onboarding.ts b/packages/nx/src/nx-cloud/utilities/onboarding.ts
index 19b064fe924c3f..114202a3b91462 100644
--- a/packages/nx/src/nx-cloud/utilities/onboarding.ts
+++ b/packages/nx/src/nx-cloud/utilities/onboarding.ts
@@ -29,6 +29,11 @@ export async function getNxCloudAppOnBoardingUrl(token: string) {
 
 export function readNxCloudToken(tree: Tree) {
   const nxJson = readNxJson(tree);
-  const { accessToken } = getRunnerOptions('default', nxJson, {}, true);
-  return accessToken;
+  const { accessToken, nxCloudId } = getRunnerOptions(
+    'default',
+    nxJson,
+    {},
+    true
+  );
+  return accessToken || nxCloudId;
 }
diff --git a/packages/nx/src/utils/nx-cloud-utils.ts b/packages/nx/src/utils/nx-cloud-utils.ts
index f37c932d766fa3..2c4392baf846ae 100644
--- a/packages/nx/src/utils/nx-cloud-utils.ts
+++ b/packages/nx/src/utils/nx-cloud-utils.ts
@@ -23,21 +23,3 @@ export function getNxCloudUrl(nxJson: NxJsonConfiguration): string {
     throw new Error('nx-cloud runner not found in nx.json');
   return cloudRunner?.options?.url ?? nxJson.nxCloudUrl ?? 'https://nx.app';
 }
-
-export function getNxCloudToken(nxJson: NxJsonConfiguration): string {
-  const cloudRunner = Object.values(nxJson.tasksRunnerOptions ?? {}).find(
-    (r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'
-  );
-
-  if (
-    !cloudRunner &&
-    !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN)
-  )
-    throw new Error('nx-cloud runner not found in nx.json');
-
-  return (
-    process.env.NX_CLOUD_ACCESS_TOKEN ??
-    cloudRunner?.options.accessToken ??
-    nxJson.nxCloudAccessToken
-  );
-}