From 60be9a2e1f152523080087d5e1ea570ab76364f0 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 3 Nov 2025 15:13:04 +0100
Subject: [PATCH] Prevent await race condition

---
 .../encrypted-migrations-scheduler.service.ts                   | 2 +-
 .../encrypted-migrator/default-encrypted-migrator.ts            | 2 +-
 .../encrypted-migrator/encrypted-migrator.abstraction.ts        | 2 +-
 3 files changed, 3 insertions(+), 3 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 602804adfae..1c50919d1cb 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
@@ -104,7 +104,7 @@ export class DefaultEncryptedMigrationsSchedulerService
       return;
     }
 
-    if (this.isMigrating || (await this.encryptedMigrator.isRunningMigrations())) {
+    if (this.isMigrating || this.encryptedMigrator.isRunningMigrations()) {
       this.logService.info(
         `[EncryptedMigrationsScheduler] Skipping migration check for user ${userId} because migrations are already in progress`,
       );
diff --git a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts
index 8bee15f85d2..b3497b15662 100644
--- a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts
+++ b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts
@@ -105,7 +105,7 @@ export class DefaultEncryptedMigrator implements EncryptedMigrator {
     }
   }
 
-  async isRunningMigrations(): Promise<boolean> {
+  isRunningMigrations(): boolean {
     return this.isRunningMigration;
   }
 }
diff --git a/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts b/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts
index d2a885aa18b..7e408374f7e 100644
--- a/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts
+++ b/libs/common/src/key-management/encrypted-migrator/encrypted-migrator.abstraction.ts
@@ -28,5 +28,5 @@ export abstract class EncryptedMigrator {
   /**
    * Indicates whether migrations are currently running.
    */
-  abstract isRunningMigrations(): Promise<boolean>;
+  abstract isRunningMigrations(): boolean;
 }