Only ask the user interactively once

Author: filiptronicek

extensions/gitpod/src/registerAuth.ts

@@ -134,11 +134,10 @@ function updateSyncContext() {
  */
 export async function setSettingsSync(enabled?: boolean): Promise<void> {
 	const config = vscode.workspace.getConfiguration();
-	updateSyncContext();
-	if (enabled) {
+	if (!enabled) {
 		try {
 			await config.update('configurationSync.store', undefined, true);
-			vscode.commands.executeCommand('setContext', 'gitpod.addedSyncProvider', false);
+			updateSyncContext();
 			promptToReload();
 		} catch (e) {
 			vscode.window.showErrorMessage(`Error setting up code sync config: ${e}`);
@@ -150,7 +149,7 @@ export async function setSettingsSync(enabled?: boolean): Promise<void> {
 		const currentConfig = await config.get('configurationSync.store');
 		if (JSON.stringify(currentConfig) !== JSON.stringify(newConfig)) {
 			await config.update('configurationSync.store', newConfig, true);
-			vscode.commands.executeCommand('setContext', 'gitpod.addedSyncProvider', true);
+			updateSyncContext();
 			promptToReload();
 		}
 	} catch (e) {
@@ -263,6 +262,22 @@ function createOauth2URL(options: { authorizationURI: string, clientID: string,
 	return baseURL;
 }
 
+/**
+ * Asks the user to setup Settings Sync
+ * @param context the extension context
+ */
+async function askToEnable(context: vscode.ExtensionContext): Promise<void> {
+	if (!await context.secrets.get('gitpod.syncPopupShown')) {
+		vscode.window.showInformationMessage('Would you like to use Settings Sync with Gitpod?', 'Yes', 'No')
+			.then(async selectedAction => {
+				await context.secrets.store('gitpod.syncPopupShown', 'true');
+				if (selectedAction === 'Yes') {
+					setSettingsSync(true);
+				}
+			});
+	}
+}
+
 /**
  * Adds a authenthication provider to the provided extension context
  * @param context the extension context to act upon and the context to which push the authenthication service
@@ -370,13 +385,5 @@ export function registerAuth(context: vscode.ExtensionContext, logger: (value: s
 	}, { supportsMultipleAccounts: false }));
 	logger('Pushed auth');
 	updateSyncContext();
-	const enabledSettingsSync = vscode.workspace.getConfiguration().get('configurationSync.store');
-	if (enabledSettingsSync === undefined || JSON.stringify(enabledSettingsSync) === '{}') {
-		vscode.window.showInformationMessage('Would you like to use Settings Sync with Gitpod?', 'Yes', 'No')
-			.then(selectedAction => {
-				if (selectedAction === 'Yes') {
-					setSettingsSync(true);
-				}
-			});
-	}
+	askToEnable(context);
 }