From 9f7d8784228aae9d82eb14d2ad90982f3a051103 Mon Sep 17 00:00:00 2001 From: olav Date: Fri, 1 Apr 2022 11:10:21 +0200 Subject: [PATCH] fix: add missing awaits (#1472) * refactor: silence expected console.error call * fix: add missing access service awaits * fix: add missing constraint validation await --- src/lib/db/access-store.ts | 2 +- src/lib/db/event-store.test.ts | 8 ++++++++ src/lib/services/access-service.ts | 6 +++--- src/lib/services/feature-toggle-service.ts | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/lib/db/access-store.ts b/src/lib/db/access-store.ts index 1649c82d2cb..bf55ee7b91c 100644 --- a/src/lib/db/access-store.ts +++ b/src/lib/db/access-store.ts @@ -181,7 +181,7 @@ export class AccessStore implements IAccessStore { environment: permission.environment, }; }); - this.db.batchInsert(T.ROLE_PERMISSION, rows); + await this.db.batchInsert(T.ROLE_PERMISSION, rows); } async unlinkUserRoles(userId: number): Promise { diff --git a/src/lib/db/event-store.test.ts b/src/lib/db/event-store.test.ts index d737caf8ab2..849703b49d7 100644 --- a/src/lib/db/event-store.test.ts +++ b/src/lib/db/event-store.test.ts @@ -2,6 +2,14 @@ import knex from 'knex'; import EventStore from './event-store'; import getLogger from '../../test/fixtures/no-logger'; +beforeAll(() => { + getLogger.setMuteError(true); +}); + +afterAll(() => { + getLogger.setMuteError(false); +}); + test('Trying to get events if db fails should yield empty list', async () => { const db = knex({ client: 'pg', diff --git a/src/lib/services/access-service.ts b/src/lib/services/access-service.ts index 065c2b34cc7..b499a79c7ed 100644 --- a/src/lib/services/access-service.ts +++ b/src/lib/services/access-service.ts @@ -406,7 +406,7 @@ export class AccessService { const rolePermissions = role.permissions; const newRole = await this.roleStore.create(baseRole); if (rolePermissions) { - this.store.addEnvironmentPermissionsToRole( + await this.store.addEnvironmentPermissionsToRole( newRole.id, rolePermissions, ); @@ -425,8 +425,8 @@ export class AccessService { const rolePermissions = role.permissions; const newRole = await this.roleStore.update(baseRole); if (rolePermissions) { - this.store.wipePermissionsFromRole(newRole.id); - this.store.addEnvironmentPermissionsToRole( + await this.store.wipePermissionsFromRole(newRole.id); + await this.store.addEnvironmentPermissionsToRole( newRole.id, rolePermissions, ); diff --git a/src/lib/services/feature-toggle-service.ts b/src/lib/services/feature-toggle-service.ts index 515fd0a645e..becafa19708 100644 --- a/src/lib/services/feature-toggle-service.ts +++ b/src/lib/services/feature-toggle-service.ts @@ -197,7 +197,7 @@ class FeatureToggleService { } if (oneOf(DATE_OPERATORS, operator)) { - validateDate(constraint.value); + await validateDate(constraint.value); } if (