From 649e821917e87b546842bb3516dd317c1bfa2865 Mon Sep 17 00:00:00 2001
From: tamarafinogina <tamara@internxt.com>
Date: Thu, 20 Aug 2026 10:10:07 +0200
Subject: [PATCH] remove user migration

---
 src/app/core/types.ts                         |  1 -
 .../encrypted-storage.service.test.ts         | 23 -------------------
 src/services/encrypted-storage.service.ts     | 15 ------------
 3 files changed, 39 deletions(-)

diff --git a/src/app/core/types.ts b/src/app/core/types.ts
index 94d23c312..f0521137e 100644
--- a/src/app/core/types.ts
+++ b/src/app/core/types.ts
@@ -158,7 +158,6 @@ export enum LocalStorageItem {
 }
 
 export enum LocalStorageProtectedItem {
-  User = 'xUser',
   EncryptedUser = 'xEncryptedUser',
   EncryptedToken = 'xTokenEncrypted',
   EncryptedB2BworkspaceMnemonic = 'xEncryptedB2BWorkspaceMnemonic',
diff --git a/src/services/encrypted-storage.service.test.ts b/src/services/encrypted-storage.service.test.ts
index 52b5bc716..10cc6c9fa 100644
--- a/src/services/encrypted-storage.service.test.ts
+++ b/src/services/encrypted-storage.service.test.ts
@@ -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');
 
@@ -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', () => {
diff --git a/src/services/encrypted-storage.service.ts b/src/services/encrypted-storage.service.ts
index 5caeafba5..fab644c27 100644
--- a/src/services/encrypted-storage.service.ts
+++ b/src/services/encrypted-storage.service.ts
@@ -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;
 };