From ae50be9a9c345968158d8d34825144fc5f68e58a Mon Sep 17 00:00:00 2001
From: Ramin Tadayon <ramin.tadayon@gitkraken.com>
Date: Tue, 28 Nov 2023 10:36:26 -0700
Subject: [PATCH] Removes organization ids from checkin/subscription

---
 src/plus/gk/account/subscription.ts  |  1 -
 src/plus/gk/checkin.ts               |  2 --
 src/plus/workspaces/workspacesApi.ts | 22 ++++------------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/plus/gk/account/subscription.ts b/src/plus/gk/account/subscription.ts
index 06aa94a..73317ba 100644
--- a/src/plus/gk/account/subscription.ts
+++ b/src/plus/gk/account/subscription.ts
@@ -43,7 +43,6 @@ export interface SubscriptionAccount {
 	readonly email: string | undefined;
 	readonly verified: boolean;
 	readonly createdOn: string;
-	readonly organizationIds: string[];
 }
 
 export interface SubscriptionPreviewTrial {
diff --git a/src/plus/gk/checkin.ts b/src/plus/gk/checkin.ts
index 73d2814..4b10fa8 100644
--- a/src/plus/gk/checkin.ts
+++ b/src/plus/gk/checkin.ts
@@ -7,7 +7,6 @@ export interface GKCheckInResponse {
 		readonly paidLicenses: Record<GKLicenseType, GKLicense>;
 		readonly effectiveLicenses: Record<GKLicenseType, GKLicense>;
 	};
-	readonly orgIds?: string[];
 }
 
 export interface GKUser {
@@ -51,7 +50,6 @@ export function getSubscriptionFromCheckIn(data: GKCheckInResponse): Partial<Sub
 		email: data.user.email,
 		verified: data.user.status === 'activated',
 		createdOn: data.user.createdDate,
-		organizationIds: data.orgIds ?? [],
 	};
 
 	const effectiveLicenses = Object.entries(data.licenses.effectiveLicenses) as [GKLicenseType, GKLicense][];
diff --git a/src/plus/workspaces/workspacesApi.ts b/src/plus/workspaces/workspacesApi.ts
index e76df74..adf31f8 100644
--- a/src/plus/workspaces/workspacesApi.ts
+++ b/src/plus/workspaces/workspacesApi.ts
@@ -164,25 +164,11 @@ export class WorkspacesApi {
 		}
 		queryParams += ')';
 
-		let query = 'query getWorkpaces {';
-		query += `memberProjects: projects ${queryParams} { ${queryData} }`;
-
-		// TODO@axosoft-ramint This is a temporary and hacky workaround until projects api returns all projects the
-		// user belongs to in one query. Update once that is available.
-		if (options?.cursor == null && options?.includeOrganizations) {
-			const organizationIds =
-				(await this.container.subscription.getSubscription())?.account?.organizationIds ?? [];
-			for (const organizationId of organizationIds) {
-				let orgQueryParams = `(first: ${options?.count ?? defaultWorkspaceCount}`;
-				if (options?.page) {
-					orgQueryParams += `, page: ${options.page}`;
-				}
-				orgQueryParams += `, organization_id: "${organizationId}")`;
-				query += `organizationProjects_${organizationId}: projects ${orgQueryParams} { ${queryData} }`;
+		const query = `
+			query getWorkpaces {
+				memberProjects: projects ${queryParams} { ${queryData} }
 			}
-		}
-
-		query += '}';
+		`;
 
 		const rsp = await this.fetch({ query: query });