Normalizes gk settings to lowercase

Author: eamodio

package.json

@@ -3990,7 +3990,7 @@
 						"scope": "window",
 						"order": 20
 					},
-					"gitlens.gitKraken.cli.integration.enabled": {
+					"gitlens.gitkraken.cli.integration.enabled": {
 						"type": "boolean",
 						"default": false,
 						"markdownDescription": "Specifies whether to enable experimental integration with the GitKraken CLI",
@@ -4903,7 +4903,7 @@
 				"title": "GitKraken",
 				"order": 9000,
 				"properties": {
-					"gitlens.gitKraken.activeOrganizationId": {
+					"gitlens.gitkraken.activeOrganizationId": {
 						"type": "string",
 						"markdownDescription": "Specifies the ID of the user's active GitKraken organization in GitLens",
 						"scope": "window",

src/config.ts

@@ -25,7 +25,7 @@ export interface Config {
 	readonly detectNestedRepositories: boolean;
 	readonly fileAnnotations: FileAnnotationsConfig;
 	readonly gitCommands: GitCommandsConfig;
-	readonly gitKraken: GitKrakenConfig;
+	readonly gitkraken: GitKrakenConfig;
 	readonly graph: GraphConfig;
 	readonly heatmap: HeatmapConfig;
 	readonly home: HomeConfig;

src/env/node/gk/cli/integration.ts

@@ -29,8 +29,8 @@ export class GkCliIntegrationProvider implements Disposable {
 	}
 
 	private onConfigurationChanged(e?: ConfigurationChangeEvent): void {
-		if (e == null || configuration.changed(e, 'gitKraken.cli.integration.enabled')) {
-			if (!configuration.get('gitKraken.cli.integration.enabled')) {
+		if (e == null || configuration.changed(e, 'gitkraken.cli.integration.enabled')) {
+			if (!configuration.get('gitkraken.cli.integration.enabled')) {
 				this.stop();
 			} else {
 				void this.start();

src/plus/gk/__debug__accountDebug.ts

@@ -10,9 +10,9 @@ import type { Container } from '../../container';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { createQuickPickSeparator } from '../../quickpicks/items/common';
 import { registerCommand } from '../../system/-webview/command';
-import { configuration } from '../../system/-webview/configuration';
 import type { GKCheckInResponse, GKLicenses, GKLicenseType, GKUser } from './models/checkin';
 import type { SubscriptionService } from './subscriptionService';
+import { getConfiguredActiveOrganizationId } from './utils/-webview/subscription.utils';
 import { getSubscriptionFromCheckIn } from './utils/checkin.utils';
 import { getPreviewSubscription } from './utils/subscription.utils';
 
@@ -308,7 +308,7 @@ class AccountDebug {
 			(await this.container.organizations.getOrganizations({
 				userId: subscription.account.id,
 			})) ?? [];
-		let activeOrganizationId = configuration.get('gitKraken.activeOrganizationId') ?? undefined;
+		let activeOrganizationId = getConfiguredActiveOrganizationId();
 		if (activeOrganizationId === '' || (activeOrganizationId == null && organizations.length === 1)) {
 			activeOrganizationId = organizations[0].id;
 		}

src/plus/gk/subscriptionService.ts

@@ -74,6 +74,7 @@ import type { Promo } from './models/promo';
 import type { Subscription } from './models/subscription';
 import type { ServerConnection } from './serverConnection';
 import { ensurePlusFeaturesEnabled } from './utils/-webview/plus.utils';
+import { getConfiguredActiveOrganizationId, updateActiveOrganizationId } from './utils/-webview/subscription.utils';
 import { getSubscriptionFromCheckIn } from './utils/checkin.utils';
 import {
 	assertSubscriptionState,
@@ -1174,12 +1175,12 @@ export class SubscriptionService implements Disposable {
 			Logger.error(ex, scope);
 			organizations = [];
 		}
-		let chosenOrganizationId: string | undefined = configuration.get('gitKraken.activeOrganizationId') ?? undefined;
+		let chosenOrganizationId = getConfiguredActiveOrganizationId();
 		if (chosenOrganizationId === '') {
 			chosenOrganizationId = undefined;
 		} else if (chosenOrganizationId != null && !organizations.some(o => o.id === chosenOrganizationId)) {
 			chosenOrganizationId = undefined;
-			void configuration.updateEffective('gitKraken.activeOrganizationId', undefined);
+			void updateActiveOrganizationId(undefined);
 		}
 		const subscription = getSubscriptionFromCheckIn(data, organizations, chosenOrganizationId);
 		this._lastValidatedDate = new Date();
@@ -1668,8 +1669,8 @@ export class SubscriptionService implements Disposable {
 
 		const organizationSubscription = getSubscriptionFromCheckIn(checkInData, organizations, pick.org.id);
 
-		if (configuration.get('gitKraken.activeOrganizationId') !== pick.org.id) {
-			await configuration.updateEffective('gitKraken.activeOrganizationId', pick.org.id);
+		if (getConfiguredActiveOrganizationId() !== pick.org.id) {
+			await updateActiveOrganizationId(pick.org.id);
 		}
 
 		this.changeSubscription(

src/plus/gk/utils/-webview/subscription.utils.ts

@@ -0,0 +1,14 @@
+import { configuration } from '../../../../system/-webview/configuration';
+
+export function getConfiguredActiveOrganizationId(): string | undefined {
+	return (
+		configuration.get('gitkraken.activeOrganizationId') ??
+		// Deprecated: Use `gitlens.gitkraken.activeOrganizationId` instead
+		configuration.getAny('gitlens.gitKraken.activeOrganizationId') ??
+		undefined
+	);
+}
+
+export async function updateActiveOrganizationId(orgId: string | undefined): Promise<void> {
+	await configuration.updateEffective('gitkraken.activeOrganizationId', orgId);
+}