From 6a857e8286e01a4f23d3efa6eedb056a404c8074 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 9 Jan 2026 18:14:25 +0100 Subject: [PATCH] Disable prompt --- .../encrypted-migrations-scheduler.service.ts | 50 +++++++++---------- .../migrations/minimum-kdf-migration.ts | 20 ++++---- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libs/angular/src/key-management/encrypted-migration/encrypted-migrations-scheduler.service.ts b/libs/angular/src/key-management/encrypted-migration/encrypted-migrations-scheduler.service.ts index dd248a582d3..f6b683312a8 100644 --- a/libs/angular/src/key-management/encrypted-migration/encrypted-migrations-scheduler.service.ts +++ b/libs/angular/src/key-management/encrypted-migration/encrypted-migrations-scheduler.service.ts @@ -67,33 +67,33 @@ export class DefaultEncryptedMigrationsSchedulerService implements EncryptedMigr ); // For all accounts, if the auth status changes to unlocked or a sync happens, prompt for migration - this.accountService.accounts$ - .pipe( - switchMap((accounts) => { - const userIds = Object.keys(accounts) as UserId[]; + // this.accountService.accounts$ + // .pipe( + // switchMap((accounts) => { + // const userIds = Object.keys(accounts) as UserId[]; - if (userIds.length === 0) { - return of([]); - } + // if (userIds.length === 0) { + // return of([]); + // } - return combineLatest( - userIds.map((userId) => - combineLatest([ - this.authService.authStatusFor$(userId), - this.syncService.lastSync$(userId).pipe(filter((lastSync) => lastSync != null)), - this.url$, - ]).pipe( - filter( - ([authStatus, _date, url]) => - authStatus === AuthenticationStatus.Unlocked && VAULT_ROUTES.includes(url), - ), - concatMap(() => this.runMigrationsIfNeeded(userId)), - ), - ), - ); - }), - ) - .subscribe(); + // return combineLatest( + // userIds.map((userId) => + // combineLatest([ + // this.authService.authStatusFor$(userId), + // this.syncService.lastSync$(userId).pipe(filter((lastSync) => lastSync != null)), + // this.url$, + // ]).pipe( + // filter( + // ([authStatus, _date, url]) => + // authStatus === AuthenticationStatus.Unlocked && VAULT_ROUTES.includes(url), + // ), + // concatMap(() => this.runMigrationsIfNeeded(userId)), + // ), + // ), + // ); + // }), + // ) + // .subscribe(); } async runMigrationsIfNeeded(userId: UserId): Promise { diff --git a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts index 0666064b36e..c63a6429f3b 100644 --- a/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts +++ b/libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts @@ -51,17 +51,17 @@ export class MinimumKdfMigration implements EncryptedMigration { } // Only PBKDF2 users below the minimum iteration count need migration - const kdfConfig = await this.kdfConfigService.getKdfConfig(userId); - if ( - kdfConfig.kdfType !== KdfType.PBKDF2_SHA256 || - kdfConfig.iterations >= PBKDF2KdfConfig.ITERATIONS.min - ) { - return "noMigrationNeeded"; - } + // const kdfConfig = await this.kdfConfigService.getKdfConfig(userId); + // if ( + // kdfConfig.kdfType !== KdfType.PBKDF2_SHA256 || + // kdfConfig.iterations >= PBKDF2KdfConfig.ITERATIONS.min + // ) { + // return "noMigrationNeeded"; + // } - if (!(await this.configService.getFeatureFlag(FeatureFlag.ForceUpdateKDFSettings))) { - return "noMigrationNeeded"; - } + // if (!(await this.configService.getFeatureFlag(FeatureFlag.ForceUpdateKDFSettings))) { + // return "noMigrationNeeded"; + // } return "needsMigrationWithMasterPassword"; }