Improves account simulator (#3629)

Author: eamodio

package.json

@@ -5662,13 +5662,8 @@
 				"category": "GitLens"
 			},
 			{
-				"command": "gitlens.plus.simulateSubscriptionState",
-				"title": "Simulate Subscription State (Debugging)",
-				"category": "GitLens"
-			},
-			{
-				"command": "gitlens.plus.restoreSubscriptionState",
-				"title": "Restore Subscription State (Debugging)",
+				"command": "gitlens.plus.simulateSubscription",
+				"title": "Simulate Subscription (Debugging)",
 				"category": "GitLens"
 			},
 			{
@@ -9803,11 +9798,7 @@
 					"when": "gitlens:enabled"
 				},
 				{
-					"command": "gitlens.plus.simulateSubscriptionState",
-					"when": "gitlens:enabled && gitlens:debugging"
-				},
-				{
-					"command": "gitlens.plus.restoreSubscriptionState",
+					"command": "gitlens.plus.simulateSubscription",
 					"when": "gitlens:enabled && gitlens:debugging"
 				},
 				{

src/commands/resets.ts

@@ -13,7 +13,6 @@ const resetTypes = [
 	'ai',
 	'avatars',
 	'integrations',
-	'plus',
 	'repositoryAccess',
 	'suppressedWarnings',
 	'usageTracking',
@@ -74,27 +73,13 @@ export class ResetCommand extends Command {
 			},
 		];
 
-		if (this.container.debugging) {
-			items.splice(
-				0,
-				0,
-				{
-					label: 'Subscription Reset',
-					detail: 'Resets the stored subscription',
-					item: 'plus',
-				},
-				createQuickPickSeparator(),
-			);
-		}
-
 		// create a quick pick with options to clear all the different resets that GitLens supports
 		const pick = await window.showQuickPick<ResetQuickPickItem>(items, {
 			title: 'Reset Stored Data',
 			placeHolder: 'Choose which data to reset, will be prompted to confirm',
 		});
 
 		if (pick?.item == null) return;
-		if (pick.item === 'plus' && !this.container.debugging) return;
 
 		const confirm: MessageItem = { title: 'Reset' };
 		const cancel: MessageItem = { title: 'Cancel', isCloseAffordance: true };
@@ -170,10 +155,6 @@ export class ResetCommand extends Command {
 				await this.container.integrations.reset();
 				break;
 
-			case 'plus':
-				await this.container.subscription.logout(true, undefined);
-				break;
-
 			case 'repositoryAccess':
 				await this.container.git.clearAllRepoVisibilityCaches();
 				break;

src/constants.commands.ts

@@ -151,8 +151,7 @@ export const enum Commands {
 	PlusStartPreviewTrial = 'gitlens.plus.startPreviewTrial',
 	PlusUpgrade = 'gitlens.plus.upgrade',
 	PlusValidate = 'gitlens.plus.validate',
-	PlusSimulateSubscriptionState = 'gitlens.plus.simulateSubscriptionState',
-	PlusRestoreSubscriptionState = 'gitlens.plus.restoreSubscriptionState',
+	PlusSimulateSubscription = 'gitlens.plus.simulateSubscription',
 	QuickOpenFileHistory = 'gitlens.quickOpenFileHistory',
 	RefreshLaunchpad = 'gitlens.launchpad.refresh',
 	RefreshGraph = 'gitlens.graph.refresh',