Updates gkdev links for logged-in cases

Author: axosoft-ramint

src/container.ts

@@ -938,14 +938,6 @@ export class Container {
 		return uri;
 	}
 
-	getGkDevExchangeUri(token: string, successPath: string, failurePath?: string): Uri {
-		return Uri.joinPath(this.baseGkDevUri, `api/exchange/${token}`).with({
-			query: `success=${encodeURIComponent(successPath)}${
-				failurePath ? `&failure=${encodeURIComponent(failurePath)}` : ''
-			}`,
-		});
-	}
-
 	generateWebGkDevUrl(path?: string): string {
 		return this.getGkDevUri(path, '?source=gitlens').toString();
 	}

src/plus/gk/account/subscriptionService.ts

@@ -502,10 +502,10 @@ export class SubscriptionService implements Disposable {
 
 		try {
 			const exchangeToken = await this.container.accountAuthentication.getExchangeToken();
-			void env.openExternal(this.container.getGkDevExchangeUri(exchangeToken, 'account'));
+			await openUrl(this.container.getGkDevUri('account', `token=${exchangeToken}`).toString(true));
 		} catch (ex) {
 			Logger.error(ex, scope);
-			void env.openExternal(this.container.getGkDevUri('account'));
+			await openUrl(this.container.getGkDevUri('account').toString(true));
 		}
 	}
 
@@ -762,15 +762,6 @@ export class SubscriptionService implements Disposable {
 
 		const hasAccount = this._subscription.account != null;
 
-		const successUri = await env.asExternalUri(
-			Uri.parse(
-				`${env.uriScheme}://${this.container.context.extension.id}/${
-					hasAccount ? SubscriptionUpdatedUriPathPrefix : LoginUriPathPrefix
-				}`,
-			),
-		);
-		query.set('success_uri', successUri.toString(true));
-
 		const promoCode = getApplicablePromo(this._subscription.state)?.code;
 		if (promoCode != null) {
 			query.set('promoCode', promoCode);
@@ -791,11 +782,15 @@ export class SubscriptionService implements Disposable {
 				const token = await this.container.accountAuthentication.getExchangeToken(
 					SubscriptionUpdatedUriPathPrefix,
 				);
-				const purchasePath = `purchase/checkout?${query.toString()}`;
-				if (!(await openUrl(this.container.getGkDevExchangeUri(token, purchasePath).toString(true)))) return;
-			} else if (
-				!(await openUrl(this.container.getGkDevUri('purchase/checkout', query.toString()).toString(true)))
-			) {
+				query.set('token', token);
+			} else {
+				const successUri = await env.asExternalUri(
+					Uri.parse(`${env.uriScheme}://${this.container.context.extension.id}/${LoginUriPathPrefix}`),
+				);
+				query.set('success_uri', successUri.toString(true));
+			}
+
+			if (!(await openUrl(this.container.getGkDevUri('purchase/checkout', query.toString()).toString(true)))) {
 				return;
 			}
 		} catch (ex) {

src/plus/integrations/integrationService.ts

@@ -151,14 +151,22 @@ export class IntegrationService implements Disposable {
 
 		try {
 			const exchangeToken = await this.container.accountAuthentication.getExchangeToken();
-			await openUrl(
-				this.container
-					.getGkDevExchangeUri(exchangeToken, `settings/integrations?source=gitlens`)
-					.toString(true),
-			);
+			if (
+				!(await openUrl(
+					this.container
+						.getGkDevUri('settings/integrations', `source=gitlens&token=${exchangeToken}`)
+						.toString(true),
+				))
+			) {
+				return;
+			}
 		} catch (ex) {
 			Logger.error(ex, scope);
-			await env.openExternal(this.container.getGkDevUri('settings/integrations', 'source=gitlens'));
+			if (
+				!(await openUrl(this.container.getGkDevUri('settings/integrations', 'source=gitlens').toString(true)))
+			) {
+				return;
+			}
 		}
 		take(
 			window.onDidChangeWindowState,
@@ -238,31 +246,31 @@ export class IntegrationService implements Disposable {
 			}
 		}
 
-		const callbackUri = await env.asExternalUri(
-			Uri.parse(
-				`${env.uriScheme}://${this.container.context.extension.id}/${CloudIntegrationAuthenticationUriPathPrefix}`,
-			),
-		);
-		query += `&redirect_uri=${encodeURIComponent(callbackUri.toString(true))}`;
-
-		if (account != null) {
-			try {
-				const exchangeToken = await this.container.accountAuthentication.getExchangeToken();
-				if (
-					!(await openUrl(
-						this.container.getGkDevExchangeUri(exchangeToken, `connect?${query}`).toString(true),
-					))
-				) {
-					return false;
-				}
-			} catch (ex) {
-				Logger.error(ex, scope);
-				if (!(await openUrl(this.container.getGkDevUri('connect', query).toString(true)))) {
-					return false;
-				}
+		const baseQuery = query;
+		try {
+			if (account != null) {
+				const token = await this.container.accountAuthentication.getExchangeToken(
+					CloudIntegrationAuthenticationUriPathPrefix,
+				);
+
+				query += `&token=${token}`;
+			} else {
+				const callbackUri = await env.asExternalUri(
+					Uri.parse(
+						`${env.uriScheme}://${this.container.context.extension.id}/${CloudIntegrationAuthenticationUriPathPrefix}`,
+					),
+				);
+				query += `&redirect_uri=${encodeURIComponent(callbackUri.toString(true))}`;
+			}
+
+			if (!(await openUrl(this.container.getGkDevUri('connect', query).toString(true)))) {
+				return false;
+			}
+		} catch (ex) {
+			Logger.error(ex, scope);
+			if (!(await openUrl(this.container.getGkDevUri('connect', baseQuery).toString(true)))) {
+				return false;
 			}
-		} else if (!(await openUrl(this.container.getGkDevUri('connect', query).toString(true)))) {
-			return false;
 		}
 
 		const deferredCallback = promisifyDeferred<Uri, string | undefined>(