Skip to content

Commit f307c2b

Browse files
CurryYangxxpavkout
authored andcommitted
fix: git credential migration state storage path (Kong#9549)
1 parent 78016da commit f307c2b

1 file changed

Lines changed: 18 additions & 3 deletions

File tree

packages/insomnia/src/sync/git/migrations.ts

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626

2727
import { database } from '~/common/database';
28+
import type ElectronStorage from '~/main/electron-storage';
2829
import { initElectronStorage } from '~/main/window-utils';
2930
import { type GitRepository, isGitCredentialsOAuth } from '~/models/git-repository';
3031

@@ -33,9 +34,23 @@ import { type GitCredentials, isGitCredentialsV1 } from '../../models/git-creden
3334

3435
const MIGRATION_KEY = 'GIT_CREDENTIALS_MIGRATION';
3536

36-
const migrationStorage = initElectronStorage();
37-
const hasRunMigration = () => migrationStorage.getItem(MIGRATION_KEY);
38-
const markMigrationComplete = () => migrationStorage.setItem(MIGRATION_KEY, 1);
37+
let electronStorage: ElectronStorage | null = null;
38+
39+
const getElectronStorage = () => {
40+
if (!electronStorage) {
41+
electronStorage = initElectronStorage();
42+
}
43+
return electronStorage;
44+
};
45+
46+
const hasRunMigration = () => {
47+
const migrationStorage = getElectronStorage();
48+
return migrationStorage.getItem(MIGRATION_KEY);
49+
};
50+
const markMigrationComplete = () => {
51+
const migrationStorage = getElectronStorage();
52+
migrationStorage.setItem(MIGRATION_KEY, 1);
53+
};
3954

4055
async function migrateGitHubConnectedRepositories(repositories: GitRepository[]) {
4156
const githubCredentials = await database.findOne<GitCredentials>(models.gitCredentials.type, {

0 commit comments

Comments
 (0)