Skip to content

[PB-6733] remove user migration #2120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TamaraFinogina wants to merge 2 commits into
base: master
Choose a base branch
from
+0 −39
Open

[PB-6733] remove user migration #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
649e821
remove user migration
TamaraFinogina Aug 20, 2026
4dc4dab
Merge branch 'master' into remove_user_migration
TamaraFinogina Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/core/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export enum LocalStorageItem {
}

export enum LocalStorageProtectedItem {
User = 'xUser',
EncryptedUser = 'xEncryptedUser',
EncryptedToken = 'xTokenEncrypted',
EncryptedB2BworkspaceMnemonic = 'xEncryptedB2BWorkspaceMnemonic',
Expand Down
23 changes: 0 additions & 23 deletions src/services/encrypted-storage.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,20 +265,6 @@ describe('Testing the encrypted storage service', () => {
expect(userFromLocalStorage).toStrictEqual(mockUserSettings);
});

test('When encrypted user is missing but unencrypted legacy user exists, then it migrates and returns it', async () => {
const key = LocalStorageProtectedItem.User;
localStorage.setItem(key, JSON.stringify(mockUserSettings));

const getFromLocalStorageSpy = vi.spyOn(Storage.prototype, 'getItem');

const userFromLocalStorage = await encryptedStorageService.getUser();

expect(getFromLocalStorageSpy).toHaveBeenCalledWith(key);
expect(userFromLocalStorage).toStrictEqual(mockUserSettings);
expect(localStorage.getItem(LocalStorageProtectedItem.User)).toBeNull();
expect(localStorage.getItem(LocalStorageProtectedItem.EncryptedUser)).not.toBeNull();
});

test('When the user data does not exist in encrypted storage, then nothing (null) is returned', async () => {
const getFromLocalStorageSpy = vi.spyOn(Storage.prototype, 'getItem');

Expand All @@ -288,15 +274,6 @@ describe('Testing the encrypted storage service', () => {
expect(getFromLocalStorageSpy).toHaveBeenCalledWith(LocalStorageProtectedItem.EncryptedUser);
expect(userFromLocalStorage).toBeNull();
});

test('When legacy unencrypted user is invalid JSON, then getUser returns null', async () => {
encryptedStorageService.clear();
localStorage.setItem(LocalStorageProtectedItem.User, 'not-valid-json');

const userFromLocalStorage = await encryptedStorageService.getUser();

expect(userFromLocalStorage).toBeNull();
});
});

describe('Folder and file storage tokens', () => {
Expand Down
15 changes: 0 additions & 15 deletions src/services/encrypted-storage.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,6 @@ const getUser = async (): Promise<UserSettings | null> => {
userCache = null;
}

//migration from unencrypted version, remove once completed
if (!userCache) {
try {
const unencryptedUser = localStorage.getItem(LocalStorageProtectedItem.User);
if (unencryptedUser) {
const parsedUser = JSON.parse(unencryptedUser) as UserSettings;
const user = { ...parsedUser, createdAt: new Date(parsedUser.createdAt) };
await setUser(user);
localStorage.removeItem(LocalStorageProtectedItem.User);
}
} catch {
userCache = null;
}
}

return userCache;
};

Expand Down
Loading