assure SecretServices functions

- inject secretService so it works when used directly
- remove console logs
- only remove a migrated secret (instead of removing it unconditionally)
- in +template, await for good measure, which explains why the parent function is async

In the backend:
- prevent concurrency in method that stores secrets from the frontend
  as it's racy otherwise to type a secret quickly.

app/src/lib/secrets/secretsService.ts

@@ -20,11 +20,9 @@ export class RustSecretService implements SecretsService {
 	constructor(private gitConfigService: GitConfigService) {}
 
 	async get(handle: string) {
-		console.warn('getting ', handle);
 		const secret = await invoke<string>('secret_get_global', { handle });
 		if (secret) return secret;
 
-		console.warn('migrating', handle);
 		if (MIGRATION_HANDLES.includes(handle)) {
 			const key = 'gitbutler.' + handle;
 			const migratedSecret = await this.migrate(key, handle);
@@ -48,7 +46,7 @@ export class RustSecretService implements SecretsService {
 		const secretInConfig = await this.gitConfigService.get(key);
 		if (secretInConfig === undefined) return;
 
-		this.set(handle, secretInConfig);
+		await this.set(handle, secretInConfig);
 		await this.gitConfigService.remove(key);
 
 		console.warn(`Migrated Git config "${key}" to secret store.`);

app/src/routes/+layout.svelte

@@ -17,6 +17,7 @@
 	import { GitHubService } from '$lib/github/service';
 	import ToastController from '$lib/notifications/ToastController.svelte';
 	import { RemotesService } from '$lib/remotes/service';
+	import { setSecretsService } from '$lib/secrets/secretsService';
 	import { SETTINGS, loadUserSettings } from '$lib/settings/userSettings';
 	import { User, UserService } from '$lib/stores/user';
 	import * as events from '$lib/utils/events';
@@ -36,6 +37,7 @@
 	setContext(SETTINGS, userSettings);
 
 	// Setters do not need to be reactive since `data` never updates
+	setSecretsService(data.secretsService);
 	setContext(UserService, data.userService);
 	setContext(ProjectService, data.projectService);
 	setContext(UpdaterService, data.updaterService);

app/src/routes/+layout.ts

@@ -75,6 +75,7 @@ export async function load() {
 		aiService,
 		remotesService,
 		aiPromptService,
-		lineManagerFactory
+		lineManagerFactory,
+		secretsService
 	};
 }

app/src/routes/settings/ai/+page.svelte

@@ -43,7 +43,7 @@
 
 	async function setSecret(handle: AISecretHandle, secret: string | undefined) {
 		if (!initialized) return;
-		secretsService.set(handle, secret || '');
+		await secretsService.set(handle, secret || '');
 	}
 
 	$: setConfiguration(GitAIConfigKey.ModelProvider, modelKind);

crates/gitbutler-tauri/src/secret.rs

@@ -1,6 +1,7 @@
 use crate::error::Error;
 use gitbutler_core::secret;
 use gitbutler_core::types::Sensitive;
+use std::sync::Mutex;
 use tracing::instrument;
 
 #[tauri::command(async)]
@@ -12,6 +13,8 @@ pub async fn secret_get_global(handle: &str) -> Result<Option<String>, Error> {
 #[tauri::command(async)]
 #[instrument(skip(secret), err(Debug), fields(secret = "<redacted>"))]
 pub async fn secret_set_global(handle: &str, secret: String) -> Result<(), Error> {
+    static FAIR_QUEUE: Mutex<()> = Mutex::new(());
+    let _one_at_a_time_to_prevent_races = FAIR_QUEUE.lock().unwrap();
     Ok(secret::persist(
         handle,
         &Sensitive(secret),