bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2026-02-26 01:13:14 +00:00
Code Issues Releases Wiki Activity

cleanup migration key for account, clean up

Browse Source
This commit is contained in:
Brandon
2026-02-25 15:41:15 -05:00
parent b1a3859516
commit 4eb74cdeb4
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/tabs/settings.component.ts
View File

@@ -55,7 +55,9 @@ export class SettingsComponent implements OnInit, OnDestroy {
this.directory = await this.stateService.getDirectoryType();
this.ldap =
(await this.stateService.getDirectory<LdapConfiguration>(DirectoryType.Ldap)) || this.ldap;
this.gsuite = await this.stateService.getDirectory<GSuiteConfiguration>(DirectoryType.GSuite);
this.gsuite =
(await this.stateService.getDirectory<GSuiteConfiguration>(DirectoryType.GSuite)) ||
this.gsuite;
this.entra =
(await this.stateService.getDirectory<EntraIdConfiguration>(DirectoryType.EntraID)) ||
this.entra;

24
src/services/state-service/stateMigration.service.ts
View File

@@ -216,16 +216,8 @@ export class StateMigrationService {
* the account and saved into flat keys for simpler access.
*/
protected async migrateStateFrom4To5(useSecureStorageForSecrets = true): Promise<void> {
// Get the client_id (entity ID) which represents the authenticated user from login.
let userId = await this.get<string>(ClientKeys.clientId);
if (!userId) {
// No accounts to migrate, just update version
await this.set(StorageKeysVNext.stateVersion, StateVersion.Five);
return;
}
const account = await this.get<any>(userId);
const clientId = await this.storageService.get<string>("activeUserId");
const account = await this.get<any>(clientId);
if (!account) {
// No account data found, just update version
@@ -295,12 +287,12 @@ export class StateMigrationService {
// Migrate secrets from {userId}_* to secret_* pattern
if (useSecureStorageForSecrets) {
const oldSecretKeys = [
{ old: `${userId}_${SecureStorageKeys.ldap}`, new: SecureStorageKeysVNext.ldap },
{ old: `${userId}_${SecureStorageKeys.gsuite}`, new: SecureStorageKeysVNext.gsuite },
{ old: `${userId}_${SecureStorageKeys.azure}`, new: SecureStorageKeysVNext.azure },
{ old: `${userId}_${SecureStorageKeys.entra}`, new: SecureStorageKeysVNext.entra },
{ old: `${userId}_${SecureStorageKeys.okta}`, new: SecureStorageKeysVNext.okta },
{ old: `${userId}_${SecureStorageKeys.oneLogin}`, new: SecureStorageKeysVNext.oneLogin },
{ old: `${clientId}_${SecureStorageKeys.ldap}`, new: SecureStorageKeysVNext.ldap },
{ old: `${clientId}_${SecureStorageKeys.gsuite}`, new: SecureStorageKeysVNext.gsuite },
{ old: `${clientId}_${SecureStorageKeys.azure}`, new: SecureStorageKeysVNext.azure },
{ old: `${clientId}_${SecureStorageKeys.entra}`, new: SecureStorageKeysVNext.entra },
{ old: `${clientId}_${SecureStorageKeys.okta}`, new: SecureStorageKeysVNext.okta },
{ old: `${clientId}_${SecureStorageKeys.oneLogin}`, new: SecureStorageKeysVNext.oneLogin },
];
for (const { old: oldKey, new: newKey } of oldSecretKeys) {